From 907641e56c2085aaa81f267946dc3e3e9fca73e7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 09:39:02 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 131 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 124 insertions(+), 7 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index b91d5d2..3c0d5cf 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -9,6 +9,8 @@
<result property="sendname" column="sendname"/>
<result property="phone" column="phone"/>
<result property="sex" column="sex"/>
+ <result property="nurseName" column="nurse_name"/>
+ <result property="nurseId" column="nurse_id"/>
<result property="age" column="age"/>
<result property="sfzh" column="sfzh"/>
<result property="addr" column="addr"/>
@@ -58,6 +60,17 @@
<result property="longSendTime" column="long_send_time"/>
<result property="serviceType" column="service_type"/>
<result property="score" column="score"/>
+ <result property="submit" column="submit"/>
+ <result property="drname" column="drname"/>
+ <result property="drcode" column="drcode"/>
+ <result property="starttime" column="starttime"/>
+ <result property="endtime" column="endtime"/>
+ <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
+ <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
+ <result property="excep" column="excep"/>
+ <result property="remark" column="remark"/>
+ <result property="suggest" column="suggest"/>
+ <result property="sendstate" column="sendstate"/>
</resultMap>
<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -70,8 +83,19 @@
<sql id="selectServiceSubtaskVo">
select id,
hosp_type,
+ suggest,
+ sendstate,
+ endtime,
+ nurse_id,
+ nurse_name,
+ starttime,
+ submit,
+ drname,
+ excep,
+ drcode,
long_send_time,
openid,
+ remark,
service_type,
libtemplateid,
libtemplatename,
@@ -121,6 +145,8 @@
admindate,
deptname,
stop_state,
+ leavehospitaldistrictcode,
+ leavehospitaldistrictname,
diagname
from service_subtask
</sql>
@@ -132,8 +158,15 @@
del_flag=0
<if test="sendname != null and sendname != ''">and sendname like concat('%', #{sendname}, '%')</if>
<if test="phone != null and phone != ''">and phone = #{phone}</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">and
+ leavehospitaldistrictcode = #{leavehospitaldistrictcode}
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">and
+ leavehospitaldistrictname = #{leavehospitaldistrictname}
+ </if>
<if test="sex != null and sex != ''">and sex = #{sex}</if>
<if test="age != null ">and age = #{age}</if>
+ <if test="submit != null ">and submit = #{submit}</if>
<if test="serviceType != null ">and service_type = #{serviceType}</if>
<if test="patid != null ">and patid = #{patid}</if>
<if test="sfzh != null and sfzh != ''">and sfzh = #{sfzh}</if>
@@ -153,6 +186,7 @@
<if test="exrecallcount != null ">and exrecallcount = #{exrecallcount}</if>
<if test="pulltime != null ">and pulltime = #{pulltime}</if>
<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
+ <if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
<if test="labelstatus != null ">and labelstatus = #{labelstatus}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
@@ -172,9 +206,20 @@
<if test="openid != null ">and openid = #{openid}</if>
<if test="longSendTime != null ">and long_send_time = #{longSendTime}</if>
<if test="sendstate != null ">and sendstate = #{sendstate}</if>
- <if test="score != null">
- and score = #{score}
+ <if test="drname != null ">and drname = #{drname}</if>
+ <if test="drcode != null ">and drcode = #{drcode}</if>
+ <if test="starttime != null ">and starttime = #{starttime}</if>
+ <if test="endtime != null ">and endtime = #{endtime}</if>
+ <if test="excep != null ">and excep = #{excep}</if>
+ <if test="nurseId != null ">and nurse_id = #{nurseId}</if>
+ <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
+ <if test="leavehospitaldistrictcode != null ">and leavehospitaldistrictcode = #{leavehospitaldistrictcode}
</if>
+ <if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname = #{leavehospitaldistrictname}
+ </if>
+ <if test="score != null">and score = #{score}</if>
+ <if test="remark != null">and remark = #{remark}</if>
+ <if test="suggest != null">and suggest = #{suggest}</if>
</where>
order by update_time desc,id desc
</select>
@@ -208,7 +253,6 @@
<if test="pulltime != null">pulltime,</if>
<if test="deptcode != null">deptcode,</if>
<if test="labelstatus != null">labelstatus,</if>
- <if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="createBy != null">create_by,</if>
@@ -240,6 +284,23 @@
<if test="longSendTime != null ">long_send_time,</if>
<if test="serviceType != null ">service_type,</if>
<if test="score != null ">score,</if>
+ <if test="submit != null ">submit,</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">
+ leavehospitaldistrictcode,
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">
+ leavehospitaldistrictname,
+ </if>
+ <if test="drname != null ">drname,</if>
+ <if test="drcode != null ">drcode,</if>
+ <if test="endtime != null ">endtime,</if>
+ <if test="starttime != null ">starttime,</if>
+ <if test="excep != null ">excep,</if>
+ <if test="nurseName != null ">nurse_name,</if>
+ <if test="nurseId != null ">nurse_id,</if>
+ <if test="remark != null ">remark,</if>
+ <if test="suggest != null ">suggest,</if>
+ <if test="sendstate != null ">sendstate,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -262,7 +323,6 @@
<if test="pulltime != null">#{pulltime},</if>
<if test="deptcode != null">#{deptcode},</if>
<if test="labelstatus != null">#{labelstatus},</if>
- <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
@@ -294,6 +354,23 @@
<if test="longSendTime != null ">#{longSendTime},</if>
<if test="serviceType != null ">#{serviceType},</if>
<if test="score != null ">#{score},</if>
+ <if test="submit != null ">#{submit},</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">
+ #{leavehospitaldistrictcode},
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">
+ #{leavehospitaldistrictname},
+ </if>
+ <if test="drname != null ">#{drname},</if>
+ <if test="drcode != null ">#{drcode},</if>
+ <if test="endtime != null ">#{endtime},</if>
+ <if test="starttime != null ">#{starttime},</if>
+ <if test="excep != null ">#{excep},</if>
+ <if test="nurseName != null ">#{nurseName},</if>
+ <if test="nurseId != null ">#{nurseId},</if>
+ <if test="remark != null ">#{remark},</if>
+ <if test="suggest != null ">#{suggest},</if>
+ <if test="sendstate != null ">#{sendstate},</if>
</trim>
</insert>
@@ -320,7 +397,6 @@
<if test="pulltime != null">pulltime = #{pulltime},</if>
<if test="deptcode != null">deptcode = #{deptcode},</if>
<if test="labelstatus != null">labelstatus = #{labelstatus},</if>
- <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@@ -353,6 +429,22 @@
<if test="sendstate != null ">sendstate = #{sendstate},</if>
<if test="serviceType != null ">service_type = #{serviceType},</if>
<if test="score != null ">score = #{score},</if>
+ <if test="submit != null ">submit = #{submit},</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">leavehospitaldistrictcode
+ = #{leavehospitaldistrictcode},
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">leavehospitaldistrictname
+ = #{leavehospitaldistrictname},
+ </if>
+ <if test="drname != null ">drname = #{drname},</if>
+ <if test="drcode != null ">drcode = #{drcode},</if>
+ <if test="starttime != null ">starttime = #{starttime},</if>
+ <if test="endtime != null ">endtime = #{endtime},</if>
+ <if test="excep != null ">excep = #{excep},</if>
+ <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="suggest != null ">suggest=#{suggest},</if>
</trim>
where id = #{id}
</update>
@@ -380,7 +472,6 @@
<if test="pulltime != null">pulltime = #{pulltime},</if>
<if test="deptcode != null">deptcode = #{deptcode},</if>
<if test="labelstatus != null">labelstatus = #{labelstatus},</if>
- <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@@ -412,7 +503,22 @@
<if test="longSendTime != null ">long_send_time = #{longSendTime},</if>
<if test="serviceType != null ">service_type = #{serviceType},</if>
<if test="score != null ">score = #{score},</if>
-
+ <if test="submit != null ">submit = #{submit},</if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">leavehospitaldistrictcode
+ = #{leavehospitaldistrictcode},
+ </if>
+ <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">leavehospitaldistrictname
+ = #{leavehospitaldistrictname},
+ </if>
+ <if test="drname != null ">drname = #{drname},</if>
+ <if test="drcode != null ">drcode = #{drcode},</if>
+ <if test="endtime != null ">endtime = #{endtime},</if>
+ <if test="starttime != null ">starttime = #{starttime},</if>
+ <if test="excep != null ">excep = #{excep},</if>
+ <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="suggest != null ">suggest=#{suggest},</if>
</trim>
where patid = #{patid} and taskid = #{taskid}
</update>
@@ -439,6 +545,7 @@
sendname,
long_send_time,
phone,
+ suggest,
sex,
age,
openid,
@@ -485,6 +592,16 @@
service_type,
deptname,
score,
+ drname,
+ drcode,
+ starttime,
+ endtime,
+ leavehospitaldistrictcode,
+ leavehospitaldistrictname,
+ excep,
+ nurse_id,
+ nurse_name,
+ remark,
diagname
FROM service_subtask,
JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
--
Gitblit v1.9.3