wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

服务管理-部分

Browse Source
This commit is contained in:
Wang.Huan
2025-02-27 09:28:17 +08:00
parent be0d9bc987
commit f6e9dad209
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java
View File

@@ -61,7 +61,7 @@ public class HealthcareServiceController {
.map(status -> new HealthcareServiceInitDto.activeFlagOption(status.getValue(), status.getInfo())) .map(status -> new HealthcareServiceInitDto.activeFlagOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList()); .collect(Collectors.toList());
healthcareServiceInitDto.setActiveFlagOptions(activeFlagOptions); healthcareServiceInitDto.setActiveFlagOptions(activeFlagOptions);
// 构建查询条件 /* // 构建查询条件
QueryWrapper<Location> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey, QueryWrapper<Location> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
new HashSet<>(Arrays.asList("name")), null); new HashSet<>(Arrays.asList("name")), null);
Page<Location> LocationPage = HisPageUtils.selectPage( Page<Location> LocationPage = HisPageUtils.selectPage(
@@ -71,7 +71,7 @@ public class HealthcareServiceController {
List<HealthcareServiceInitDto.locationIdOption> locationIdOptions = LocationList.stream() List<HealthcareServiceInitDto.locationIdOption> locationIdOptions = LocationList.stream()
.map(location -> new HealthcareServiceInitDto.locationIdOption(location.getId(), location.getName())) .map(location -> new HealthcareServiceInitDto.locationIdOption(location.getId(), location.getName()))
.collect(Collectors.toList()); .collect(Collectors.toList());
healthcareServiceInitDto.setLocationIdOptions(locationIdOptions); healthcareServiceInitDto.setLocationIdOptions(locationIdOptions);*/
// 是否需要预约 // 是否需要预约
List<HealthcareServiceInitDto.appointmentRequiredFlagOption> appointmentRequiredFlagOptions = Stream.of(WhetherContainUnknown.values()) List<HealthcareServiceInitDto.appointmentRequiredFlagOption> appointmentRequiredFlagOptions = Stream.of(WhetherContainUnknown.values())
.map(wh -> new HealthcareServiceInitDto.appointmentRequiredFlagOption(wh.getValue(), wh.getInfo())) .map(wh -> new HealthcareServiceInitDto.appointmentRequiredFlagOption(wh.getValue(), wh.getInfo()))

8
openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java
View File

@@ -14,7 +14,7 @@ public class HealthcareServiceInitDto {
private List<activeFlagOption> activeFlagOptions; private List<activeFlagOption> activeFlagOptions;
private List<locationIdOption> locationIdOptions; //private List<locationIdOption> locationIdOptions;
private List<appointmentRequiredFlagOption> appointmentRequiredFlagOptions; private List<appointmentRequiredFlagOption> appointmentRequiredFlagOptions;
@@ -32,9 +32,9 @@ public class HealthcareServiceInitDto {
} }
} }
/** /* *//**
* 位置信息 * 位置信息
*/ *//*
@Data @Data
public static class locationIdOption { public static class locationIdOption {
private Long value; private Long value;
@@ -44,7 +44,7 @@ public class HealthcareServiceInitDto {
this.value = value; this.value = value;
this.label = label; this.label = label;
} }
} }*/
/** /**
* 是否需要预约 * 是否需要预约