diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/PortraitStatusEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/PortraitStatusEnum.java new file mode 100644 index 00000000..5072f3b1 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/PortraitStatusEnum.java @@ -0,0 +1,29 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +/** + * @Description 画像状态 + * @Author zh + * @Date 2024-06-24 + */ +@Getter +public enum PortraitStatusEnum { + + /** + * 已归档 + */ + FIELD("FIELD"), + + /** + * 在用 + */ + INUSE("INUSE"), + ; + + final private String info; + + PortraitStatusEnum(String info) { + this.info = info; + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java index e1395f73..8cc66db2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java @@ -9,6 +9,8 @@ import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.labelfieldcontent.LabelFieldContent; import com.xinelu.manage.dto.labelfieldcontent.LabelFieldContentAddDTO; import com.xinelu.manage.service.labelfieldcontent.ILabelFieldContentService; +import com.xinelu.manage.vo.labelfieldcontent.GroupingValue; +import com.xinelu.manage.vo.labelfieldcontent.LabelField; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -94,7 +96,20 @@ public class LabelFieldContentController extends BaseController { * 分组信息 */ @GetMapping("/groupingContent") - public AjaxResult groupingContent(String taskPartitionDictName) { - return labelFieldContentService.groupingContent(taskPartitionDictName); + public AjaxResult groupingContent() { + return labelFieldContentService.groupingContent(); + } + + /** + * 画像查询 + */ + @GetMapping("/groupingValue") + public List> groupingValue(Long taskPartitionDictId, Long patientId) { + return labelFieldContentService.groupingValue(taskPartitionDictId, patientId); + } + + @PostMapping("/insertLabelField") + public AjaxResult insertLabelField(@RequestBody LabelField labelField) { + return labelFieldContentService.insertLabelField(labelField); } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java index b49a0b07..30dc8866 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java @@ -1,6 +1,7 @@ package com.xinelu.manage.mapper.labelfieldcontent; import com.xinelu.manage.domain.labelfieldcontent.LabelFieldContent; +import com.xinelu.manage.vo.labelfieldcontent.GroupingValue; import com.xinelu.manage.vo.labelfieldcontent.LabelFieldContentVO; import com.xinelu.manage.vo.labelfieldcontent.LabelFieldInfoContentVo; import java.util.List; @@ -79,6 +80,16 @@ public interface LabelFieldContentMapper { */ List selectLabelFieldContent(@Param("labelFieldIds") List labelFieldIds); + /** + * 画像查询 + * + * @param taskPartitionDictId 细分id + * @param patientId 患者id + * @param portraitStatus 状态 + * @return GroupingValue + */ + List groupingValue(@Param("taskPartitionDictId") Long taskPartitionDictId, @Param("patientId") Long patientId, @Param("portraitStatus") String portraitStatus); + /** * 查询患者在用标签字段信息 * @param patientId 患者主键 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientAllInfoViewMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientAllInfoViewMapper.java index 937481de..77fb24bb 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientAllInfoViewMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientAllInfoViewMapper.java @@ -27,4 +27,11 @@ public interface PatientAllInfoViewMapper { */ List selectPatientAllInfoViewList(PatientAllInfoView patientAllInfoView); + /** + * 查询患者全部信息视图对象 + * + * @param patientId 患者主键 + * @return 患者全部信息视图对象 + */ + List selectPatientAllInfoListViewByPatientId(Long patientId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java index 9d096099..06f7d716 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java @@ -25,12 +25,13 @@ public interface SignPatientManageRouteNodeMapper { */ SignPatientManageRouteNode selectSignPatientManageRouteNodeById(Long id); - /** - * 查询患者管理路径节点 - * @param patientTaskDto 任务查询传输对象 - * @return 患者管理任务路径节点 - */ - List getNodeList(PatientTaskDto patientTaskDto); + /** + * 查询患者管理路径节点 + * + * @param patientTaskDto 任务查询传输对象 + * @return 患者管理任务路径节点 + */ + List getNodeList(PatientTaskDto patientTaskDto); /** * 查询签约患者管理任务路径节点列表 @@ -40,7 +41,7 @@ public interface SignPatientManageRouteNodeMapper { */ public List selectSignPatientManageRouteNodeList(SignPatientManageRouteNodeDto signPatientManageRouteNodeDto); - List selectPatientManageNodeList(SignPatientManageRouteNodeDto signPatientManageRouteNodeDto); + List selectPatientManageNodeList(SignPatientManageRouteNodeDto signPatientManageRouteNodeDto); /** * 新增签约患者管理任务路径节点 @@ -50,7 +51,7 @@ public interface SignPatientManageRouteNodeMapper { */ public int insertSignPatientManageRouteNode(SignPatientManageRouteNode signPatientManageRouteNode); - int insertBatch(@Param("nodeList") List nodeList); + int insertBatch(@Param("nodeList") List nodeList); /** * 修改签约患者管理任务路径节点 @@ -84,14 +85,15 @@ public interface SignPatientManageRouteNodeMapper { */ int deleteRouteNodeByManageRouteId(Long manageRouteId); - /** - * 查询患者任务列表 - * @param patientTaskDto 患者任务列表查询传输对象 - * @return 患者任务列表 - */ - List selectPatientTaskList(PatientTaskDto patientTaskDto); + /** + * 查询患者任务列表 + * + * @param patientTaskDto 患者任务列表查询传输对象 + * @return 患者任务列表 + */ + List selectPatientTaskList(PatientTaskDto patientTaskDto); - List selectManageRouteByResidentId(@Param("residentId") Long residentId,@Param("nodeExecuteStatus") String nodeExecuteStatus); + List selectManageRouteByResidentId(@Param("residentId") Long residentId, @Param("nodeExecuteStatus") String nodeExecuteStatus); String selectNodeContent(Long manageRouteNodeId); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java index c07b01ac..a1350f56 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java @@ -100,6 +100,12 @@ public interface SpecialDiseaseNodeMapper { List selectByRouteId(Long routeId); + /** + * 根据患者路径查询患者节点表 + * + * @param specialDiseaseRouteId 患者路径 + * @return Long + */ List selectSpecialDiseaseRouteIds(Long specialDiseaseRouteId); /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java index 0d69a532..413096b9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java @@ -1,6 +1,5 @@ package com.xinelu.manage.mapper.taskpartitiondict; -import com.xinelu.manage.domain.labelfieldinfo.LabelFieldInfo; import com.xinelu.manage.domain.taskpartitiondict.TaskPartitionDict; import java.util.List; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java index 6d3cc33a..ee5962e7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java @@ -3,6 +3,8 @@ package com.xinelu.manage.service.labelfieldcontent; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.labelfieldcontent.LabelFieldContent; import com.xinelu.manage.dto.labelfieldcontent.LabelFieldContentAddDTO; +import com.xinelu.manage.vo.labelfieldcontent.GroupingValue; +import com.xinelu.manage.vo.labelfieldcontent.LabelField; import java.util.List; @@ -69,8 +71,18 @@ public interface ILabelFieldContentService { /** * 分组信息 * - * @param taskPartitionDictName 分组名 * @return LabelFieldInfo */ - AjaxResult groupingContent(String taskPartitionDictName); + AjaxResult groupingContent(); + + /** + * 画像查询 + * + * @param taskPartitionDictId 细分id + * @param patientId 患者id + * @return GroupingValue + */ + List> groupingValue(Long taskPartitionDictId, Long patientId); + + AjaxResult insertLabelField(LabelField labelField); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java index 62503514..b0d83c4c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java @@ -1,19 +1,30 @@ package com.xinelu.manage.service.labelfieldcontent.impl; +import com.alibaba.fastjson2.JSONObject; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.enums.PatientSexEnum; import com.xinelu.common.exception.ServiceException; +import com.xinelu.common.utils.BaseUtil; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.labelfieldcontent.LabelFieldContent; import com.xinelu.manage.domain.labelfieldinfo.LabelFieldInfo; +import com.xinelu.manage.domain.patientinfo.PatientAllInfoView; import com.xinelu.manage.dto.labelfieldcontent.LabelFieldContentAddDTO; import com.xinelu.manage.dto.labelfieldcontent.LabelFieldContentDTO; import com.xinelu.manage.mapper.labelfieldcontent.LabelFieldContentMapper; import com.xinelu.manage.mapper.labelfieldinfo.LabelFieldInfoMapper; +import com.xinelu.manage.mapper.patientinfo.PatientAllInfoViewMapper; +import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; +import com.xinelu.manage.mapper.signpatientmanageroute.SignPatientManageRouteMapper; +import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper; +import com.xinelu.manage.mapper.specialdiseasenode.SpecialDiseaseNodeMapper; +import com.xinelu.manage.mapper.taskpartitiondict.TaskPartitionDictMapper; import com.xinelu.manage.service.labelfieldcontent.ILabelFieldContentService; +import com.xinelu.manage.vo.labelfieldcontent.GroupingValue; +import com.xinelu.manage.vo.labelfieldcontent.LabelField; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +33,8 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 标签字段内容信息Service业务层处理 @@ -35,6 +48,8 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { private LabelFieldContentMapper labelFieldContentMapper; @Resource private LabelFieldInfoMapper labelFieldInfoMapper; + @Resource + private PatientAllInfoViewMapper patientAllInfoViewMapper; /** * 查询标签字段内容信息 @@ -131,7 +146,6 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { BeanUtils.copyProperties(contentDTO, labelFieldContent); labelFieldContent.setFieldId(labelFieldContentAddDTO.getFieldId()); labelFieldContent.setFieldName(labelFieldContentAddDTO.getFieldName()); - //labelFieldContent.setContentCode(Constants.CONTENT_ENCODING + systemCodeUtil.generateDepartCode(Constants.CONTENT_ENCODING)); labelFieldContent.setCreateBy(SecurityUtils.getUsername()); labelFieldContent.setCreateTime(LocalDateTime.now()); if (labelFieldContentMapper.insertLabelFieldContent(labelFieldContent) <= 0) { @@ -144,27 +158,99 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { /** * 分组信息 * - * @param taskPartitionDictName 分组名 * @return LabelFieldInfo */ @Override - public AjaxResult groupingContent(String taskPartitionDictName) { - ArrayList labelFieldInfos = new ArrayList<>(); - if (StringUtils.isBlank(taskPartitionDictName)) { - LabelFieldInfo labelFieldOne = new LabelFieldInfo(); - labelFieldOne.setTaskPartitionDictId(0L); - labelFieldOne.setTaskPartitionDictName("全部"); - labelFieldInfos.add(labelFieldOne); + public AjaxResult groupingContent() { + //创建全部选项 TaskPartitionDictId =0为全部 + List labelFieldInfoList = new ArrayList<>(); + LabelFieldInfo labelFieldInfo = new LabelFieldInfo(); + labelFieldInfo.setTaskPartitionDictId(0L); + labelFieldInfo.setTaskPartitionDictName("全部"); + labelFieldInfoList.add(labelFieldInfo); + //任务细分表数据 + List labelFieldInfos = labelFieldInfoMapper.taskPartitionDictIdList(null); + if (CollectionUtils.isNotEmpty(labelFieldInfos)) { + labelFieldInfoList.addAll(labelFieldInfos); } - List labelFieldInfoList = labelFieldInfoMapper.taskPartitionDictIdList(taskPartitionDictName); - if (CollectionUtils.isNotEmpty(labelFieldInfoList)) { - labelFieldInfos.addAll(labelFieldInfoList); + //未分组选项 TaskPartitionDictId =null 为未分组 + LabelFieldInfo labelFieldInfoTow = new LabelFieldInfo(); + labelFieldInfoTow.setTaskPartitionDictName("未分组"); + labelFieldInfoList.add(labelFieldInfoTow); + return AjaxResult.success(labelFieldInfoList); + } + + /** + * 画像查询 + * + * @param taskPartitionDictId 细分id + * @param patientId 患者id + * @return GroupingValue + */ + @Override + public List> groupingValue(Long taskPartitionDictId, Long patientId) { + if (ObjectUtils.isEmpty(patientId)) { + throw new ServiceException("请选择患者!"); } - if (StringUtils.isBlank(taskPartitionDictName)) { - LabelFieldInfo labelFieldInfo = new LabelFieldInfo(); - labelFieldInfo.setTaskPartitionDictName("未分组"); - labelFieldInfos.add(labelFieldInfo); + //根据patientId查询是否有已经维护的参数 + List labelFieldContents = labelFieldContentMapper.groupingValue(taskPartitionDictId, patientId, null); + if (CollectionUtils.isNotEmpty(labelFieldContents)) { + Map> collect = labelFieldContents.stream().collect(Collectors.groupingBy(GroupingValue::getPortraitSn)); + return new ArrayList<>(collect.values()); } - return AjaxResult.success(labelFieldInfos); + //查询未维护标签及从患者表取值 + List labelFieldContentList = labelFieldContentMapper.groupingValue(taskPartitionDictId, null, null); + JSONObject paramsValue = getParamsValue(patientId); + if (CollectionUtils.isEmpty(labelFieldContentList)) { + return new ArrayList<>(); + } + for (GroupingValue groupingValue : labelFieldContentList) { + //获取不同的文件路径 + switch (groupingValue.getFieldName()) { + case "姓名": + String s = paramsValue.getOrDefault("patientName", "").toString(); + groupingValue.setFieldValue(paramsValue.getOrDefault("patientName", "").toString()); + break; + case "患者电话": + groupingValue.setFieldValue(paramsValue.getOrDefault("patientPhone", "").toString()); + break; + case "性别": + groupingValue.setFieldValue(paramsValue.getOrDefault("sex", "").toString()); + break; + case "医院": + groupingValue.setFieldValue(paramsValue.getOrDefault("hospitalAgencyName", "").toString()); + break; + default: + break; + } + } + List> lists = new ArrayList<>(); + lists.add(labelFieldContentList); + return lists; + + } + + /** + * 根据任务细分类型获取患者的真实信息 + * + * @param patientId 患者主键 + * @return 实际信息 + */ + private JSONObject getParamsValue(Long patientId) { + JSONObject retObj; + List patientAllInfoViews = patientAllInfoViewMapper.selectPatientAllInfoListViewByPatientId(patientId); + if (CollectionUtils.isEmpty(patientAllInfoViews) || ObjectUtils.isEmpty(patientAllInfoViews.get(0))) { + throw new ServiceException("患者信息获取错误，请联系管理员!"); + } + PatientAllInfoView patientAllInfoView = patientAllInfoViews.get(0); + retObj = JSONObject.parseObject(JSONObject.toJSONString(patientAllInfoView)); + // 性别转换成中文、计算年龄 + retObj.fluentPut("sex", PatientSexEnum.getInfoByCode(patientAllInfoView.getSex()).getInfo()).fluentPut("age", BaseUtil.getAge(patientAllInfoView.getBirthDate())); + return retObj; + } + + @Override + public AjaxResult insertLabelField(LabelField labelField) { + return null; } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/GroupingValue.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/GroupingValue.java new file mode 100644 index 00000000..e55b213c --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/GroupingValue.java @@ -0,0 +1,81 @@ +package com.xinelu.manage.vo.labelfieldcontent; + +import com.xinelu.manage.domain.labelfieldinfo.LabelFieldInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 标签字段内容信息对象 + * + * @author xinelu + * @date 2024-03-11 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class GroupingValue extends LabelFieldInfo { + + /** + * LabelFieldInfoId + */ + private Long labelFieldInfoId; + + /** + * LabelFieldInfoId + */ + private Long labelFieldContentId; + + /** + * 画像标签和知识库字段表id + */ + @ApiModelProperty(value = "画像标签和知识库字段表id") + private Long fieldId; + + /** + * 字段名称 + */ + @ApiModelProperty(value = "字段名称") + private String fieldName; + + /** + * 字段编码，同param_key字段值 + */ + @ApiModelProperty(value = "字段编码，同param_key字段值") + private String fieldCode; + + /** + * 字段值，同param_value + */ + @ApiModelProperty(value = "字段值，同param_value") + private String fieldValue; + + /** + * 画像流水号，用年月日时分秒毫秒数字转成的字符串 + */ + @ApiModelProperty(value = "画像流水号，用年月日时分秒毫秒数字转成的字符串") + private String portraitSn; + + /** + * 患者ID + */ + @ApiModelProperty(value = "患者ID") + private Long patientId; + + /** + * 画像状态（FIELD：已归档，INUSE：在用） + */ + @ApiModelProperty(value = "画像状态") + private String portraitStatus; + + /** + * 内容排序 + */ + @ApiModelProperty(value = "内容排序") + private Integer contentSort; + + /** + * 内容备注信息 + */ + @ApiModelProperty(value = "内容备注信息") + private String contentRemark; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelField.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelField.java new file mode 100644 index 00000000..7b0dda15 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelField.java @@ -0,0 +1,11 @@ +package com.xinelu.manage.vo.labelfieldcontent; + +import lombok.Data; + +import java.util.List; + +@Data +public class LabelField { + + private List groupingValues; +} 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 33588136..144e851d 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml @@ -232,6 +232,44 @@ + + select - field_code, - task_partition_dict_id, - task_partition_dict_name - from label_field_info + id taskPartitionDictId, + task_partition_name taskPartitionDictName + from task_partition_dict task_partition_dict_name like concat('%', #{taskPartitionDictName}, '%') diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientAllInfoViewMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientAllInfoViewMapper.xml index 7f52c97e..dc9fee36 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientAllInfoViewMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientAllInfoViewMapper.xml @@ -73,4 +73,53 @@ where patient_id = #{patientId} + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml index 2649cc91..a7cad4b4 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -856,27 +856,27 @@ + select sdr.id routeId, + sdr.route_name routeName, + sdn.id as routeNodeId, + sdn.route_node_name routeNodeName, + sdn.route_node_day routeNodeDay, + sdn.task_type, + sdn.task_subdivision, + sdn.route_check_status routeCheckStatus, + ttd.id taskTypeId, + ttd.task_type_name taskTypeName, + ttd.task_type_code taskTypeCode, + tpd.id taskPartitionDictId, + tpd.task_partition_name taskPartitionDictName, + tpd.task_partition_code taskPartitionCode + from special_disease_route sdr + left join special_disease_node sdn ON sdn.route_id = sdr.id + left join task_type_dict ttd ON ttd.task_type_code = sdn.task_type + left join task_partition_dict tpd on tpd.task_partition_code = sdn.task_subdivision + where sdr.id = #{specialDiseaseRouteId} + and sdn.route_check_status = 'AGREE' +