From d6d2decae0463259a800defaf1d90a5ca1b97641 Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Wed, 15 Oct 2025 18:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/LabPatMapper.xml    | 164 +++++++++++-------
 .../service/impl/LisWorkOperServiceImpl.java  |   4 +-
 2 files changed, 105 insertions(+), 63 deletions(-)

diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml
index 109b688..eec3ce8 100644
--- a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml
+++ b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml
@@ -35,7 +35,49 @@
     <select id="getLabPatJgbz" resultType="String">
         select jgbz from lab_pat where yq = #{yq} and jyrq = #{jyrq} and ybh = #{ybh}
     </select>
-    <insert id="insertLabPat">
+    <insert id="insertLabPat" parameterType="com.czlis.common.core.domain.entity.lis.LabPat">
+        insert into lab_pat (jyrq, yq, ybh,
+                             wyh, yblx, fb, ksdh,
+                             sjys, hdys, yhdh, brdh,
+                             brxm, brxb, brly, ch,
+                             nl, nldw, sqh, sqsj,
+                             dysj, dybz, jgbz, bbbz,
+                             zd, bz, bz1, zjf,
+                             cyrq, bq, czybh,
+                             cjbw, jymd, lastuser,
+                             lastdt, confirmer, confirmdt,
+                             mzdy, fslx, ybzt, instrid,
+                             jzbz, sbbr,
+                             alarmflag, alarmconfirm, alarmconfirmdt,
+                             shcs, mzh, yljg,
+                             finish, send_flag, sfzh, phone,
+                             phone1, addr, faultman,
+                             fault, faults, faultdt,
+                             lstd, zjlx, slzq,
+                             checker, autojgbz
+        )
+        values (#{jyrq}, #{yq}, #{ybh},
+                #{wyh}, #{yblx}, #{fb}, #{ksdh},
+                #{sjys}, #{hdys}, #{yhdh}, #{brdh},
+                #{brxm}, #{brxb}, #{brly}, #{ch},
+                #{nl}, #{nldw}, #{sqh}, #{sqsj},
+                #{dysj}, #{dybz}, #{jgbz}, #{bbbz},
+                #{zd}, #{bz}, #{bz1}, #{zjf},
+                #{cyrq}, #{bq}, #{czybh},
+                #{cjbw}, #{jymd}, #{lastuser},
+                #{lastdt}, #{confirmer}, #{confirmdt},
+                #{mzdy}, #{fslx}, #{ybzt}, #{instrid},
+                #{jzbz}, #{sbbr},
+                #{alarmflag}, #{alarmconfirm}, #{alarmconfirmdt},
+                #{shcs}, #{mzh}, #{yljg},
+                #{finish}, #{send_flag}, #{sfzh}, #{phone},
+                #{phone1}, #{addr}, #{faultman},
+                #{fault}, #{faults}, #{faultdt},
+                #{lstd}, #{zjlx}, #{slzq},
+                #{checker}, #{autojgbz}
+               )
+    </insert>
+    <insert id="insertLabPatsort">
         insert into lab_pat (
             <if test="wyh != null and wyh !=''">wyh,</if>
             <if test="yblx != null and yblx !=''">yblx,</if>
@@ -181,187 +223,187 @@
         update lab_pat
         <set>
             <if test="wyh != null">
-                wyh = #{wyh,jdbcType=VARCHAR},
+                wyh = #{wyh},
             </if>
             <if test="yblx != null">
-                yblx = #{yblx,jdbcType=VARCHAR},
+                yblx = #{yblx},
             </if>
             <if test="fb != null">
-                fb = #{fb,jdbcType=VARCHAR},
+                fb = #{fb},
             </if>
             <if test="ksdh != null">
-                ksdh = #{ksdh,jdbcType=VARCHAR},
+                ksdh = #{ksdh},
             </if>
             <if test="sjys != null">
-                sjys = #{sjys,jdbcType=VARCHAR},
+                sjys = #{sjys},
             </if>
             <if test="hdys != null">
-                hdys = #{hdys,jdbcType=VARCHAR},
+                hdys = #{hdys},
             </if>
             <if test="yhdh != null">
-                yhdh = #{yhdh,jdbcType=VARCHAR},
+                yhdh = #{yhdh},
             </if>
             <if test="brdh != null">
-                brdh = #{brdh,jdbcType=VARCHAR},
+                brdh = #{brdh},
             </if>
             <if test="brxm != null">
-                brxm = #{brxm,jdbcType=VARCHAR},
+                brxm = #{brxm},
             </if>
             <if test="brxb != null">
-                brxb = #{brxb,jdbcType=VARCHAR},
+                brxb = #{brxb},
             </if>
             <if test="brly != null">
-                brly = #{brly,jdbcType=VARCHAR},
+                brly = #{brly},
             </if>
             <if test="ch != null">
-                ch = #{ch,jdbcType=VARCHAR},
+                ch = #{ch},
             </if>
             <if test="nl != null">
-                nl = #{nl,jdbcType=INTEGER},
+                nl = #{nl},
             </if>
             <if test="nldw != null">
-                nldw = #{nldw,jdbcType=VARCHAR},
+                nldw = #{nldw},
             </if>
             <if test="sqh != null">
-                sqh = #{sqh,jdbcType=VARCHAR},
+                sqh = #{sqh},
             </if>
             <if test="sqsj != null">
-                sqsj = #{sqsj,jdbcType=TIMESTAMP},
+                sqsj = #{sqsj},
             </if>
             <if test="dysj != null">
-                dysj = #{dysj,jdbcType=TIMESTAMP},
+                dysj = #{dysj},
             </if>
             <if test="dybz != null">
-                dybz = #{dybz,jdbcType=CHAR},
+                dybz = #{dybz},
             </if>
             <if test="jgbz != null">
-                jgbz = #{jgbz,jdbcType=CHAR},
+                jgbz = #{jgbz},
             </if>
             <if test="bbbz != null">
-                bbbz = #{bbbz,jdbcType=CHAR},
+                bbbz = #{bbbz},
             </if>
             <if test="zd != null">
-                zd = #{zd,jdbcType=VARCHAR},
+                zd = #{zd},
             </if>
             <if test="bz != null">
-                bz = #{bz,jdbcType=VARCHAR},
+                bz = #{bz},
             </if>
             <if test="bz1 != null">
-                bz1 = #{bz1,jdbcType=VARCHAR},
+                bz1 = #{bz1},
             </if>
             <if test="zjf != null">
-                zjf = #{zjf,jdbcType=VARCHAR},
+                zjf = #{zjf},
             </if>
             <if test="cyrq != null">
-                cyrq = #{cyrq,jdbcType=TIMESTAMP},
+                cyrq = #{cyrq},
             </if>
             <if test="bq != null">
-                bq = #{bq,jdbcType=VARCHAR},
+                bq = #{bq},
             </if>
             <if test="czybh != null">
-                czybh = #{czybh,jdbcType=VARCHAR},
+                czybh = #{czybh},
             </if>
             <if test="cjbw != null">
-                cjbw = #{cjbw,jdbcType=VARCHAR},
+                cjbw = #{cjbw},
             </if>
             <if test="jymd != null">
-                jymd = #{jymd,jdbcType=VARCHAR},
+                jymd = #{jymd},
             </if>
             <if test="lastuser != null">
-                lastuser = #{lastuser,jdbcType=VARCHAR},
+                lastuser = #{lastuser},
             </if>
             <if test="lastdt != null">
-                lastdt = #{lastdt,jdbcType=TIMESTAMP},
+                lastdt = #{lastdt},
             </if>
             <if test="confirmer != null">
-                confirmer = #{confirmer,jdbcType=VARCHAR},
+                confirmer = #{confirmer},
             </if>
             <if test="confirmdt != null">
-                confirmdt = #{confirmdt,jdbcType=TIMESTAMP},
+                confirmdt = #{confirmdt},
             </if>
             <if test="mzdy != null">
-                mzdy = #{mzdy,jdbcType=CHAR},
+                mzdy = #{mzdy},
             </if>
             <if test="fslx != null">
-                fslx = #{fslx,jdbcType=CHAR},
+                fslx = #{fslx},
             </if>
             <if test="ybzt != null">
-                ybzt = #{ybzt,jdbcType=VARCHAR},
+                ybzt = #{ybzt},
             </if>
             <if test="instrid != null">
-                instrid = #{instrid,jdbcType=VARCHAR},
+                instrid = #{instrid},
             </if>
             <if test="jzbz != null">
-                jzbz = #{jzbz,jdbcType=CHAR},
+                jzbz = #{jzbz},
             </if>
             <if test="sbbr != null">
-                sbbr = #{sbbr,jdbcType=VARCHAR},
+                sbbr = #{sbbr},
             </if>
             <if test="alarmflag != null">
-                alarmflag = #{alarmflag,jdbcType=CHAR},
+                alarmflag = #{alarmflag},
             </if>
             <if test="alarmconfirm != null">
-                alarmconfirm = #{alarmconfirm,jdbcType=VARCHAR},
+                alarmconfirm = #{alarmconfirm},
             </if>
             <if test="alarmconfirmdt != null">
-                alarmconfirmdt = #{alarmconfirmdt,jdbcType=TIMESTAMP},
+                alarmconfirmdt = #{alarmconfirmdt},
             </if>
             <if test="shcs != null">
-                shcs = #{shcs,jdbcType=INTEGER},
+                shcs = #{shcs},
             </if>
             <if test="sn_tss != null">
                 sn_tss = #{sn_tss},
             </if>
             <if test="mzh != null">
-                mzh = #{mzh,jdbcType=VARCHAR},
+                mzh = #{mzh},
             </if>
             <if test="yljg != null">
-                yljg = #{yljg,jdbcType=VARCHAR},
+                yljg = #{yljg},
             </if>
             <if test="finish != null">
-                finish = #{finish,jdbcType=CHAR},
+                finish = #{finish},
             </if>
             <if test="send_flag != null">
-                send_flag = #{sendFlag,jdbcType=CHAR},
+                send_flag = #{sendFlag},
             </if>
             <if test="sfzh != null">
-                sfzh = #{sfzh,jdbcType=VARCHAR},
+                sfzh = #{sfzh},
             </if>
             <if test="phone != null">
-                phone = #{phone,jdbcType=VARCHAR},
+                phone = #{phone},
             </if>
             <if test="phone1 != null">
-                phone1 = #{phone1,jdbcType=VARCHAR},
+                phone1 = #{phone1},
             </if>
             <if test="addr != null">
-                addr = #{addr,jdbcType=VARCHAR},
+                addr = #{addr},
             </if>
             <if test="faultman != null">
-                faultman = #{faultman,jdbcType=VARCHAR},
+                faultman = #{faultman},
             </if>
             <if test="fault != null">
-                fault = #{fault,jdbcType=CHAR},
+                fault = #{fault},
             </if>
             <if test="faults != null">
-                faults = #{faults,jdbcType=VARCHAR},
+                faults = #{faults},
             </if>
             <if test="faultdt != null">
-                faultdt = #{faultdt,jdbcType=TIMESTAMP},
+                faultdt = #{faultdt},
             </if>
             <if test="lstd != null">
-                lstd = #{lstd,jdbcType=CHAR},
+                lstd = #{lstd},
             </if>
             <if test="zjlx != null">
-                zjlx = #{zjlx,jdbcType=VARCHAR},
+                zjlx = #{zjlx},
             </if>
             <if test="slzq != null">
-                slzq = #{slzq,jdbcType=VARCHAR},
+                slzq = #{slzq},
             </if>
             <if test="checker != null">
-                checker = #{checker,jdbcType=VARCHAR},
+                checker = #{checker},
             </if>
             <if test="autojgbz != null">
-                autojgbz = #{autojgbz,jdbcType=CHAR},
+                autojgbz = #{autojgbz},
             </if>
         </set>
         where jyrq = #{jyrq}
diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java
index 0f3b2da..79dbe4f 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java
@@ -66,11 +66,11 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
             String brdh1=labPat.getBrdh();
             if(brdh1==null)brdh1="";
             //通过修改申请号触发病人信息载入
-            if(!"".equals(sqh1)&&sqh1.equals(sqh)){
+            if(!"".equals(sqh1)&&!sqh1.equals(sqh)){
                 return lisWorkUtils.newPatInfo(jyrq, ybh, sqh1, yq, problemId);
             }
             //通过修改住院号触发病人信息载入
-            if(!"".equals(brdh1)&&brdh1.equals(brdh)){
+            if(!"".equals(brdh1)&&!brdh1.equals(brdh)){
                 return lisWorkUtils.newPat(jyrq, ybh, yq, brdh1,labPat.getBrly(),labPat.getYljg(), problemId);
             }
             commonUtil.updateLabPat(labPat);