From 1b233ead121bfba077e6c7529790267d94b04420 Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Fri, 19 Dec 2025 16:23:42 +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

---
 .../common/core/domain/entity/lis/XmInfoVs.java   |  1 +
 .../controller/dict/ReportItemController.java     |  2 +-
 .../service/impl/ReportItemServiceImpl.java       | 15 +++++++++++----
 .../main/resources/mapper/ReportItemMapper.xml    |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoVs.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoVs.java
index 20645a7..aaadfcf 100644
--- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoVs.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoVs.java
@@ -26,4 +26,5 @@ public class XmInfoVs {
     private String ckxx;
     private String dyckz;
     private String xmmc;
+    private String xmdh;
 }
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 487ece5..a58eba3 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
@@ -215,7 +215,7 @@ public class ReportItemController extends BaseController {
     public Result saveitemtdh(@RequestBody List<XmInter> XmInterList){
         return reportItemService.saveitemtdh(XmInterList);
     }
-    @ApiOperation("保存检验项目通道号")
+    @ApiOperation("删除检验项目通道号")
     @GetMapping("/delitemtdh")
     public Result delitemtdh(String yq,String tdh){
         return reportItemService.delitemtdh(yq,tdh);
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 7e68da6..b0b5ab2 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
@@ -11,10 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -451,9 +448,19 @@ public class ReportItemServiceImpl implements ReportItemService {
     @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());
+        if(list0.isEmpty()||list0==null)return new Result("0","成功！");
+        List<XmInfoVs> XmInfoVslist=reportItemMapper.queryXmInfoVsDYXH(list0.get(0).getYq());
         for(XmInter xmInter:list0){
             String yq=xmInter.getYq();
             String tdh=xmInter.getTdh();
+            String xmdh=xmInter.getXmdh();
+            if(!"".equals(xmdh)&&xmdh!=null){
+                Optional<XmInfoVs> XmInfoVslist0= XmInfoVslist.stream().filter(ss->xmdh.equals(ss.getXmdh())).findFirst();
+                if(XmInfoVslist0.isPresent()) {
+                    Integer xmid =XmInfoVslist0.get().getXmid();
+                    xmInter.setXmid(xmid);
+                }
+            }
             XmInter xmInter0 =reportItemMapper.getXmInter(yq,tdh);
             if(xmInter0==null){
                 reportItemMapper.addXmInterRow(xmInter);
diff --git a/liswork/src/main/resources/mapper/ReportItemMapper.xml b/liswork/src/main/resources/mapper/ReportItemMapper.xml
index cd6a5a5..c886343 100644
--- a/liswork/src/main/resources/mapper/ReportItemMapper.xml
+++ b/liswork/src/main/resources/mapper/ReportItemMapper.xml
@@ -70,7 +70,7 @@
         </where>
     </select>
     <select id="queryXmInfoVsDYXH" resultType="com.czlis.common.core.domain.entity.lis.XmInfoVs">
-        select xm_info_vs.*,xm_info_new.xmmc from xm_info_vs join xm_info_new on xm_info_new.xmid=xm_info_vs.xmid
+        select xm_info_vs.*,xm_info_new.xmmc,xm_info_new.xmdh from xm_info_vs join xm_info_new on xm_info_new.xmid=xm_info_vs.xmid
         where xm_info_vs.yq = #{yq}
     </select>
     <select id="queryXmTextresultNew" resultType="com.czlis.common.core.domain.entity.lis.XmTextresultNew">