From fe65881855686cd33a81e864cefd0307bcdeac78 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 30 十二月 2025 10:48:20 +0800
Subject: [PATCH] 【景宁】景宁 出院首次(7天)随访一定要做

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 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 55f356e..2ad1593 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -636,18 +636,27 @@
                                 continue;
                             }
                             //鍐嶅叆闄㈤�昏緫
+                            //鏅畞 鍑洪櫌棣栨锛�7澶╋級闅忚涓�瀹氳鍋�
+                            boolean firstVisit = false;
+                            if (orgId.equals("47255004333112711A1001")
+                                    && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1){
+                                firstVisit = true;
+                            }
                             if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")
                             ) {
-                                //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
-                                serviceSubtask1.setSendstate(4L);
-                                if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
-                                    serviceSubtask.setRemark(serviceSubtask.getRemark() + ",绉戝/鐥呭尯鎮h�呭啀鍏ラ櫌");
-                                else serviceSubtask.setRemark("绉戝/鐥呭尯鎮h�呭啀鍏ラ櫌");
-                                serviceSubtask1.setResult("error");
-                                serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
-                                serviceSubtask1.setUpdateTime(new Date());
-                                Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
-                                if (aBoolean) i = 1;
+                                if(!firstVisit){
+                                    //鏅畞鐨勪笉闇�瑕佸皢鍐嶅叆闄㈢殑瀛愪换鍔″仠鎺�
+                                    //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
+                                    serviceSubtask1.setSendstate(4L);
+                                    if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
+                                        serviceSubtask.setRemark(serviceSubtask.getRemark() + ",绉戝/鐥呭尯鎮h�呭啀鍏ラ櫌");
+                                    else serviceSubtask.setRemark("绉戝/鐥呭尯鎮h�呭啀鍏ラ櫌");
+                                    serviceSubtask1.setResult("error");
+                                    serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
+                                    serviceSubtask1.setUpdateTime(new Date());
+                                    Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+                                    if (aBoolean) i = 1;
+                                }
                             } else {
                                 //鐩稿弽,鍒欏皢褰撴湁鐨勬暟鎹仠鎺�
                                 serviceSubtask.setResult("error");

--
Gitblit v1.9.3