From fb45d917bc0ef3d2208ab32519a739bfac73013c Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Thu, 18 Dec 2025 18:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E9=81=93=E5=8F=B7=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/dict/ReportItemController.java | 10 ++++++++
 .../liswork/mapper/dict/ReportItemMapper.java |  1 +
 .../liswork/service/ReportItemService.java    |  2 ++
 .../service/impl/ReportItemServiceImpl.java   | 24 +++++++++++++++++++
 .../resources/mapper/ReportItemMapper.xml     | 14 ++++++++---
 5 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java
index 5747c65..6ed54f6 100644
--- a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java
+++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java
@@ -205,6 +205,16 @@ public class ReportItemController extends BaseController {
     public Result saveitemsort(@RequestBody List<XmInfoVs> XmInfoVsList){
         return reportItemService.updateXminfoVsDYXH(XmInfoVsList);
     }
+    @ApiOperation("查询检验项目通道号")
+    @GetMapping("/getitemtdh")
+    public Result getitemtdh(String yq){
+        return reportItemService.queryXmInfoVsDYXH(yq);
+    }
+    @ApiOperation("保存检验项目通道号")
+    @PostMapping("/saveitemtdh")
+    public Result saveitemtdh(@RequestBody List<XmInfoVs> XmInfoVsList){
+        return reportItemService.updateXminfoVsDYXH(XmInfoVsList);
+    }
 
     @ApiOperation("获取试剂厂家")
     @GetMapping("/querySjcs")
diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java
index edd2b54..eb3fe0b 100644
--- a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java
+++ b/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java
@@ -12,6 +12,7 @@ public interface ReportItemMapper {
     List<XmDouble> queryXmDouble(XmDouble xmDouble);
     List<XmValNew> queryXmValNew(XmValNew xmValNew);
     List<XmInter> queryXmInter(XmInter xmInter);
+    XmInter getXmInter(@Param("yq") String yq,@Param("tdh") String tdh);
     List<XmRefNew> queryXmRefNew(XmRefNew xmRefNew);
     List<XmInfoVs> queryXmInfoVs(XmInfoVs xmInfoVs);
     List<XmInfoVs> queryXmInfoVsDYXH(String yq);
diff --git a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java
index ed9a156..9a563c5 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java
@@ -58,4 +58,6 @@ public interface ReportItemService {
     Result queryXmInfoVsDYXH(String yq);
 
     Result updateXminfoVsDYXH(List<XmInfoVs> list);
+    Result getitemtdh(String yq);
+    Result saveitemtdh(List<XmInter> list);
 }
diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java
index b40f3f2..4c1db91 100644
--- a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java
+++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java
@@ -15,6 +15,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -429,4 +430,27 @@ public class ReportItemServiceImpl implements ReportItemService {
         reportItemMapper.updateXminfoVsDYXH(list);
         return new Result("0","成功！");
     }
+    @Override
+    public Result getitemtdh(String yq){
+        XmInter xmInter=new XmInter();
+        xmInter.setYq(yq);
+        return new Result("0","成功！",reportItemMapper.queryXmInter(xmInter));
+
+    }
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result saveitemtdh(List<XmInter> list){
+        List<XmInter> list0=list.stream().filter(st->st.getYq()!=null&&st.getTdh()!=null&&!"".equals(st.getYq())&&!"".equals(st.getTdh())).collect(Collectors.toList());
+        for(XmInter xmInter:list0){
+            String yq=xmInter.getYq();
+            String tdh=xmInter.getTdh();
+            XmInter xmInter0 =reportItemMapper.getXmInter(yq,tdh);
+            if(xmInter0==null){
+                reportItemMapper.addXmInterRow(xmInter);
+            }else{
+                reportItemMapper.updateXmInterRow(xmInter);
+            }
+        }
+        return new Result("0","成功！");
+    }
 }
diff --git a/liswork/src/main/resources/mapper/ReportItemMapper.xml b/liswork/src/main/resources/mapper/ReportItemMapper.xml
index 22bcd30..cd6a5a5 100644
--- a/liswork/src/main/resources/mapper/ReportItemMapper.xml
+++ b/liswork/src/main/resources/mapper/ReportItemMapper.xml
@@ -40,10 +40,18 @@
         select * from xm_inter
         <where>
             <if test="yq !=null and yq !=''"> and yq = #{yq}</if>
+            <if test="tdh !=null and tdh !=''"> and tdh = #{tdh}</if>
             <if test="xmdh !=null and xmdh !=''"> and xmdh = #{xmdh}</if>
             <if test="xmid !=null and xmid !=''"> and xmid = #{xmid}</if>
         </where>
     </select>
+    <select id="getXmInter" resultType="com.czlis.common.core.domain.entity.lis.XmInter">
+        select * from xm_inter
+        <where>
+            <if test="yq !=null and yq !=''"> and yq = #{yq}</if>
+            <if test="tdh !=null and tdh !=''"> and tdh = #{tdh}</if>
+        </where>
+    </select>
 
     <select id="queryXmRefNew" resultType="com.czlis.common.core.domain.entity.lis.XmRefNew">
         select * from xm_ref_new
@@ -359,7 +367,7 @@
     </delete>
 
     <delete id="deleteXmInter">
-        delete from xm_inter where xmid = #{xmid}
+        delete from xm_inter where yq = #{yq} and tdh =#{tdh}
     </delete>
 
     <delete id="deleteXmTextResult">
@@ -422,9 +430,9 @@
         update xm_inter
         <set>
             <if test="xmdh != null and xmdh !=''">xmdh = #{xmdh},</if>
-            yq = #{yq},tdh = #{tdh}
+            <if test="xmid != null ">xmid = #{xmid},</if>
         </set>
-        where xmid = #{xmid}
+        where yq = #{yq} and tdh = #{tdh}
     </update>
 
     <update id="updateXmRefNewRow">