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 queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey, new HashSet<>(Arrays.asList("name")), null); Page LocationPage = HisPageUtils.selectPage( @@ -71,7 +71,7 @@ public class HealthcareServiceController { List locationIdOptions = LocationList.stream() .map(location -> new HealthcareServiceInitDto.locationIdOption(location.getId(), location.getName())) .collect(Collectors.toList()); - healthcareServiceInitDto.setLocationIdOptions(locationIdOptions); + healthcareServiceInitDto.setLocationIdOptions(locationIdOptions);*/ // 是否需要预约 List 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 activeFlagOptions; - private List locationIdOptions; + //private List locationIdOptions; private List 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; } - } + }*/ /** * 是否需要预约