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-03-04 14:28:06 +08:00
parent cdf530856a
commit 0a5d2d9994
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,9 +105,12 @@ public class HealthcareServiceController {
new HashSet<>(Arrays.asList("name", "charge_name")), request);
IPage<HealthcareServiceDto> healthcareServicePage = healthcareServiceBizMapper.getHealthcareServicePage(
new Page<>(pageNo, pageSize), CommonConstants.TableName.ADM_HEALTHCARE_SERVICE, queryWrapper);
// 活动标记-枚举类回显赋值
healthcareServicePage.getRecords().forEach(e ->
e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()))
healthcareServicePage.getRecords().forEach(e -> {
// 活动标记-枚举类回显赋值
e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag()));
// 预约要求-枚举类回显赋值
e.setAppointmentRequiredFlag_enumText(EnumUtils.getInfoByValue(WhetherContainUnknown.class, e.getAppointmentRequiredFlag()));
}
);
return R.ok(healthcareServicePage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
}

1
openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java
View File

@@ -82,6 +82,7 @@ public class HealthcareServiceDto {
* 预约要求
*/
private Integer appointmentRequiredFlag;
private String appointmentRequiredFlag_enumText;
/**
* 名称