diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/ApplyRangeContant.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/ApplyRangeContant.java new file mode 100644 index 00000000..b6747528 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/ApplyRangeContant.java @@ -0,0 +1,18 @@ +package com.xinelu.common.constant; + +/** + * @description: 字段适用范围常量 + * @author: haown + * @create: 2024-07-15 16:30 + **/ +public class ApplyRangeContant { + /** + * 专用 + */ + public static final String PRIVATE = "PRIVATE"; + + /** + * 公共 + */ + public static final String PUBLIC = "PUBLIC"; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/ISignPatientManageRouteNodeService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/ISignPatientManageRouteNodeService.java index 91d07dd6..bd6ab3fa 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/ISignPatientManageRouteNodeService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/ISignPatientManageRouteNodeService.java @@ -204,7 +204,7 @@ public interface ISignPatientManageRouteNodeService { Boolean getTriggerConditon(Long specialDiseaseRouteId, Long patientId); /** - * 查询手动船舰路径触发条件是否满足 + * 查询手动创建路径触发条件是否满足 * @param signPatientManageRouteId 专病管理路径主键 * @param patientId 患者主键 * @return 是否满足触发条件，true:满足，false:不满足 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index cef95ac5..0349feaa 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -2,6 +2,7 @@ package com.xinelu.manage.service.signpatientmanageroutenode.impl; import com.alibaba.fastjson2.JSONObject; import com.xinelu.common.annotation.DataScope; +import com.xinelu.common.constant.ApplyRangeContant; import com.xinelu.common.constant.PhoneMessageRemindConstants; import com.xinelu.common.constant.RouteNodeNameConstants; import com.xinelu.common.constant.TaskContentConstants; @@ -840,8 +841,8 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage List manageNodeList = new ArrayList<>(); Map> groupByRang = labelFieldContentList.stream().collect(Collectors.groupingBy(LabelFieldInfoContentVo::getApplyRange)); // 筛选应用范围是否有私用的画像 - List privateLabelFields = groupByRang.get("PRIVATE"); - List publicLabelFields = groupByRang.get("PUBLIC"); + List privateLabelFields = groupByRang.get(ApplyRangeContant.PRIVATE); + List publicLabelFields = groupByRang.get(ApplyRangeContant.PUBLIC); Map> groupByPartition = new HashMap<>(); List nodeLabelFieldContent = new ArrayList<>(); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java index 2523d3c9..e66ee794 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java @@ -2,6 +2,7 @@ package com.xinelu.manage.service.signpatientrecord.impl; import com.alibaba.fastjson2.JSONObject; import com.xinelu.common.annotation.DataScope; +import com.xinelu.common.constant.ApplyRangeContant; import com.xinelu.common.constant.SignRecordServiceStatusConstants; import com.xinelu.common.constant.TaskCreateTypeConstant; import com.xinelu.common.enums.NodeExecuteStatusEnum; @@ -473,8 +474,8 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { // 按照公共私用分组 Map> groupByRang = labelFieldContentList.stream().collect(Collectors.groupingBy(LabelFieldInfoContentVo::getApplyRange)); // 筛选应用范围是否有私用的画像 - List privateLabelFields = groupByRang.getOrDefault("PRIVATE", new ArrayList<>()); - List publicLabelFields = groupByRang.getOrDefault("PUBLIC", new ArrayList<>()); + List privateLabelFields = groupByRang.getOrDefault(ApplyRangeContant.PRIVATE, new ArrayList<>()); + List publicLabelFields = groupByRang.getOrDefault(ApplyRangeContant.PUBLIC, new ArrayList<>()); nodeList.forEach(node -> { if (StringUtils.contains(node.getNodeContent(), "data-w-e-type")) { diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml index 4119067e..fe42caa2 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml @@ -316,10 +316,12 @@ content.field_code, info.task_partition_dict_id, info.task_type_id, - info.apply_range, + tpd.apply_range, content.field_value, content.portrait_sn - from label_field_content content left join label_field_info info on content.field_id = info.id + from label_field_content content + left join label_field_info info on content.field_id = info.id + left join task_partition_dict tpd on info.task_partition_dict_id = tpd.id where content.patient_id = #{patientId} and content.portrait_status='INUSE'