From 7378b058521f4c27ba44309894aae730da57fe9d Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Tue, 4 Nov 2025 12:21:19 +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    | 71 ++++++++++++++++++-
 .../main/resources/mapper/LabResultMapper.xml | 21 ++++--
 .../controller/work/LisWorkController.java    | 10 ++-
 .../czlis/liswork/service/LisWorkService.java |  3 +-
 .../service/impl/LisWorkServiceImpl.java      | 20 +++++-
 5 files changed, 115 insertions(+), 10 deletions(-)

diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml
index e796316..030adb7 100644
--- a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml
+++ b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml
@@ -52,7 +52,76 @@
         </where>
         ORDER BY lab_pat.jyrq DESC,right(replicate(' ',20) + lab_pat.ybh,20) DESC
     </select>
-
+    <select id="getLabPat" resultType="com.czlis.common.core.domain.entity.lis.LabPat">
+        select * from lab_pat
+        <where>
+            <if test="jyrq != null">and jyrq >= #{jyrq}</if>
+            <if test="yq != null and yq !=''">and yq = #{yq}</if>
+            <if test="ybh != null and ybh !=''">and ybh = #{ybh}</if>
+            <if test="wyh != null and wyh !=''">  and wyh=#{wyh} </if>
+            <if test="yblx != null and yblx !=''">  and yblx=#{yblx} </if>
+            <if test="fb != null and wyh !=''">  and fb=#{fb} </if>
+            <if test="ksdh != null and ksdh !=''">  and ksdh=#{ksdh} </if>
+            <if test="sjys != null and sjys !=''">  and sjys=#{sjys} </if>
+            <if test="hdys != null and hdys !=''">  and hdys=#{hdys} </if>
+            <if test="yhdh != null and yhdh !=''">  and yhdh=#{yhdh} </if>
+            <if test="brdh != null and brdh !=''">  and brdh=#{brdh} </if>
+            <if test="brxm != null and brxm !=''">  and brxm=#{brxm} </if>
+            <if test="brxb != null and brxb !=''">  and brxb=#{brxb} </if>
+            <if test="brly != null and brly !=''">  and brly=#{brly} </if>
+            <if test="ch != null and ch !=''">  and ch=#{ch} </if>
+            <if test="nl != null">  and nl=#{nl} </if>
+            <if test="nldw != null and nldw != ''">  and nldw=#{nldw} </if>
+            <if test="sqh != null and sqh != ''">  and sqh=#{sqh} </if>
+            <if test="sqsj != null">  and sqsj=#{sqsj} </if>
+            <if test="dysj != null">  and dysj=#{dysj} </if>
+            <if test="dybz != null and dybz != ''">  and dybz=#{dybz} </if>
+            <if test="jgbz != null and jgbz != ''">  and jgbz=#{jgbz} </if>
+            <if test="bbbz != null and bbbz != ''">  and bbbz=#{bbbz} </if>
+            <if test="zd != null and zd != ''">  and zd=#{zd} </if>
+            <if test="bz != null and bz != ''">  and bz=#{bz} </if>
+            <if test="bz1 != null and bz1 != ''">  and bz1=#{bz1} </if>
+            <if test="zjf != null and zjf != ''">  and zjf=#{zjf} </if>
+            <if test="cyrq != null ">  and cyrq=#{cyrq} </if>
+            <if test="bq != null and bq != ''">  and bq=#{bq} </if>
+            <if test="czybh != null and czybh != ''">  and czybh=#{czybh} </if>
+            <if test="cjbw != null and cjbw != ''">  and cjbw=#{cjbw} </if>
+            <if test="jymd != null and jymd != ''">  and jymd=#{jymd} </if>
+            <if test="lastuser != null and lastuser != ''">  and lastuser=#{lastuser} </if>
+            <if test="lastdt != null">  and lastdt=#{lastdt} </if>
+            <if test="confirmer != null and confirmer !=''">  and confirmer=#{confirmer} </if>
+            <if test="confirmdt != null ">  and confirmdt=#{confirmdt} </if>
+            <if test="mzdy != null  and mzdy != ''">  and mzdy=#{mzdy} </if>
+            <if test="fslx != null  and fslx != ''">  and fslx=#{fslx} </if>
+            <if test="ybzt != null  and ybzt != ''">  and ybzt=#{ybzt} </if>
+            <if test="instrid != null  and instrid != ''">  and instrid=#{instrid} </if>
+            <if test="jzbz != null  and jzbz != ''">  and jzbz=#{jzbz} </if>
+            <if test="sbbr != null  and sbbr != ''">  and sbbr=#{sbbr} </if>
+            <if test="alarmflag != null and alarmflag != ''">  and alarmflag=#{alarmflag} </if>
+            <if test="alarmconfirm != null and alarmconfirm != ''">  and alarmconfirm=#{alarmconfirm} </if>
+            <if test="alarmconfirmdt != null ">  and alarmconfirmdt=#{alarmconfirmdt} </if>
+            <if test="shcs != null ">  and shcs=#{shcs} </if>
+            <if test="sn_tss != null and sn_tss != ''">  and sn_tss=#{sn_tss} </if>
+            <if test="sn_result != null and sn_result != ''">  and sn_result=#{sn_result} </if>
+            <if test="mzh != null and mzh != ''">  and mzh=#{mzh} </if>
+            <if test="yljg != null and yljg != ''">  and yljg=#{yljg} </if>
+            <if test="finish != null and finish != ''">  and finish=#{finish} </if>
+            <if test="send_flag != null and send_flag != ''">  and send_flag=#{send_flag} </if>
+            <if test="sfzh != null and sfzh != ''">  and sfzh=#{sfzh} </if>
+            <if test="phone != null and phone != ''">  and phone=#{phone} </if>
+            <if test="phone1 != null and phone1 != ''">  and phone1=#{phone1} </if>
+            <if test="addr != null and addr != ''">  and addr=#{addr} </if>
+            <if test="faultman != null and faultman != ''">  and faultman=#{faultman} </if>
+            <if test="fault != null and fault != ''">  and fault=#{fault} </if>
+            <if test="faults != null and faults != ''">  and faults=#{faults} </if>
+            <if test="faultdt != null">  and faultdt=#{faultdt} </if>
+            <if test="lstd != null and lstd !=''">  and lstd=#{lstd} </if>
+            <if test="zjlx != null and zjlx != ''">  and zjlx=#{zjlx} </if>
+            <if test="slzq != null and slzq != ''">  and slzq=#{slzq} </if>
+            <if test="checker != null and checker != ''">  and checker=#{checker} </if>
+            <if test="autojgbz != null and autojgbz != ''">  and autojgbz=#{autojgbz} </if>
+        </where>
+    </select>
 
     <insert id="insertLabPat" parameterType="com.czlis.common.core.domain.entity.lis.LabPat">
         insert into lab_pat (jyrq, yq, ybh,
diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml
index ab20cce..e4ee1c9 100644
--- a/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml
+++ b/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml
@@ -58,10 +58,23 @@
   </select>
   <delete id="delLabResult" parameterType="com.czlis.common.core.domain.entity.lis.LabResult">
     delete from lab_result
-    where jyrq = #{jyrq}
-      and yq = #{yq,jdbcType=CHAR}
-      and ybh = #{ybh,jdbcType=VARCHAR}
-      and xmdh = #{xmdh,jdbcType=VARCHAR}
+    <where>
+      <if test="jyrq != null ">
+        and lab_result.jyrq = #{jyrq}
+      </if>
+      <if test="yq != null and yq != ''">
+        and lab_result.yq = #{yq}
+      </if>
+      <if test="ybh != null and ybh != ''">
+        and lab_result.ybh = #{ybh}
+      </if>
+      <if test="xmdh != null and xmdh != ''">
+        and lab_result.xmdh = #{xmdh}
+      </if>
+      <if test="csjg != null and csjg != ''">
+        and lab_result.csjg = #{csjg}
+      </if>
+    </where>
   </delete>
   <delete id="delLabResultAll" >
     delete from lab_result
diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java
index 87d0660..d6ca226 100644
--- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java
+++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java
@@ -136,7 +136,13 @@ public class LisWorkController extends BaseController {
     }
     @ApiOperation("双工流水线")
     @GetMapping("/datalink")
-    public Result datalink(Date jyrq, String yq, String ybh) {
-        return lisWorkService.datalink(jyrq,yq,ybh);
+    public Result datalink(Date jyrq, String yq) {
+        return lisWorkService.datalink(jyrq,yq);
     }
+    @ApiOperation("清除所有未做项目")
+    @GetMapping("/clearnotcomplete")
+    public Result clearnotcomplete(Date jyrq, String yq,String ybh) {
+        return lisWorkService.clearnotcomplete(jyrq,yq,ybh);
+    }
+
 }
diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java
index 5400442..804854f 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java
@@ -25,5 +25,6 @@ public interface LisWorkService {
     Result getresultchangelog(Date jyrq, String yq, String ybh,String xmdh);
     Result allpatquery(Date jyrq, String yq, String ybh);
     Result emrquery(Date jyrq, String yq, String ybh);
-    Result datalink(Date jyrq, String yq, String ybh);
+    Result datalink(Date jyrq, String yq);
+    Result clearnotcomplete(Date jyrq, String yq,String ybh);
 }
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 2a94107..02d3cf0 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
@@ -601,7 +601,23 @@ public class LisWorkServiceImpl implements LisWorkService {
         return lisWorkUtils.setDayMessage(LisinterfaceNameConstants.DAYMESSAGE_ALLPAT,val);
     }
     @Override
-    public Result datalink(Date jyrq, String yq, String ybh) {
-        return new Result("0", "获取成功！");
+    public Result datalink(Date jyrq, String yq) {
+        LabPat labPat=new LabPat();
+        labPat.setJyrq(jyrq);
+        labPat.setYq(yq);
+        labPat.setJgbz("0");
+        List<LabPat> labPatlist=commonUtil.getLabPatList(labPat);
+        List<LabPat> labPatlist0=labPatlist.stream().filter(st->!"".equals(st.getSqh())||st.getSqh()!=null).collect(Collectors.toList());
+        return new Result("0", "成功！",labPatlist0);
+    }
+    @Override
+    public Result clearnotcomplete(Date jyrq, String yq,String ybh){
+        LabResult labResult=new LabResult();
+        labResult.setJyrq(jyrq);
+        labResult.setYq(yq);
+        labResult.setYbh(ybh);
+        labResult.setCsjg("未做");
+        commonUtil.delLabResult(labResult);
+        return new Result("0", "成功！");
     }
 }