From 52fd89a3c439fdbf240a72487f97aad92725e9c5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 07 六月 2025 11:32:59 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 670e726..2ffd536 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -80,6 +80,8 @@
         <result property="isVisitAgain" column="is_visit_again"/>
         <result property="upid" column="upid"/>
         <result property="visitTime" column="visit_time"/>
+        <result property="visitDeptName" column="visit_dept_name"/>
+        <result property="visitDeptCode" column="visit_dept_code"/>
     </resultMap>
 
     <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -95,6 +97,8 @@
                task_guid,
                patfrom,
                upid,
+               visit_dept_name,
+               visit_dept_code,
                visit_time,
                inhospid,
                visit_count,
@@ -289,13 +293,21 @@
             <if test="excep != null ">and excep = #{excep}</if>
             <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
             <if test="score != null">and score = #{score}</if>
-            <if test="visitCount != null">and visit_count = #{visitCount}</if>
+            <!--            <if test="visitCount != null">and visit_count = #{visitCount}</if>-->
+            <if test="visitCount != null and visitCount == 1">
+                AND visit_count = 1
+            </if>
+            <if test="visitCount != null and visitCount > 1">
+                AND visit_count > 1
+            </if>
             <if test="remark != null">and remark = #{remark}</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>
             <if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
             <if test="visitTime != null">and visit_time = #{visitTime}</if>
+            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
+            <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
         </where>
         <if test="sort != null  and sort==0">order by endtime asc</if>
         <if test="sort != null  and sort==1">order by endtime desc</if>
@@ -322,6 +334,8 @@
             <if test="upid != null ">and upid = #{upid}</if>
             <if test="visitCount != null ">and visit_count = #{visitCount}</if>
             <if test="isVisitAgain != null ">and is_visit_again = #{isVisitAgain}</if>
+            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
+            <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
         </where>
 
     </select>
@@ -374,6 +388,8 @@
             <if test="excep != null ">and excep = #{excep}</if>
             <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
             <if test="visitTime != null ">and visit_time = #{visitTime}</if>
+            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
+            <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
         </where>
 
     </select>
@@ -472,6 +488,8 @@
             <if test="isVisitAgain != null ">is_visit_again,</if>
             <if test="upid != null ">upid,</if>
             <if test="visit_time != null ">visitTime,</if>
+            <if test="visitDeptCode != null">visit_dept_code,</if>
+            <if test="visitDeptName != null">visit_dept_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sendname != null">#{sendname},</if>
@@ -551,6 +569,8 @@
             <if test="isVisitAgain != null ">#{isVisitAgain},</if>
             <if test="upid != null ">#{upid},</if>
             <if test="visitTime != null ">#{visitTime},</if>
+            <if test="visitDeptCode != null">#{visitDeptCode},</if>
+            <if test="visitDeptName != null">#{visitDeptName},</if>
         </trim>
     </insert>
 
@@ -635,6 +655,8 @@
             <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
             <if test="upid != null ">upid=#{upid},</if>
             <if test="visitTime != null ">visit_time=#{visitTime},</if>
+            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
+            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
         </trim>
         where id = #{id}
     </update>
@@ -720,6 +742,8 @@
             <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
             <if test="upid != null ">upid=#{upid},</if>
             <if test="visitTime != null ">visit_time=#{visitTime},</if>
+            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
+            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
         </trim>
         <where>
             <if test="patid != null ">and patid = #{patid}</if>
@@ -807,6 +831,8 @@
             <if test="patguid != null ">patguid=#{patguid},</if>
             <if test="upid != null ">upid=#{upid},</if>
             <if test="visitTime != null ">visit_time=#{visitTime},</if>
+            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
+            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
         </trim>
         where patid = #{patid} and taskid = #{taskid}
     </update>
@@ -891,6 +917,8 @@
             <if test="patguid != null ">patguid=#{patguid},</if>
             <if test="upid != null ">upid=#{upid},</if>
             <if test="visitTime != null ">visit_time=#{visitTime},</if>
+            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
+            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
         </trim>
         where task_guid = #{taskGuid} and task_name = #{taskName}
     </update>
@@ -935,6 +963,8 @@
                 AND endtime > #{startTime}
                 AND endtime &lt;= #{endTime}
             </if>
+            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
+            <if test="visitDeptName != null">abd visit_dept_name = #{visitDeptName}</if>
         </where>
     </select>
 
@@ -1010,6 +1040,8 @@
                task_guid,
                leavediagname,
                patguid,
+               visitDeptCode,
+               visitDeptName,
                leaveicd10code
         FROM service_subtask,
              JSON_TABLE(send_time_slot, '$[*]' COLUMNS (

--
Gitblit v1.9.3