From 1e1814178edf84090b28492bbad340ab13e5c169 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 22 七月 2025 18:16:34 +0800
Subject: [PATCH] 代码提交

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

diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index e17bbef..28364e0 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -47,7 +47,9 @@
         <result property="patname" column="patname"/>
         <result property="patno" column="patno"/>
         <result property="inhospstate" column="inhospstate"/>
-        <result property="checkFlag" column="check_flag"/>
+        <result property="deptcheckFlag" column="deptcheck_flag"/>
+        <result property="wardcheckFlag" column="wardcheck_flag"/>
+        <result property="diagcheckFlag" column="diagcheck_flag"/>
         <result property="age" column="age"/>
         <result property="sex" column="sex"/>
         <result property="telcode" column="telcode"/>
@@ -88,7 +90,9 @@
                out_way_name,
                nurse_id,
                nurse_name,
-               check_flag,
+               deptcheck_flag,
+               wardcheck_flag,
+               diagcheck_flag,
                inhospstate,
                patno,
                long_task_reason,
@@ -143,7 +147,9 @@
         b.patname,
         b.out_way_id,
         b.out_way_name,
-        b.check_flag,
+        b.deptcheck_flag,
+        b.wardcheck_flag,
+        b.diagcheck_flag,
         b.inhospstate,
         b.patno,
         b.inhospno,
@@ -191,7 +197,8 @@
         b.futypecode,
         b.futypedesc,
         b.fuadvice,
-        b.fuspecialadvice
+        b.fuspecialadvice,
+        a.idcardno
         FROM
         pat_med_inhosp b
         JOIN
@@ -243,7 +250,9 @@
             <if test="patno != null ">and b.patno = #{patno}</if>
             <if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
             <if test="nurseName != null and nurseName != ''">and b.nurse_name = #{nurseName}</if>
-            <if test="checkFlag != null ">and b.check_flag = #{checkFlag}</if>
+            <if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
+            <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="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
@@ -285,7 +294,12 @@
         a.telcode,
         a.id,
         a.sex
-        order by b.inhospid desc
+        <if test="cry==1">
+            order by b.endtime desc
+        </if>
+        <if test="cry==0">
+            order by b.starttime desc
+        </if>
     </select>
     <select id="selectPatMedInhospListByCondition" parameterType="com.smartor.domain.PatMedInhospVO"
             resultMap="PatMedInhospResult">
@@ -300,7 +314,9 @@
         b.out_way_name,
         b.nurse_id,
         b.nurse_name,
-        b.check_flag,
+        b.deptcheckFlag,
+        b.diagcheckFlag,
+        b.wardcheckFlag,
         b.inhospstate,
         b.patno,
         b.inhospno,
