From a5c7efc90dd29fa261d7ae7eb73240ce1d88b3ce Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 06 十一月 2025 11:06:58 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 272f207..820d717 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -72,11 +72,13 @@
         <result property="fuspecialadvice" column="fuspecialadvice"/>
         <result property="managementDoctor" column="management_doctor"/>
         <result property="managementDoctorCode" column="management_doctor_code"/>
+        <result property="campusid" column="campusid"/>
     </resultMap>
 
     <sql id="selectPatMedInhospVo">
         select inhospid,
                patname,
+               campusid,
                fuflag,
                management_doctor,
                management_doctor_code,
@@ -169,6 +171,7 @@
         b.starttime,
         b.endtime,
         b.deptcode,
+        b.campusid,
         b.deptname,
         b.roomno,
         b.bed_no,
@@ -249,8 +252,9 @@
             <if test="wardcheckFlag != null ">and b.wardcheck_flag = #{wardcheckFlag}</if>
             <if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if>
             <if test="cry != null and cry == 0 ">and b.endtime is null</if>
-            <if test="cry != null and cry == 1 ">and b.endtime is not null</if>
+            <if test="cry != null and cry == 1 ">and b.inhospstate=1</if>
             <if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
+            <if test="campusid != null ">and b.campusid = #{campusid}</if>
             <if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if>
             <if test="outWayId != null ">and b.out_way_id = #{outWayId}</if>
             <if test="outWayName != null ">and b.out_way_name = #{outWayName}</if>
@@ -310,6 +314,7 @@
         b.management_doctor,
         b.management_doctor_code,
         b.out_way_id,
+        b.campusid,
         b.out_way_name,
         b.deptcheck_flag,
         b.wardcheck_flag,
@@ -382,14 +387,15 @@
         b.patname,
         b.operator_id,
         b.operator,
+        b.campusid,
         b.remark,
         b.out_way_id,
         b.out_way_name,
         b.nurse_id,
         b.nurse_name,
-        b.deptcheckFlag,
-        b.diagcheckFlag,
-        b.wardcheckFlag,
+        b.deptcheck_flag,
+        b.diagcheck_flag,
+        b.wardcheck_flag,
         b.inhospstate,
         b.patno,
         b.inhospno,
@@ -436,7 +442,7 @@
         b.futypecode,
         b.futypedesc,
         b.fuadvice,
-        b.fuspecialadvice
+        b.fuspecialadvice,
         b.schemetime
         FROM
         pat_med_inhosp b,
@@ -456,10 +462,12 @@
                 concat('%', #{hospitaldistrictname}, '%')
             </if>
             <if test="endtime != null ">and b.endtime = #{endtime}</if>
+            <if test="serialnum != null ">and b.serialnum = #{serialnum}</if>
             <if test="fuflag != null ">and b.fuflag = #{fuflag}</if>
             <if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
             <if test="nurseName != null ">and b.nurse_name = #{nurseName}</if>
             <if test="patno != null ">and b.patno = #{patno}</if>
+            <if test="campusid != null ">and b.campusid = #{campusid}</if>
             <if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if>
             <if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
             <if test="wardcheckFlag != null ">and b.wardcheck_flag = #{wardcheckFlag}</if>
@@ -568,6 +576,7 @@
             <if test="fuspecialadvice != null ">fuspecialadvice,</if>
             <if test="managementDoctor != null ">management_doctor,</if>
             <if test="managementDoctorCode != null ">management_doctor_code,</if>
+            <if test="campusid != null ">campusid,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serialnum != null">#{serialnum},</if>
@@ -632,6 +641,7 @@
             <if test="fuspecialadvice != null ">#{fuspecialadvice},</if>
             <if test="managementDoctor != null ">#{managementDoctor},</if>
             <if test="managementDoctorCode != null ">#{managementDoctorCode},</if>
+            <if test="campusid != null ">#{campusid},</if>
         </trim>
     </insert>
 
@@ -650,7 +660,7 @@
         nurse_id, nurse_name, out_way_id, out_way_name, guid,
         operator, operator_id, inhospno, remark,
         fuflag, fudate, fuperiod, futypecode, futypedesc, fuadvice, fuspecialadvice, management_doctor,
-        management_doctor_doctor
+        management_doctor_doctor,campusid
         )
         values
         <foreach collection="list" item="item" separator=",">
@@ -672,7 +682,7 @@
             #{item.nurseId}, #{item.nurseName}, #{item.outWayId}, #{item.outWayName}, #{item.guid},
             #{item.operator}, #{item.operatorId}, #{item.inhospno}, #{item.remark},
             #{item.fuflag}, #{item.fudate}, #{item.fuperiod}, #{item.futypecode}, #{item.futypedesc}, #{item.fuadvice},
-            #{item.fuspecialadvice}, #{item.managementDoctor}, #{item.managementDoctorCode}
+            #{item.fuspecialadvice}, #{item.managementDoctor}, #{item.managementDoctorCode}, #{item.campusid}
             )
         </foreach>
     </insert>
@@ -742,6 +752,7 @@
             <if test="fuspecialadvice != null ">fuspecialadvice = #{fuspecialadvice},</if>
             <if test="managementDoctor != null ">management_doctor = #{managementDoctor},</if>
             <if test="managementDoctorCode != null ">management_doctor_code = #{managementDoctorCode}</if>
+            <if test="campusid != null ">campusid = #{campusid}</if>
 
         </trim>
         where inhospid = #{inhospid}

--
Gitblit v1.9.3