From c1d3c5e330a4941bf077e485924101ed7921d726 Mon Sep 17 00:00:00 2001 From: youxilong Date: Thu, 11 Apr 2024 13:44:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientTaskExecuteRecordVO.java | 14 ++++++++++++++ .../PatientTaskExecuteRecordMapper.xml | 11 ++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) 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 cab744d2..df388278 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 @@ -3,8 +3,10 @@ package com.xinelu.manage.vo.patienttaskexecuterecord; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord; import io.swagger.annotations.ApiModelProperty; + import java.time.LocalDate; import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; @@ -102,4 +104,16 @@ 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 taskType; + + @ApiModelProperty(value = "模板id") + private String templateId; + + @ApiModelProperty(value = "文字提醒内容(任务类型为文字提醒使用)") + private String textRemindContent; + + } 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 0afc8613..16342e9f 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.xml @@ -111,9 +111,18 @@ pi.admission_time, pi.discharge_time, pi.in_hospital_number, - pi.patient_phone + pi.patient_phone, + spmrn.task_type, + 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 + END AS 'templateId', + IF(spmrn.task_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 where pi.del_flag = 0 and pi.patient_name = #{patientName}