From d9995ad7f92c5ecbeb4c6e76892314102bfd2259 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Mon, 12 Aug 2024 16:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PatientTaskExecuteRecordVO.java                    |  4 ----
 .../PatientTaskExecuteRecordMapper.xml                 | 10 +++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java
index db5a43e2..94dd0409 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java
@@ -109,10 +109,6 @@ public class PatientTaskExecuteRecordVO extends PatientTaskExecuteRecord {
     @ApiModelProperty(value = "手术记录")
     private String surgicalRecord;
 
-
-    @ApiModelProperty(value = "任务类型，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP")
-    private String taskNodeType;
-
     @ApiModelProperty(value = "模板id")
     private String templateId;
 
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml
index ddc0e698..00ebf83d 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml
@@ -116,12 +116,12 @@
         spmrn.task_node_type,
         spmrn.route_handle_remark,
         CASE
-        WHEN spmrn.task_type = 'PHONE_OUTBOUND' THEN spmrn.phone_id
-        WHEN spmrn.task_type = 'QUESTIONNAIRE_SCALE' THEN spmrn.question_info_id
-        WHEN spmrn.task_type = 'ARTIFICIAL_FOLLOW_UP' THEN spmrn.follow_template_id
-        WHEN spmrn.task_type = 'PROPAGANDA_ARTICLE' THEN spmrn.propaganda_info_id
+        WHEN spmrn.task_node_type = 'PHONE_OUTBOUND' THEN spmrn.phone_id
+        WHEN spmrn.task_node_type = 'QUESTIONNAIRE_SCALE' THEN spmrn.question_info_id
+        WHEN spmrn.task_node_type = 'ARTIFICIAL_FOLLOW_UP' THEN spmrn.follow_template_id
+        WHEN spmrn.task_node_type = 'PROPAGANDA_ARTICLE' THEN spmrn.propaganda_info_id
         END AS 'templateId',
-        IF(spmrn.task_type ='TEXT_REMIND',spmrn.text_remind_content,NULL) AS textRemindContent
+        IF(spmrn.task_node_type ='TEXT_REMIND',spmrn.text_remind_content,NULL) AS textRemindContent
         from patient_task_execute_record pter
         LEFT JOIN patient_info pi ON pi.id = pter.patient_id
         LEFT JOIN sign_patient_manage_route_node spmrn ON pter.manage_route_node_id = spmrn.id