From 295ad9342a593cf0ee5585f095186d60cb4abc74 Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Wed, 5 Nov 2025 18:20:56 +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

---
 .../interfaceCommon/utils/LisWorkcom.java     | 34 +++++++++----------
 .../main/resources/mapper/LabResultMapper.xml |  4 +--
 .../service/impl/LisWorkServiceImpl.java      |  8 ++---
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkcom.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkcom.java
index 47b5172..b29ee68 100644
--- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkcom.java
+++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkcom.java
@@ -969,23 +969,23 @@ public class LisWorkcom extends LisWorkBase{
         if (newpatinfo) commonUtil.insertLabPat(labPat);
         else commonUtil.updateLabPat(labPat);
         commonUtil.insertLabResultByBarcode(jyrq, yq, ybh, sqh);
-        List<LabResult> labResultList=commonUtil.getLabResultList(jyrq, yq, ybh);
-        List<LabInputmdl> labInputmdlList=chkautoinput(yq,ybh);
-        boolean setyblx=false;
-        if(!labInputmdlList.isEmpty()) {
-            for (LabInputmdl labInputmdl : labInputmdlList) {
-                labResultList = batchinput(jyrq, yq, ybh, labResultList, labInputmdl.getMbmc(), true);
-                String yblx = labInputmdl.getYblx();
-                if (yblx != null && !yblx.isEmpty()) {
-                    labPat.setYblx(yblx);
-                    setyblx=true;
-                }
-            }
-            if(!labResultList.stream().filter(s->s.getChangeflag()==1).collect(Collectors.toList()).isEmpty()){
-                if(setyblx) commonUtil.updateLabPat(labPat);
-            }
-        }
-        labResultList=saveallresult(labPat,labResultList);
+//        List<LabResult> labResultList=commonUtil.getLabResultList(jyrq, yq, ybh);
+//        List<LabInputmdl> labInputmdlList=chkautoinput(yq,ybh);
+//        boolean setyblx=false;
+//        if(!labInputmdlList.isEmpty()) {
+//            for (LabInputmdl labInputmdl : labInputmdlList) {
+//                labResultList = batchinput(jyrq, yq, ybh, labResultList, labInputmdl.getMbmc(), true);
+//                String yblx = labInputmdl.getYblx();
+//                if (yblx != null && !yblx.isEmpty()) {
+//                    labPat.setYblx(yblx);
+//                    setyblx=true;
+//                }
+//            }
+//            if(!labResultList.stream().filter(s->s.getChangeflag()==1).collect(Collectors.toList()).isEmpty()){
+//                if(setyblx) commonUtil.updateLabPat(labPat);
+//            }
+//        }
+//        labResultList=saveallresult(labPat,labResultList);
         //  Map<String,Object> map=new HashMap<>();
         //  map.put("labpat",labPat);
         //  map.put("labresult",labResultList);
diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml
index e4ee1c9..7fb8505 100644
--- a/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml
+++ b/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml
@@ -108,9 +108,9 @@
       #{bz3,jdbcType=VARCHAR}, #{textresult,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertLabResultByBarcode">
-    insert into lab_result (jyrq, yq, ybh,xmdh,csjg,refs,dw,sqxmdh)
+    insert into lab_result (jyrq, yq, ybh,xmdh,csjg,refs,dw)
     select distinct #{jyrq},#{yq},#{ybh},a.xmdh,(case ISNULL(a.mrz,'') when '' then '未做' else a.mrz end),
-            b.dyckz,b.dw ,r.sqh from lab_reqdetail r
+            b.dyckz,b.dw  from lab_reqdetail r
     join xm_reqitem_vs_reportitem a on r.sqxmdh=a.sqxmdh and isnull(def,'') !='1'
     join xm_info b on a.yq=b.yq and a.xmdh=b.xmdh
     where r.sqh=#{sqh} and a.yq=#{yq}
diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java
index 653a7b2..9379ead 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java
@@ -603,10 +603,10 @@ public class LisWorkServiceImpl implements LisWorkService {
     }
     @Override
     public Result clearprintflag(Date jyrq, String yq,String ybh){
-        String jgbz=commonUtil.getLabPatJgbz(jyrq, yq, ybh);
-        if("2".equals(jgbz)){
-            return new Result("-1", "已审核不允许修改打印标志！");
-        }
+//        String jgbz=commonUtil.getLabPatJgbz(jyrq, yq, ybh);
+//        if("2".equals(jgbz)){
+//            return new Result("-1", "已审核不允许修改打印标志！");
+//        }
         commonUtil.updateLabPatByColumn(jyrq, yq, ybh,"dybz","0");
         return new Result("0", "成功！");
     }