From 7e2a9410f394a7870fc0162b25a0db5defb9cb47 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 17 二月 2025 23:20:37 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 14 +++++--
smartor/src/main/java/com/smartor/domain/ServiceTask.java | 18 +++++++++
smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java | 18 +++++++++
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 23 +++++++++++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 26 ++++++++----
5 files changed, 85 insertions(+), 14 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 7a4e6c6..aba3d00 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -438,11 +438,17 @@
private String wechat;
/**
- * 璇婃柇鍚嶇О
+ * 鍑洪櫌璇婃柇缂栫爜
*/
- @Excel(name = " 璇婃柇鍚嶇О")
- @ApiModelProperty(value = "璇婃柇鍚嶇О")
- private String diagname;
+ @Excel(name = " 鍑洪櫌璇婃柇缂栫爜")
+ @ApiModelProperty(value = "鍑洪櫌璇婃柇缂栫爜")
+ private String leaveicd10code;
+ /**
+ * 鍑洪櫌璇婃柇鍚嶇О
+ */
+ @Excel(name = " 鍑洪櫌璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "鍑洪櫌璇婃柇鍚嶇О")
+ private String leavediagname;
/**
* 鎮ｈ�匢D
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTask.java b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
index f0d9e35..eeee244 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTask.java
@@ -409,4 +409,22 @@
@ApiModelProperty(value = "鏄惁寰幆鎵ц鎮ｈ�咃紙0:涓嶅惊鐜� 1锛氬惊鐜級")
private Long patCycle;
+ /**
+ * 鏄惁鏈変笅涓换鍔★紝鐢ㄤ簬澶氫换鍔″叧鑱�
+ */
+ @ApiModelProperty(value = "鏄惁鏈変笅涓换鍔★紙0:鏃� 1锛氭湁锛�")
+ @Excel(name = "鏄惁鏈変笅涓换鍔★紙0:鏃� 1锛氭湁锛�")
+ private String nexttaskflag;
+ /**
+ * 涓嬩竴涓换鍔d
+ */
+ @ApiModelProperty(value = "涓嬩竴涓换鍔d")
+ @Excel(name = " 涓嬩竴涓换鍔d")
+ private Long nexttaskid;
+ /**
+ * 涓嬩竴涓换鍔″悕绉�
+ */
+ @ApiModelProperty(value = "涓嬩竴涓换鍔″悕绉�")
+ @Excel(name = " 涓嬩竴涓换鍔″悕绉�")
+ private String nexttaskname;
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
index 2265b20..af0b033 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -349,4 +349,22 @@
@ApiModelProperty(value = "鏄惁寰幆鎵ц鎮ｈ�咃紙0:涓嶅惊鐜� 1锛氬惊鐜級")
private Long patCycle = 0L;
+ /**
+ * 鏄惁鏈変笅涓换鍔★紝鐢ㄤ簬澶氫换鍔″叧鑱�
+ */
+ @ApiModelProperty(value = "鏄惁鏈変笅涓换鍔★紙0:鏃� 1锛氭湁锛�")
+ @Excel(name = "鏄惁鏈変笅涓换鍔★紙0:鏃� 1锛氭湁锛�")
+ private String nexttaskflag;
+ /**
+ * 涓嬩竴涓换鍔d
+ */
+ @ApiModelProperty(value = "涓嬩竴涓换鍔d")
+ @Excel(name = " 涓嬩竴涓换鍔d")
+ private Long nexttaskid;
+ /**
+ * 涓嬩竴涓换鍔″悕绉�
+ */
+ @ApiModelProperty(value = "涓嬩竴涓换鍔″悕绉�")
+ @Excel(name = " 涓嬩竴涓换鍔″悕绉�")
+ private String nexttaskname;
}
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 4d04ed1..694d527 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -50,7 +50,8 @@
<result property="hospno" column="hospno"/>
<result property="hospType" column="hosp_type"/>
<result property="wechat" column="wechat"/>
- <result property="diagname" column="diagname"/>
+ <result property="leaveicd10code" column="leaveicd10code"/>
+ <result property="leavediagname" column="leavediagname"/>
<result property="deptname" column="deptname"/>
<result property="admindate" column="admindate"/>
<result property="roomno" column="roomno"/>
@@ -153,7 +154,7 @@
stop_state,
leavehospitaldistrictcode,
leavehospitaldistrictname,
- diagname
+ leavediagname,leaveicd10code
from service_subtask
</sql>
@@ -312,7 +313,8 @@
<if test="roomno != null and roomno != ''">roomno,</if>
<if test="admindate != null and admindate != ''">admindate,</if>
<if test="deptname != null and deptname != ''">deptname,</if>
- <if test="diagname != null and diagname != ''">diagname,</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code,</if>
+ <if test="leavediagname != null and leavediagname != ''">leavediagname,</if>
<if test="libtemplateid != null ">libtemplateid,</if>
<if test="libtemplatename != null ">libtemplatename,</if>
<if test="patid != null ">patid,</if>
@@ -385,7 +387,8 @@
<if test="roomno != null and roomno != ''">#{roomno},</if>
<if test="admindate != null and admindate != ''">#{admindate},</if>
<if test="deptname != null and deptname != ''">#{deptname},</if>
- <if test="diagname != null and diagname != ''">#{diagname},</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">#{leaveicd10code},</if>
+ <if test="leavediagname != null and leavediagname != ''">#{leavediagname},</if>
<if test="libtemplateid != null ">#{libtemplateid},</if>
<if test="libtemplatename != null ">#{libtemplatename},</if>
<if test="patid != null ">#{patid},</if>
@@ -462,7 +465,8 @@
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
<if test="admindate != null and admindate != ''">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
- <if test="diagname != null and diagname != ''">diagname = #{diagname},</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
+ <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
<if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
<if test="patid != null ">patid = #{patid},</if>
@@ -540,7 +544,8 @@
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
<if test="admindate != null and admindate != ''">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
- <if test="diagname != null and diagname != ''">diagname = #{diagname},</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
+ <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
<if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
<if test="patid != null ">patid = #{patid},</if>
@@ -619,7 +624,8 @@
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
<if test="admindate != null and admindate != ''">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
- <if test="diagname != null and diagname != ''">diagname = #{diagname},</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
+ <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
<if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
<if test="patid != null ">patid = #{patid},</if>
@@ -697,7 +703,8 @@
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
<if test="admindate != null and admindate != ''">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
- <if test="diagname != null and diagname != ''">diagname = #{diagname},</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
+ <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
<if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
<if test="patid != null ">patid = #{patid},</if>
@@ -838,7 +845,8 @@
inhospid,
patfrom,
task_guid,
- diagname
+ leavediagname,
+ leaveicd10code
FROM service_subtask,
JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
begantime DATETIME PATH '$.begantime',
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index b29b82d..fa56374 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -54,6 +54,9 @@
<result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
<result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
<result property="compensateDate" column="compensate_date"/>
+ <result property="nexttaskflag" column="nexttaskflag"/>
+ <result property="nexttaskid" column="nexttaskid"/>
+ <result property="nexttaskname" column="nexttaskname"/>
</resultMap>
<sql id="selectServiceTaskVo">
@@ -104,7 +107,10 @@
jsy,
leavehospitaldistrictcode,
leavehospitaldistrictname,
- orgid
+ orgid,
+ nexttaskflag,
+ nexttaskid,
+ nexttaskname
from service_task
</sql>
@@ -154,6 +160,9 @@
<if test="sendState != null ">and send_state = #{sendState}</if>
<if test="compensateDate != null ">and compensate_date = #{compensateDate}</if>
<if test="patCycle != null ">and pat_cycle = #{patCycle}</if>
+ <if test="nexttaskflag != null ">and nexttaskflag = #{nexttaskflag}</if>
+ <if test="nexttaskid != null ">and nexttaskid = #{nexttaskid}</if>
+ <if test="nexttaskname != null ">and nexttaskname = #{nexttaskname}</if>
<if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname =
#{leavehospitaldistrictname}
</if>
@@ -229,6 +238,9 @@
service_task.leavehospitaldistrictcode,
service_task.leavehospitaldistrictname,
service_task.pat_cycle,
+ service_task.nexttaskflag,
+ service_task.nexttaskid,
+ service_task.nexttaskname,
service_task.orgid from service_task
<where>
service_task.del_flag=0
@@ -297,6 +309,9 @@
<if test="sendState != null ">and service_task.send_state = #{sendState}</if>
<if test="compensateDate != null ">and service_task.compensate_date = #{compensateDate}</if>
<if test="patCycle != null ">and service_task.pat_cycle = #{patCycle}</if>
+ <if test="nexttaskflag != null ">and nexttaskflag = #{nexttaskflag}</if>
+ <if test="nexttaskid != null ">and nexttaskid = #{nexttaskid}</if>
+ <if test="nexttaskname != null ">and nexttaskname = #{nexttaskname}</if>
<if test="leavehospitaldistrictname != null ">and service_task.leavehospitaldistrictname =
#{leavehospitaldistrictname}
</if>
@@ -389,6 +404,9 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="orgid != null">#{orgid},</if>
+ <if test="nexttaskflag != null">#{nexttaskflag},</if>
+ <if test="nexttaskid != null">#{nexttaskid},</if>
+ <if test="nexttaskname != null">#{nexttaskname},</if>
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="preachform != null">#{preachform},</if>
@@ -442,6 +460,9 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="nexttaskflag != null">#{nexttaskflag},</if>
+ <if test="nexttaskid != null">#{nexttaskid},</if>
+ <if test="nexttaskname != null">#{nexttaskname},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="preachform != null">preachform = #{preachform},</if>
--
Gitblit v1.9.3