From e39d8e5ba5c48b7a978062de796b767037aa9cf9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 20 十月 2026 16:00:33 +0800
Subject: [PATCH] 【丽水】service_subtask 新增 '医生处理意见' doctor_opinion
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 7 +++++++
smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java | 6 ++++++
smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java | 7 +++++++
smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java | 6 ++++++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 14 +++++++++++++-
smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java | 6 ++++++
6 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index c7efd5b..92eccf1 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -185,6 +185,13 @@
private String suggest;
/**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @Excel(name = "鍖荤敓澶勭悊鎰忚")
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
+
+ /**
* 鍙戦�佹棩鏈�
*/
@JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
index fdb7c2d..3896846 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExport.java
@@ -200,5 +200,12 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @Excel(name = "鍖荤敓澶勭悊鎰忚")
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
index a613ca0..6e60a22 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
@@ -60,6 +60,12 @@
private String remark;
/**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
+
+ /**
* 澶囨敞
*/
@ApiModelProperty(value = "")
diff --git a/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java
index 6dfd9ef..3c108fa 100644
--- a/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java
@@ -638,6 +638,12 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
+
/**
* 鍑洪櫌鏃堕棿
diff --git a/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java b/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
index 099a021..3cd03be 100644
--- a/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
+++ b/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
@@ -657,6 +657,12 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
+
/**
* 鍑洪櫌鏃堕棿
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 40a1c34..1948988 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -73,6 +73,7 @@
<result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
<result property="excep" column="excep"/>
<result property="remark" column="remark"/>
+ <result property="doctorOpinion" column="doctor_opinion"/>
<result property="suggest" column="suggest"/>
<result property="sendstate" column="sendstate"/>
<result property="inhospid" column="inhospid"/>
@@ -183,6 +184,7 @@
long_send_time,
openid,
remark,
+ doctor_opinion,
service_type,
libtemplateid,
libtemplatename,
@@ -594,6 +596,7 @@
AND visit_count > 1
</if>
<if test="remark != null">and remark = #{remark}</if>
+ <if test="doctorOpinion != null and doctorOpinion != ''">and doctor_opinion like concat('%', #{doctorOpinion}, '%')</if>
<if test="suggest != null">and suggest = #{suggest}</if>
<if test="createBy != null">and create_by = #{createBy}</if>
<if test="taskGuid != null">and task_guid = #{taskGuid}</if>
@@ -1053,6 +1056,7 @@
<if test="nurseName != null ">nurse_name,</if>
<if test="nurseId != null ">nurse_id,</if>
<if test="remark != null ">remark,</if>
+ <if test="doctorOpinion != null ">doctor_opinion,</if>
<if test="suggest != null ">suggest,</if>
<if test="sendstate != null ">sendstate,</if>
<if test="inhospid != null ">inhospid,</if>
@@ -1152,6 +1156,7 @@
<if test="nurseName != null ">#{nurseName},</if>
<if test="nurseId != null ">#{nurseId},</if>
<if test="remark != null ">#{remark},</if>
+ <if test="doctorOpinion != null ">#{doctorOpinion},</if>
<if test="suggest != null ">#{suggest},</if>
<if test="sendstate != null ">#{sendstate},</if>
<if test="inhospid != null ">#{inhospid},</if>
@@ -1266,6 +1271,7 @@
<if test="nurseName != null ">nurse_name=#{nurseName},</if>
<if test="nurseId != null ">nurse_id=#{nurseId},</if>
<if test="remark != null ">remark=#{remark},</if>
+ <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>
<if test="suggest != null ">suggest=#{suggest},</if>
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="patfrom != null ">patfrom=#{patfrom},</if>
@@ -1372,6 +1378,7 @@
<if test="nurseName != null ">nurse_name=#{nurseName},</if>
<if test="nurseId != null ">nurse_id=#{nurseId},</if>
<if test="remark != null ">remark=#{remark},</if>
+ <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>
<if test="suggest != null ">suggest=#{suggest},</if>
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="patfrom != null ">patfrom=#{patfrom},</if>
@@ -1477,6 +1484,7 @@
<if test="nurseName != null ">nurse_name=#{nurseName},</if>
<if test="nurseId != null ">nurse_id=#{nurseId},</if>
<if test="remark != null ">remark=#{remark},</if>
+ <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>
<if test="suggest != null ">suggest=#{suggest},</if>
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="patfrom != null ">patfrom=#{patfrom},</if>
@@ -1589,6 +1597,7 @@
<if test="nurseName != null ">nurse_name=#{nurseName},</if>
<if test="nurseId != null ">nurse_id=#{nurseId},</if>
<if test="remark != null ">remark=#{remark},</if>
+ <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>
<if test="suggest != null ">suggest=#{suggest},</if>
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="patfrom != null ">patfrom=#{patfrom},</if>
@@ -1960,6 +1969,7 @@
continue_time_next,
task_situation,
remark,
+ doctor_opinion,
is_manually_called
from service_subtask
where 1=1
@@ -2464,6 +2474,7 @@
nurse_id,
nurse_name,
remark,
+ doctor_opinion,
inhospid,
patfrom,
task_guid,
@@ -3357,7 +3368,8 @@
continue_count,
continue_time_next,
task_situation,
- remark
+ remark,
+ doctor_opinion
from service_subtask
where 1=1
and del_flag = 0
--
Gitblit v1.9.3