xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改字段适用范围。

Browse Source
This commit is contained in:
haown 2024-07-15 16:38:29 +08:00
parent 504f036599
commit abf4dbb2b9
5 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
postdischarge-common/src/main/java/com/xinelu/common/constant/ApplyRangeContant.java Normal file
View File

@ -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";
}

2
postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/ISignPatientManageRouteNodeService.java
View File

@ -204,7 +204,7 @@ public interface ISignPatientManageRouteNodeService {
Boolean getTriggerConditon(Long specialDiseaseRouteId, Long patientId);
/**
* 查询手动船舰路径触发条件是否满足
* 查询手动创建路径触发条件是否满足
* @param signPatientManageRouteId 专病管理路径主键
* @param patientId 患者主键
* @return 是否满足触发条件，true:满足，false:不满足

5
postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java
View File

@ -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<SignPatientManageNodeAuditVo> manageNodeList = new ArrayList<>();
Map<String, List<LabelFieldInfoContentVo>> groupByRang = labelFieldContentList.stream().collect(Collectors.groupingBy(LabelFieldInfoContentVo::getApplyRange));
// 筛选应用范围是否有私用的画像
List<LabelFieldInfoContentVo> privateLabelFields = groupByRang.get("PRIVATE");
List<LabelFieldInfoContentVo> publicLabelFields = groupByRang.get("PUBLIC");
List<LabelFieldInfoContentVo> privateLabelFields = groupByRang.get(ApplyRangeContant.PRIVATE);
List<LabelFieldInfoContentVo> publicLabelFields = groupByRang.get(ApplyRangeContant.PUBLIC);
Map<Long, List<LabelFieldInfoContentVo>> groupByPartition = new HashMap<>();
List<LabelFieldInfoContentVo> nodeLabelFieldContent = new ArrayList<>();

5
postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java
View File

@ -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<String, List<LabelFieldInfoContentVo>> groupByRang = labelFieldContentList.stream().collect(Collectors.groupingBy(LabelFieldInfoContentVo::getApplyRange));
// 筛选应用范围是否有私用的画像
List<LabelFieldInfoContentVo> privateLabelFields = groupByRang.getOrDefault("PRIVATE", new ArrayList<>());
List<LabelFieldInfoContentVo> publicLabelFields = groupByRang.getOrDefault("PUBLIC", new ArrayList<>());
List<LabelFieldInfoContentVo> privateLabelFields = groupByRang.getOrDefault(ApplyRangeContant.PRIVATE, new ArrayList<>());
List<LabelFieldInfoContentVo> publicLabelFields = groupByRang.getOrDefault(ApplyRangeContant.PUBLIC, new ArrayList<>());
nodeList.forEach(node -> {
if (StringUtils.contains(node.getNodeContent(), "data-w-e-type")) {

6
postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml
View File

@ -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'
</select>