设置年龄 兼容bug修复

This commit is contained in:
zhuangyuanke 2024-12-17 08:58:33 +08:00
parent a01ee552ec
commit b042766862

View File

@ -24,6 +24,7 @@ import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmi
import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord;
import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord; import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord;
import com.xinelu.manage.domain.phonedialrecord.PhoneDialRecord; import com.xinelu.manage.domain.phonedialrecord.PhoneDialRecord;
import com.xinelu.manage.domain.questioninfo.QuestionInfo;
import com.xinelu.manage.domain.scriptInfo.ScriptInfo; import com.xinelu.manage.domain.scriptInfo.ScriptInfo;
import com.xinelu.manage.domain.shortmessagesendrecord.ShortMessageSendRecord; import com.xinelu.manage.domain.shortmessagesendrecord.ShortMessageSendRecord;
import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute; import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute;
@ -477,7 +478,9 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
@Override @Override
public AjaxResult selectFollowPatientInfo(Long id) { public AjaxResult selectFollowPatientInfo(Long id) {
ManualFollowPatientVO patientVO = signPatientManageRouteMapper.selectFollowPatientInfo(id); ManualFollowPatientVO patientVO = signPatientManageRouteMapper.selectFollowPatientInfo(id);
// 设置年龄 if (Objects.isNull(patientVO.getAge()))
// 设置年龄
patientVO.setAge(AgeUtil.getAgeMonth(patientVO.getBirthDate().toString()));
if (ObjectUtils.isEmpty(patientVO)) { if (ObjectUtils.isEmpty(patientVO)) {
return AjaxResult.error("患者信息不存在!"); return AjaxResult.error("患者信息不存在!");
} }
@ -1097,8 +1100,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
signPatientManageRouteNode.setTaskExcuteType(TaskExcuteTypeEnum.BATCH_TASK.getInfo()); signPatientManageRouteNode.setTaskExcuteType(TaskExcuteTypeEnum.BATCH_TASK.getInfo());
signPatientManageRouteNode.setSn(signPatientManageRoute.getSn()); signPatientManageRouteNode.setSn(signPatientManageRoute.getSn());
} } else
else
signPatientManageRouteNode.setTaskExcuteType(TaskExcuteTypeEnum.ACTUAL_TIME_TASK.getInfo()); signPatientManageRouteNode.setTaskExcuteType(TaskExcuteTypeEnum.ACTUAL_TIME_TASK.getInfo());
signPatientManageRouteNode.setNodePlanTime(routeNode.getNodePlanTime()); signPatientManageRouteNode.setNodePlanTime(routeNode.getNodePlanTime());
@ -1122,13 +1124,30 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
signPatientManageRouteNode.setQuestionnaireName(StringUtils.isBlank(routeNode.getQuestionnaireName()) ? null : routeNode.getQuestionnaireName()); signPatientManageRouteNode.setQuestionnaireName(StringUtils.isBlank(routeNode.getQuestionnaireName()) ? null : routeNode.getQuestionnaireName());
signPatientManageRouteNode.setQuestionnaireContent(StringUtils.isBlank(routeNode.getQuestionnaireContent()) ? null : routeNode.getQuestionnaireContent()); signPatientManageRouteNode.setQuestionnaireContent(StringUtils.isBlank(routeNode.getQuestionnaireContent()) ? null : routeNode.getQuestionnaireContent());
signPatientManageRouteNode.setQuestionExpirationDate(Objects.isNull(routeNode.getQuestionExpirationDate()) ? null : routeNode.getQuestionExpirationDate()); signPatientManageRouteNode.setQuestionExpirationDate(Objects.isNull(routeNode.getQuestionExpirationDate()) ? null : routeNode.getQuestionExpirationDate());
signPatientManageRouteNode.setPhoneDialMethod(StringUtils.isBlank(routeNode.getPhoneDialMethod()) ? null : routeNode.getPhoneDialMethod());
//如果是电话外呼则设置外呼标识为1 zyk 20241216
if (StringUtils.equals(PhoneDialMethodEnum.AI.getInfo(), routeNode.getPhoneDialMethod()) || StringUtils.equals(PhoneDialMethodEnum.COMMON.getInfo(), routeNode.getPhoneDialMethod())) {
signPatientManageRouteNode.setPhoneDialMethod(StringUtils.isBlank(routeNode.getPhoneDialMethod()) ? null : routeNode.getPhoneDialMethod());
signPatientManageRouteNode.setPhonePushSign(Objects.isNull(routeNode.getPhonePushSign()) ? null : routeNode.getPhonePushSign());
}
//根据问卷ID获取问卷信息 zyk 20241216
QuestionInfo questionInfo = questionInfoService.selectQuestionInfoById(signPatientManageRouteNode.getQuestionInfoId());
if (ObjectUtils.isNotEmpty(questionInfo)) {
signPatientManageRouteNode.setScriptInfoId(questionInfo.getScriptInfoId());
signPatientManageRouteNode.setRobotPublishId(questionInfo.getRobotPublishId());
// 节点是否是AI电话 zyk 20241216
if (com.xinelu.common.utils.StringUtils.equals(PhoneDialMethodEnum.AI.getInfo(), routeNode.getPhoneDialMethod()) && com.xinelu.common.utils.StringUtils.isBlank(questionInfo.getRobotPublishId())) {
throw new ServiceException("第三方机器人id为空");
}
}
} }
//宣教 //宣教
if (Objects.nonNull(routeNode) && TaskNodeTypeEnum.PROPAGANDA_ARTICLE.getInfo().equals(routeNode.getTaskNodeType())) { if (Objects.nonNull(routeNode) && TaskNodeTypeEnum.PROPAGANDA_ARTICLE.getInfo().equals(routeNode.getTaskNodeType())) {
signPatientManageRouteNode.setPropagandaInfoId(Objects.isNull(routeNode.getPropagandaInfoId()) ? null : routeNode.getPropagandaInfoId()); signPatientManageRouteNode.setPropagandaInfoId(Objects.isNull(routeNode.getPropagandaInfoId()) ? null : routeNode.getPropagandaInfoId());
signPatientManageRouteNode.setPropagandaTitle(StringUtils.isBlank(routeNode.getPropagandaTitle()) ? null : routeNode.getPropagandaTitle()); signPatientManageRouteNode.setPropagandaTitle(StringUtils.isBlank(routeNode.getPropagandaTitle()) ? null : routeNode.getPropagandaTitle());
signPatientManageRouteNode.setPropagandaContent(StringUtils.isBlank(routeNode.getPropagandaContent()) ? null : routeNode.getPropagandaContent()); signPatientManageRouteNode.setPropagandaContent(StringUtils.isBlank(routeNode.getPropagandaContent()) ? null : routeNode.getPropagandaContent());
} }
//文字提醒 //文字提醒
if (Objects.nonNull(routeNode) && TaskNodeTypeEnum.TEXT_REMIND.getInfo().equals(routeNode.getTaskNodeType())) { if (Objects.nonNull(routeNode) && TaskNodeTypeEnum.TEXT_REMIND.getInfo().equals(routeNode.getTaskNodeType())) {