修改就诊记录没有居民主键。

This commit is contained in:
haown 2024-07-15 17:09:00 +08:00
parent abf4dbb2b9
commit 36daa7de5e
2 changed files with 11 additions and 10 deletions

View File

@ -144,6 +144,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
patientInfo.setId(patientId); patientInfo.setId(patientId);
patientInfoService.updatePatientInfo(patientInfo); patientInfoService.updatePatientInfo(patientInfo);
saveBody.setPatientId(patientId); saveBody.setPatientId(patientId);
saveBody.setResidentId(patientInfo.getResidentId());
} }
// 保存/修改就诊记录 // 保存/修改就诊记录
Long recordId = saveOrUpate(saveBody); Long recordId = saveOrUpate(saveBody);

View File

@ -241,8 +241,8 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
SignPatientManageRouteNodeInfoVo signNodeInfo = new SignPatientManageRouteNodeInfoVo(); SignPatientManageRouteNodeInfoVo signNodeInfo = new SignPatientManageRouteNodeInfoVo();
BeanUtils.copyBeanProp(signNodeInfo, node); BeanUtils.copyBeanProp(signNodeInfo, node);
JSONObject detailInfo = new JSONObject(); JSONObject detailInfo = new JSONObject();
switch (node.getTaskType()) { switch (node.getTaskNodeType()) {
case TaskContentConstants.PHONE_OUTBOUND: // 电话外呼-查询话术表 case TaskNodeTypeConstants.PHONE_OUTBOUND: // 电话外呼-查询话术表
if (node.getPhoneId() != null) { if (node.getPhoneId() != null) {
ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getPhoneId()); ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getPhoneId());
detailInfo = JSONObject.parseObject(JSONObject.toJSONString(scriptInfo)); detailInfo = JSONObject.parseObject(JSONObject.toJSONString(scriptInfo));
@ -254,19 +254,19 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
} }
} }
break; break;
case (TaskContentConstants.QUESTIONNAIRE_SCALE): // 问卷量表-返回问卷信息 case (TaskNodeTypeConstants.QUESTIONNAIRE_SCALE): // 问卷量表-返回问卷信息
if (node.getQuestionInfoId() != null) { if (node.getQuestionInfoId() != null) {
QuestionVO questionVO = questionInfoService.selectQuestionInfoById(node.getQuestionInfoId()); QuestionVO questionVO = questionInfoService.selectQuestionInfoById(node.getQuestionInfoId());
detailInfo = JSONObject.parseObject(JSONObject.toJSONString(questionVO)); detailInfo = JSONObject.parseObject(JSONObject.toJSONString(questionVO));
} }
break; break;
case (TaskContentConstants.ARTIFICIAL_FOLLOW_UP): // 人工随访-返回问卷信息 //case (TaskNodeTypeConstants.ARTIFICIAL_FOLLOW_UP): // 人工随访-返回问卷信息
if (node.getFollowTemplateId() != null) { // if (node.getFollowTemplateId() != null) {
QuestionVO questionVO = questionInfoService.selectQuestionInfoById(node.getFollowTemplateId()); // QuestionVO questionVO = questionInfoService.selectQuestionInfoById(node.getFollowTemplateId());
detailInfo = JSONObject.parseObject(JSONObject.toJSONString(questionVO)); // detailInfo = JSONObject.parseObject(JSONObject.toJSONString(questionVO));
} // }
break; // break;
case (TaskContentConstants.PROPAGANDA_ARTICLE): // 宣教文章-返回宣教库信息 case (TaskNodeTypeConstants.PROPAGANDA_ARTICLE): // 宣教文章-返回宣教库信息
if (node.getPropagandaInfoId() != null) { if (node.getPropagandaInfoId() != null) {
PropagandaMaterialsVo propagandaMaterialsVo = propagandaInfoService.selectPropagandaInfoById(node.getPropagandaInfoId()); PropagandaMaterialsVo propagandaMaterialsVo = propagandaInfoService.selectPropagandaInfoById(node.getPropagandaInfoId());
signNodeInfo.setPropagandaContent(propagandaMaterialsVo.getPropagandaContent()); signNodeInfo.setPropagandaContent(propagandaMaterialsVo.getPropagandaContent());