From d047a35e640a59e02a422d9a9a62c752c88b69b5 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 28 十月 2026 15:51:52 +0800
Subject: [PATCH] 【丽水】 同一 inhospid + taskid 已存在未删除的首次随访（upid 为空）时，不再插入，避免出现两条首次随访

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index d9513ec..2de4dec 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -82,6 +82,7 @@
         <result property="visitCount" column="visit_count"/>
         <result property="isVisitAgain" column="is_visit_again"/>
         <result property="upid" column="upid"/>
+        <result property="visitType" column="visit_type"/>
         <result property="visitTime" column="visit_time"/>
         <result property="visitDeptName" column="visit_dept_name"/>
         <result property="visitDeptCode" column="visit_dept_code"/>
@@ -404,6 +405,7 @@
         <if test="managementDoctorCode != null ">and management_doctor_code = #{managementDoctorCode}</if>
         <if test="submit != null ">and submit = #{submit}</if>
         <if test="upid != null ">and upid = #{upid}</if>
+        <if test="visitCount != null ">and visit_count = #{visitCount}</if>
         <if test="patfrom != null ">and patfrom = #{patfrom}</if>
         <if test="serviceType != null ">and service_type = #{serviceType}</if>
         <if test="patid != null ">and patid = #{patid}</if>
@@ -949,6 +951,12 @@
         </if>
         <if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
         <if test="managementDoctor != null">and management_doctor like concat('%',#{managementDoctor}, '%')</if>
+        <if test="startOutHospTime != null">
+            AND date_format(endtime,'%y%m%d') &gt;= date_format(#{startOutHospTime},'%y%m%d')
+        </if>
+        <if test="endOutHospTime != null">
+            AND date_format(endtime,'%y%m%d') &lt;= date_format(#{endOutHospTime},'%y%m%d')
+        </if>
         ) a where a.finished =1)
     </select>
 

--
Gitblit v1.9.3