From fcb98e4558897945a316d04555923355b8e60605 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 21 七月 2026 10:16:56 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组

---
 smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 4933abe..bff4c2b 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -76,11 +76,13 @@
         <result property="managementDoctor" column="management_doctor"/>
         <result property="managementDoctorCode" column="management_doctor_code"/>
         <result property="campusid" column="campusid"/>
+        <result property="inhospMydFlag" column="inhosp_myd_flag"/>
     </resultMap>
 
     <sql id="selectPatMedInhospVo">
         select inhospid,
                patname,
+               inhosp_myd_flag,
                campusid,
                fuflag,
                management_doctor,
@@ -216,6 +218,7 @@
         b.futypedesc,
         b.fuadvice,
         b.fuspecialadvice,
+        b.inhosp_myd_flag,
         a.idcardno
         FROM
         pat_med_inhosp b
@@ -245,6 +248,7 @@
             concat('%', #{hospitaldistrictname}, '%')
         </if>
         <if test="endtime != null ">and b.endtime = #{endtime}</if>
+        <if test="inhospMydFlag != null ">and b.inhosp_myd_flag = #{inhospMydFlag}</if>
         <if test="managementDoctor != null ">and b.management_doctor = #{managementDoctor}</if>
         <if test="managementDoctorCode != null ">and b.management_doctor_code = #{managementDoctorCode}</if>
         <if test="inhospno != null ">and b.inhospno = #{inhospno}</if>
@@ -409,10 +413,12 @@
         b.futypecode,
         b.futypedesc,
         b.fuadvice,
+        b.inhosp_myd_flag,
         b.fuspecialadvice
         FROM
         pat_med_inhosp b
         where 1=1
+        <if test="inhospMydFlag != null ">and b.inhosp_myd_flag = #{inhospMydFlag}</if>
         <if test="orgid != null and orgid != ''">
             and orgid = #{orgid}
         </if>
@@ -489,6 +495,7 @@
         b.futypedesc,
         b.fuadvice,
         b.fuspecialadvice,
+        b.inhosp_myd_flag,
         b.schemetime
         FROM
         pat_med_inhosp b,
@@ -498,6 +505,7 @@
         and b.del_flag=0
         and a.id = b.patid
         AND a.idcardno != ''
+        <if test="inhospMydFlag != null ">and b.inhosp_myd_flag = #{inhospMydFlag}</if>
         <if test="orgid != null and orgid != ''">
             and a.orgid = #{orgid}
         </if>
@@ -566,6 +574,7 @@
         <if test="cry != null and cry == 0 ">and inhospstate=0</if>
         <if test="cry != null and cry == 1 ">and inhospstate=1</if>
         <if test="cry != null and cry == 3 ">and inhospstate=3</if>
+        <if test="inhospMydFlag != null ">and inhosp_myd_flag = #{inhospMydFlag}</if>
         <if test="serialnum != null">and serialnum = #{serialnum}</if>
         <if test="hospitalname != null">and hospitalname = #{hospitalname}</if>
         <if test="hospitalcode != null">and hospitalcode = #{hospitalcode}</if>
@@ -702,6 +711,7 @@
             <if test="managementDoctor != null ">management_doctor,</if>
             <if test="managementDoctorCode != null ">management_doctor_code,</if>
             <if test="campusid != null ">campusid,</if>
+            <if test="inhospMydFlag != null ">inhosp_myd_flag,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serialnum != null">#{serialnum},</if>
@@ -769,6 +779,7 @@
             <if test="managementDoctor != null ">#{managementDoctor},</if>
             <if test="managementDoctorCode != null ">#{managementDoctorCode},</if>
             <if test="campusid != null ">#{campusid},</if>
+            <if test="inhospMydFlag != null ">#{inhospMydFlag},</if>
         </trim>
     </insert>
 
@@ -787,7 +798,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,campusid
+        management_doctor_doctor,campusid, inhosp_myd_flag
         )
         values
         <foreach collection="list" item="item" separator=",">
@@ -809,7 +820,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.campusid}
+            #{item.fuspecialadvice}, #{item.managementDoctor}, #{item.managementDoctorCode}, #{item.campusid}, #{item.inhospMydFlag}
             )
         </foreach>
     </insert>
@@ -882,8 +893,8 @@
             <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>
-
+            <if test="campusid != null ">campusid = #{campusid},</if>
+            <if test="inhospMydFlag != null ">inhosp_myd_flag = #{inhospMydFlag},</if>
         </trim>
         where inhospid = #{inhospid}
     </update>

--
Gitblit v1.9.3