From 36daa7de5e69483396d7470089c27f90fcb89a8f Mon Sep 17 00:00:00 2001
From: haown <454902499@qq.com>
Date: Mon, 15 Jul 2024 17:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=B1=E8=AF=8A=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=B2=A1=E6=9C=89=E5=B1=85=E6=B0=91=E4=B8=BB=E9=94=AE?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PatientVisitRecordServiceImpl.java   |  1 +
 ...SignPatientManageRouteNodeServiceImpl.java | 20 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java
index b9d6e1f6..6f5ad4ab 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java
@@ -144,6 +144,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
 		    patientInfo.setId(patientId);
 		    patientInfoService.updatePatientInfo(patientInfo);
 		    saveBody.setPatientId(patientId);
+		    saveBody.setResidentId(patientInfo.getResidentId());
 	    }
 		// 保存/修改就诊记录
 	    Long recordId = saveOrUpate(saveBody);
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java
index 0349feaa..059809a1 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java
@@ -241,8 +241,8 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
 						SignPatientManageRouteNodeInfoVo signNodeInfo = new SignPatientManageRouteNodeInfoVo();
 						BeanUtils.copyBeanProp(signNodeInfo, node);
 						JSONObject detailInfo = new JSONObject();
-						switch (node.getTaskType()) {
-							case TaskContentConstants.PHONE_OUTBOUND: // 电话外呼-查询话术表
+						switch (node.getTaskNodeType()) {
+							case TaskNodeTypeConstants.PHONE_OUTBOUND: // 电话外呼-查询话术表
 								if (node.getPhoneId() != null) {
 									ScriptInfo scriptInfo = scriptInfoMapper.selectScriptInfoById(node.getPhoneId());
 									detailInfo = JSONObject.parseObject(JSONObject.toJSONString(scriptInfo));
@@ -254,19 +254,19 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
 									}
 								}
 								break;
-							case (TaskContentConstants.QUESTIONNAIRE_SCALE): // 问卷量表-返回问卷信息
+							case (TaskNodeTypeConstants.QUESTIONNAIRE_SCALE): // 问卷量表-返回问卷信息
 								if (node.getQuestionInfoId() != null) {
 									QuestionVO questionVO = questionInfoService.selectQuestionInfoById(node.getQuestionInfoId());
 									detailInfo = JSONObject.parseObject(JSONObject.toJSONString(questionVO));
 								}
 								break;
-							case (TaskContentConstants.ARTIFICIAL_FOLLOW_UP): // 人工随访-返回问卷信息
-								if (node.getFollowTemplateId() != null) {
-									QuestionVO questionVO = questionInfoService.selectQuestionInfoById(node.getFollowTemplateId());
-									detailInfo = JSONObject.parseObject(JSONObject.toJSONString(questionVO));
-								}
-								break;
-							case (TaskContentConstants.PROPAGANDA_ARTICLE): // 宣教文章-返回宣教库信息
+							//case (TaskNodeTypeConstants.ARTIFICIAL_FOLLOW_UP): // 人工随访-返回问卷信息
+							//	if (node.getFollowTemplateId() != null) {
+							//		QuestionVO questionVO = questionInfoService.selectQuestionInfoById(node.getFollowTemplateId());
+							//		detailInfo = JSONObject.parseObject(JSONObject.toJSONString(questionVO));
+							//	}
+							//	break;
+							case (TaskNodeTypeConstants.PROPAGANDA_ARTICLE): // 宣教文章-返回宣教库信息
 								if (node.getPropagandaInfoId() != null) {
 									PropagandaMaterialsVo propagandaMaterialsVo = propagandaInfoService.selectPropagandaInfoById(node.getPropagandaInfoId());
 									signNodeInfo.setPropagandaContent(propagandaMaterialsVo.getPropagandaContent());