@@ -369,7 +385,9 @@
             <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="checkFlag != null ">and b.check_flag = #{checkFlag}</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>
             <if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
             <if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if>
             <if test="leavediagname != null  and leavediagname != ''">and b.leavediagname like concat('%',
@@ -406,6 +424,9 @@
         <include refid="selectPatMedInhospVo"/>
         where inhospid = #{inhospid}
     </select>
+
+
+
 
     <insert id="insertPatMedInhosp" parameterType="com.smartor.domain.PatMedInhosp" useGeneratedKeys="true"
             keyProperty="inhospid">
@@ -451,7 +472,9 @@
             <if test="patname!= null">patname,</if>
             <if test="patno != null">patno,</if>
             <if test="inhospstate != null">inhospstate,</if>
-            <if test="checkFlag != null">check_flag,</if>
+            <if test="deptcheckFlag != null">deptcheck_flag,</if>
+            <if test="wardcheckFlag != null">wardcheck_flag,</if>
+            <if test="diagcheckFlag != null">diagcheck_flag,</if>
             <if test="longTaskReason != null">long_task_reason,</if>
             <if test="nurseId != null ">nurse_id,</if>
             <if test="nurseName != null ">nurse_name,</if>
@@ -511,7 +534,9 @@
             <if test="patname!= null">#{patname},</if>
             <if test="patno != null">#{patno},</if>
             <if test="inhospstate != null">#{inhospstate},</if>
-            <if test="checkFlag != null">#{checkFlag},</if>
+            <if test="deptcheckFlag != null">#{deptcheckFlag},</if>
+            <if test="wardcheckFlag != null">#{wardcheckFlag},</if>
+            <if test="diagcheckFlag != null">#{diagcheckFlag},</if>
             <if test="longTaskReason != null">#{longTaskReason},</if>
             <if test="nurseId != null ">#{nurseId},</if>
             <if test="nurseName != null ">#{nurseName},</if>
@@ -531,6 +556,40 @@
             <if test="fuspecialadvice != null ">#{fuspecialadvice},</if>
         </trim>
     </insert>
+
+
+    <insert id="insertPatMedInhospBatch" parameterType="java.util.List">
+        insert into pat_med_inhosp (
+        serialnum, hospitalname, hospitalcode, hospitaldistrictcode, hospitaldistrictname,
+        icd10code, diagname, starttime, endtime, deptcode, deptname, roomno, bed_no,
+        orgid, del_flag, update_by, update_time, create_by, create_time, isupload,
+        upload_time, patid, leavediagname, leaveicd10code, drcode, drname,
+        schemestatus, generalschemestatus, leaveldeptcode, leaveldeptname, hospitaldistrictid,
+        leavehospitaldistrictcode, leavehospitaldistrictname, leavehospitaldistrictid,
+        deptid, leaveldeptid, schemetime, patname, patno, inhospstate,
+        deptcheck_flag, wardcheck_flag, diagcheck_flag, long_task_reason,
+        nurse_id, nurse_name, out_way_id, out_way_name, guid,
+        operator, operator_id, inhospno, remark,
+        fuflag, fudate, fuperiod, futypecode, futypedesc, fuadvice, fuspecialadvice
+        )
+        values
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.serialnum}, #{item.hospitalname}, #{item.hospitalcode}, #{item.hospitaldistrictcode}, #{item.hospitaldistrictname},
+            #{item.icd10code}, #{item.diagname}, #{item.starttime}, #{item.endtime}, #{item.deptcode}, #{item.deptname}, #{item.roomno}, #{item.bedNo},
+            #{item.orgid}, #{item.delFlag}, #{item.updateBy}, #{item.updateTime}, #{item.createBy}, #{item.createTime}, #{item.isupload},
+            #{item.uploadTime}, #{item.patid}, #{item.leavediagname}, #{item.leaveicd10code}, #{item.drcode}, #{item.drname},
+            #{item.schemestatus}, #{item.generalschemestatus}, #{item.leaveldeptcode}, #{item.leaveldeptname}, #{item.hospitaldistrictid},
+            #{item.leavehospitaldistrictcode}, #{item.leavehospitaldistrictname}, #{item.leavehospitaldistrictid},
+            #{item.deptid}, #{item.leaveldeptid}, #{item.schemetime}, #{item.patname}, #{item.patno}, #{item.inhospstate},
+            #{item.deptcheckFlag}, #{item.wardcheckFlag}, #{item.diagcheckFlag}, #{item.longTaskReason},
+            #{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}
+            )
+        </foreach>
+    </insert>
+
 
     <update id="updatePatMedInhosp" parameterType="com.smartor.domain.PatMedInhosp">
         update pat_med_inhosp
@@ -575,7 +634,9 @@
             <if test="patname!= null">patname = #{patname},</if>
             <if test="patno != null">patno = #{patno},</if>
             <if test="inhospstate != null">inhospstate = #{inhospstate},</if>
-            <if test="checkFlag != null">check_flag = #{checkFlag},</if>
+            <if test="deptcheckFlag != null">deptcheck_flag = #{deptcheckFlag},</if>
+            <if test="wardcheckFlag != null">wardcheck_flag = #{wardcheckFlag},</if>
+            <if test="diagcheckFlag != null">diagcheck_flag = #{diagcheckFlag},</if>
             <if test="longTaskReason != null">long_task_reason = #{longTaskReason},</if>
             <if test="nurseId != null ">nurse_id = #{nurseId},</if>
             <if test="nurseName != null ">nurse_name = #{nurseName},</if>
@@ -627,7 +688,7 @@
             FROM pat_med_outhosp
             <where>
                 del_flag=0
-                <if test="deptcodeList != null">
+                <if test="deptcodeList != null   and deptcodeList.size() > 0">
                     and deptcode in
                     <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                         #{deptcode}
@@ -644,7 +705,7 @@
             <where>
                 del_flag=0
                 and inhospstate=0
-                <if test="deptcodeList != null">
+                <if test="deptcodeList != null   and deptcodeList.size() > 0">
                     and deptcode in
                     <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                         #{deptcode}
@@ -659,7 +720,7 @@
             <where>
                 del_flag=0
                 and inhospstate=1
-                <if test="deptcodeList != null">
+                <if test="deptcodeList != null   and deptcodeList.size() > 0">
                     and deptcode in
                     <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                         #{deptcode}
@@ -674,7 +735,7 @@
             <where>
                 del_flag=0
                 and inhospstate=1
-                <if test="deptcodeList != null">
+                <if test="deptcodeList != null   and deptcodeList.size() > 0">
                     and deptcode in
                     <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                         #{deptcode}
@@ -684,8 +745,6 @@
         </if>
         ) AS combined
         GROUP BY deptname;
-
-
     </select>
     <select id="selectPatMedInhospCount" parameterType="com.smartor.domain.PatMedReq"
             resultType="com.smartor.domain.PatMedRes">
@@ -706,7 +765,7 @@
                 and date_format(endtime,'%y%m%d') &gt;= date_format(#{startDate},'%y%m%d')
                 and date_format(endtime,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d')
             </if>
-            <if test="deptcodeList != null">
+            <if test="deptcodeList != null   and deptcodeList.size() > 0">
                 and deptcode in
                 <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                     #{deptcode}

--
Gitblit v1.9.3