From 25c9ca5313fbed298f1faf3893b7b0c780b6e1b2 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 03 九月 2026 16:33:02 +0800
Subject: [PATCH] 【丽水】手术撤销

---
 smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
index cd970f4..ec8da0d 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
@@ -30,6 +30,7 @@
             <result property="opercheckFlag" column="opercheck_flag"/>
             <result property="longTaskReason" column="long_task_reason"/>
             <result property="inhospstate" column="inhospstate"/>
+            <result property="inhospEndtime" column="inhosp_endtime"/>
             <result property="serialnum" column="serialnum"/>
 
             <result property="deptcode" column="deptcode"/>
@@ -443,6 +444,14 @@
                where opid = #{opid}
     </delete>
 
+    <update id="deleteSoftPatMedOperationItemByOpId" parameterType="String">
+        update pat_med_operation_item
+        <trim prefix="SET" suffixOverrides=",">
+            del_flag =1
+        </trim>
+        where opid = #{opid}
+    </update>
+
     <select id="selectOperationItemList" parameterType="com.smartor.domain.PatMedOperationItem"
             resultMap="PatMedOperationItemResult">
         select pmoi.id, pmoi.operationid, pmoi.opid, pmoi.opcode, pmoi.opdesc, pmoi.main_flag, pmoi.incitypecode,
@@ -452,10 +461,12 @@
         pmo.deptcode, pmo.deptname, pmo.hospitaldistrictcode, pmo.hospitaldistrictname,
         pmo.leaveldeptcode, pmo.leaveldeptname, pmo.leavehospitaldistrictcode, pmo.leavehospitaldistrictname, pmo.patid,
         pmo.drcode, pmo.drname, pmo.nurse_id, pmo.nurse_name,
-        pmo.inhospstate, pmo.serialnum
+        pmo.serialnum, pmi.inhospstate
         from pat_med_operation pmo
         join pat_med_operation_item pmoi
         on pmoi.opid = pmo.opid
+        join pat_med_inhosp pmi
+        on pmo.serialnum = pmi.serialnum
         where
         pmo.del_flag = '0'
         and pmoi.del_flag = '0'
@@ -510,7 +521,10 @@
             and pmoi.pid = #{pid}
         </if>
         <if test="inhospstate != null and inhospstate != ''">
-            and pmo.inhospstate = #{inhospstate}
+            and pmi.inhospstate = #{inhospstate}
+            <if test="inhospstate == '1'">
+                and pmi.endtime is not null
+            </if>
         </if>
         <if test="serialnum != null and serialnum != ''">
             and pmo.serialnum = #{serialnum}

--
Gitblit v1.9.3