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

Merge branch '0418_小程序开发' of http://182.92.166.109:3000/zhuangyuanke/PostDischargePatientManage into 0418_小程序开发

Browse Source
This commit is contained in:
haown 2024-05-30 17:55:13 +08:00
commit 26b455d0b5
3 changed files with 130 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
postdischarge-common/src/main/java/com/xinelu/common/enums/TemplateTypeEnum.java Normal file
View File

@ -0,0 +1,39 @@
package com.xinelu.common.enums;
import lombok.Getter;
@Getter
public enum TemplateTypeEnum {
/**
* 话术
*/
SCRIPT("SCRIPT"),
/**
* 微信
*/
WECHAT("WECHAT"),
/**
* 短信
*/
TEXT_MESSAGE("TEXT_MESSAGE"),
/**
* 问卷
*/
QUESTIONNAIRE("QUESTIONNAIRE"),
/**
* 宣教
*/
PROPAGANDA("PROPAGANDA"),
;
final private String info;
TemplateTypeEnum(String info) {
this.info = info;
}
}

8
postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.enums.PatientSexEnum;
import com.xinelu.common.enums.ReleaseStatusEnum;
import com.xinelu.common.enums.TemplateTypeEnum;
import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.BaseUtil;
import com.xinelu.common.utils.SecurityUtils;
@ -143,7 +144,11 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService
if (StringUtils.isNotBlank(diseaseNode.getRouteNodeName()) && Objects.nonNull(diseaseNode.getRouteNodeDay()) && StringUtils.isNotBlank(diseaseNode.getTaskType()) && StringUtils.isNotBlank(diseaseNode.getTaskSubdivision()) && StringUtils.isNotBlank(diseaseNode.getTaskStatus())) {
diseaseNode.setRouteId(specialDiseaseRoute.getId());
diseaseNode.setRouteName(specialDiseaseNode.getRouteName());
diseaseNode.setTemplateType(null);
if (StringUtils.isNotBlank(diseaseNode.getTaskSubdivisiontemplateType())
&& (TemplateTypeEnum.QUESTIONNAIRE.getInfo().equals(diseaseNode.getTaskSubdivisiontemplateType()) || TemplateTypeEnum.PROPAGANDA.getInfo().equals(diseaseNode.getTaskSubdivisiontemplateType()))) {
diseaseNode.setTemplateType(diseaseNode.getTaskSubdivisiontemplateType());
}
diseaseNode.setUpdateTime(LocalDateTime.now());
diseaseNode.setUpdateBy(SecurityUtils.getUsername());
specialDiseaseNodeVOS.add(diseaseNode);
@ -234,7 +239,7 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService
diseaseNodeParams.add(nodeParamCurrent);
}
// nodeParams去重
diseaseNodeParams = diseaseNodeParams.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()-> new TreeSet<>(Comparator.comparing(PatientNodeParamsCurrent::getParamKey))), ArrayList::new));
diseaseNodeParams = diseaseNodeParams.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(PatientNodeParamsCurrent::getParamKey))), ArrayList::new));
}
// 之前未维护过参数专病路径节点中的参数为返回值
if (CollectionUtils.isEmpty(nodeParams)) {
@ -266,6 +271,7 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService
/**
* 根据任务细分类型获取患者的真实信息
*
* @param taskSubdivision 任务细分类型code
* @param patientId 患者主键
* @return 实际信息

4
postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java
View File

@ -227,8 +227,8 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi
if (ReleaseStatusEnum.PUBLISHED.getInfo().equals(specialDiseaseRoute.getReleaseStatus())) {
// 专病路径没有节点不能发布
int count = specialDiseaseRouteMapper.selectRouteCheckStatus(specialDiseaseRoute.getId(), RouteCheckStatusEnum.AGREE.getInfo());
if (count > 0) {
return AjaxResult.error("该路径存在未审核的节点，请全部审核后发布！");
if (count >= 0) {
return AjaxResult.error("该路径无节点或存在未审核的节点，请全部审核后发布！");
}
}
if (ReleaseStatusEnum.UNPUBLISHED.getInfo().equals(specialDiseaseRoute.getReleaseStatus())) {