From fd105724994e7581f334fc7aad6510aa33661a9d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 25 十二月 2025 17:05:11 +0800
Subject: [PATCH] 【丽水】 景宁没有给随访时间,不发送通知短信

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 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 521654b..f01d5fd 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -834,19 +834,21 @@
         //濡傛灉鏄�氱煡鐨勮瘽锛岄渶瑕佹彁鍓嶅嚑澶╁皢閫氳繃鐭俊鍙戝嚭鍘伙紙鍏蜂綋鍑犲ぉ锛岃繖涓彲浠ラ厤缃湪sys_conf琛ㄤ腑锛�
         if ("3".equals(serviceTask.getType())) {
             serviceSubtask.setVisitTime(minusDay(newDate, StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
-            //鍒ゆ柇鏄笉鏄櫙瀹�
-            if (patMedInhosp1.getOrgid().equals("47255004333112711A1001"))
-            {
-                serviceSubtask.setVisitTime(null);
-                //涓嶆墽琛�
-                serviceSubtask.setSendstate(4L);
-                serviceSubtask.setRemark("鏅畞娌℃湁缁欓殢璁挎椂闂达紝涓嶅彂閫侀�氱煡鐭俊");
+            //濡傛灉璇ュ嚭闄㈣褰曟湁闅忚鏃堕棿锛屽垯鐢ㄤ粬鑷繁鐨勯殢璁挎椂闂�
+            if (patMedInhosp1.getFudate() != null){
+                serviceSubtask.setVisitTime(minusDay(patMedInhosp1.getFudate(),
+                        StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
+            }else{
+                //鍒ゆ柇鏄笉鏄櫙瀹�
+                if (patMedInhosp1.getOrgid().equals("47255004333112711A1001"))
+                {
+                    serviceSubtask.setVisitTime(null);
+                    //涓嶆墽琛�
+                    serviceSubtask.setSendstate(4L);
+                    serviceSubtask.setRemark("鏅畞娌℃湁缁欓殢璁挎椂闂达紝涓嶅彂閫侀�氱煡鐭俊");
+                }
             }
 
-
-            //濡傛灉璇ュ嚭闄㈣褰曟湁闅忚鏃堕棿锛屽垯鐢ㄤ粬鑷繁鐨勯殢璁挎椂闂�
-            if (patMedInhosp1.getFudate() != null)
-                serviceSubtask.setVisitTime(minusDay(patMedInhosp1.getFudate(), StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
         }
 
         //鎮h�呭彂閫佹椂闂�

--
Gitblit v1.9.3