From f6e9dad20993fd0d8b1969f6fa2f26b7dee46a6a Mon Sep 17 00:00:00 2001
From: "Wang.Huan" <wanghuan@ccbjb.com.cn>
Date: Thu, 27 Feb 2025 09:28:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86-=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HealthcareServiceController.java           | 4 ++--
 .../web/basicservice/dto/HealthcareServiceInitDto.java    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java
index 20e15952..a97543f9 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java
@@ -61,7 +61,7 @@ public class HealthcareServiceController {
                 .map(status -> new HealthcareServiceInitDto.activeFlagOption(status.getValue(), status.getInfo()))
                 .collect(Collectors.toList());
         healthcareServiceInitDto.setActiveFlagOptions(activeFlagOptions);
-        // 构建查询条件
+ /*       // 构建查询条件
         QueryWrapper<Location> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
                 new HashSet<>(Arrays.asList("name")), null);
         Page<Location> LocationPage = HisPageUtils.selectPage(
@@ -71,7 +71,7 @@ public class HealthcareServiceController {
         List<HealthcareServiceInitDto.locationIdOption> locationIdOptions = LocationList.stream()
                 .map(location -> new HealthcareServiceInitDto.locationIdOption(location.getId(), location.getName()))
                 .collect(Collectors.toList());
-        healthcareServiceInitDto.setLocationIdOptions(locationIdOptions);
+        healthcareServiceInitDto.setLocationIdOptions(locationIdOptions);*/
         // 是否需要预约
         List<HealthcareServiceInitDto.appointmentRequiredFlagOption> appointmentRequiredFlagOptions = Stream.of(WhetherContainUnknown.values())
                 .map(wh -> new HealthcareServiceInitDto.appointmentRequiredFlagOption(wh.getValue(), wh.getInfo()))
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java
index 300f963a..e57a2a5f 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java
@@ -14,7 +14,7 @@ public class HealthcareServiceInitDto {
 
 
     private List<activeFlagOption> activeFlagOptions;
-    private List<locationIdOption> locationIdOptions;
+    //private List<locationIdOption> locationIdOptions;
     private List<appointmentRequiredFlagOption> appointmentRequiredFlagOptions;
 
 
@@ -32,9 +32,9 @@ public class HealthcareServiceInitDto {
         }
     }
 
-    /**
+/*    *//**
      * 位置信息
-     */
+     *//*
     @Data
     public static class locationIdOption {
         private Long value;
@@ -44,7 +44,7 @@ public class HealthcareServiceInitDto {
             this.value = value;
             this.label = label;
         }
-    }
+    }*/
 
     /**
      * 是否需要预约