From aa0ae041b29f0c95dcdbdd237cd0351d0c9f979f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 18 八月 2026 15:11:02 +0800
Subject: [PATCH] 【丽水】手术随访-住院记录调整

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 4350848..f72f6a8 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -432,19 +432,19 @@
                         Integer type = 1;
                         if (StringUtils.isNotEmpty(deptCodes)) {
                             type = 1;
-                            deptCodeList = Arrays.asList(deptCodes.split(","));
+                            deptCodeList = new ArrayList<>(Arrays.asList(deptCodes.split(",")));
                         }
                         if(StringUtils.isNotEmpty(wardCodes)) {
                             type = 2;
-                            wardCodeList = Arrays.asList(wardCodes.split(","));
+                            wardCodeList = new ArrayList<>(Arrays.asList(wardCodes.split(",")));
                         }
                         if(StringUtils.isNotEmpty(icd10Codes)) {
                             type = 3;
-                            icd10CodeList = Arrays.asList(icd10Codes.split(","));
+                            icd10CodeList = new ArrayList<>(Arrays.asList(icd10Codes.split(",")));
                         }
                         if (StringUtils.isNotEmpty(opLevelCodes)) {
                             type = 6;
-                            opLevelCodeList = Arrays.asList(opLevelCodes.split(","));
+                            opLevelCodeList = new ArrayList<>(Arrays.asList(opLevelCodes.split(",")));
                         }
                         //闈炴墜鏈鐞嗘柟寮�
                         if(type != 6){
@@ -875,6 +875,10 @@
         patMedInhosp.setPatid((patMedOperationItem.getPatid()));
         patMedInhosp.setInhospstate("1");
         patMedInhosp.setFuflag("1");
+        //鎵嬫湳闅忚
+        if(!active.equals("hzszlyy")){
+            patMedInhosp.setSerialnum(patMedOperationItem.getSerialnum());
+        }
         List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
 
         if (CollectionUtils.isEmpty(patMedInhospList)) {
@@ -1261,6 +1265,7 @@
         //            鎵嬫湳闅忚
         PatMedOperationItem pmoi = new PatMedOperationItem();
         //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
+//        pmoi.setInhospstate("1");
         pmoi.setOpercheckFlag("0");
         pmoi.setMainFlag("1");
 
@@ -1339,7 +1344,7 @@
                 // 鏍规嵁鎮h�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
                 ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
                 serviceTaskdiag.setLongtask(1L);
-                serviceTaskdiag.setServiceType("2");
+//                serviceTaskdiag.setServiceType("2");
                 if (active.equals("nhfy")) {
                     //鍗楀崕闄勪竴鐨刬cd10code鏈夐噸澶嶏紝鎵�浠ョ敤涓昏瘖鏂悕绉板幓鏌ヨ
                     serviceTaskdiag.setIcd10name(pmiJB.getLeavediagname());
@@ -1828,7 +1833,7 @@
 
             ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
             serviceTaskdiag.setLongtask(1L);
-            serviceTaskdiag.setServiceType("2");
+//            serviceTaskdiag.setServiceType("2");
             if (active.equals("nhfy")) {
                 serviceTaskdiag.setIcd10name(patMedInhosp1.getLeavediagname());
                 if (StringUtils.isEmpty(patMedInhosp1.getLeavediagname())) {

--
Gitblit v1.9.3