From ae386701f1a3a3d676cdedfb642498d97bdaa89e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 03 九月 2026 11:10:49 +0800
Subject: [PATCH] 【丽水】手术随访调整

---
 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 7c39a28..e4fa9a8 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -816,10 +816,16 @@
             patMedInhosp1.setDiagname(StringUtils.isNotEmpty(patMedInhosp1.getLeavediagname()) ? patMedInhosp1.getLeavediagname() : hospPatientDiagnoseInfos2.get(0).getZhenDuanMC());
         }
 
-        patMedInhosp1.setInhospstate("1");
+        String orgid = ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null;
+        if(StringUtils.isNotEmpty(orgid) && orgid.equals("47246103233112211A1001")){
+            //缂欎簯浜岄櫌 浣忛櫌璁板綍涓嶆洿鏂扮姸鎬�
+        }else {
+            patMedInhosp1.setInhospstate("1");
+        }
+
         if (CollectionUtils.isNotEmpty(patMedInhospList)) {
             patMedInhosp1.setUpdateTime(new Date());
-            patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+            patMedInhosp1.setOrgid(orgid);
             if (CollectionUtils.isNotEmpty(noLongTask) && noLongTask.contains(patMedInhosp1.getOrgid())) {
                 //涓嶉渶瑕侀暱鏈熶换鍔¢殢璁�
                 patMedInhosp1.setFuflag("0");
@@ -832,7 +838,7 @@
                 patMedInhosp1.setHospitalcode(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
                 patMedInhosp1.setLeavehospitaldistrictname(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQMC")) ? BingRenXX.get("DangQianBQMC").toString() : null);
                 patMedInhosp1.setLeavehospitaldistrictcode(ObjectUtils.isNotEmpty(BingRenXX.get("DangQianBQID")) ? BingRenXX.get("DangQianBQID").toString() : null);
-                patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);
+                patMedInhosp1.setOrgid(orgid);
                 //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
                 patMedInhosp1.setCampusid("1");
                 patMedInhosp1.setPatno(ObjectUtils.isNotEmpty(BingRenXX.get("BingRenID")) ? BingRenXX.get("BingRenID").toString() : null);
@@ -1243,10 +1249,22 @@
             i = patMedOuthospService.insertPatMedOuthosp(patMedOuthosp);
 
         }
-        Date adminDate = externalJZInfo.getJiuZhenRQ();
+        Date adminDate = patMedOuthosp.getAdmitdate();
         //瀹屾垚鎺ヨ瘖 宸茬粡瀹屾垚浠诲姟鍐嶆闅忚
-        if(ObjectUtils.isNotEmpty(visitTimeNum) && ObjectUtils.isNotEmpty(adminDate)){
-            patMedOuthospService.followUpAgainByPatMedOuthosp(patMedOuthosp, adminDate, visitTimeNum);
+        if(ObjectUtils.isNotEmpty(visitTimeNum)
+                && ObjectUtils.isNotEmpty(adminDate)
+                && StringUtils.isNotEmpty(patMedOuthosp.getFuflag())
+                && patMedOuthosp.getFuflag().equals("1")){
+            if(visitTimeUnit.equals("澶�")){
+                visitTimeNum = visitTimeNum;
+            }else if(visitTimeUnit.equals("鍛�")){
+                visitTimeNum = visitTimeNum * 7;
+            }else if(visitTimeUnit.equals("鏈�")){
+                visitTimeNum = visitTimeNum * 30;
+            }else if(visitTimeUnit.equals("骞�")){
+                visitTimeNum = visitTimeNum * 365;
+            }
+            patMedOuthospService.dealPatMedOuthosp(patMedOuthosp, visitTimeNum);
         }
 
         if (i > 0) {

--
Gitblit v1.9.3