From f2ac4bd8bc831c97242ccf4efa04a0c5c8d852f9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 29 十二月 2025 19:46:26 +0800
Subject: [PATCH] 【景宁】代码调整

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 f01d5fd..e595e15 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -550,6 +550,7 @@
     //灏嗘偅鑰呮斁鍒皊ubtask涓�
     private void writeInSubTask(Long taskid, Boolean check, PatMedInhosp patMedInhosp1, PatArchive patArchive, Integer type, String config) {
         String longTaskReason = patMedInhosp1.getLongTaskReason();
+        String orgId = patMedInhosp1.getOrgid();
         if (StringUtils.isEmpty(longTaskReason)) longTaskReason = "";
         ServiceTask st = new ServiceTask();
         st.setTaskid(taskid);
@@ -634,7 +635,16 @@
                                 if (aBoolean) i = 1;
                                 continue;
                             }
-                            if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")) {
+                            //鍐嶅叆闄㈤�昏緫
+                            //鏅畞 鍑洪櫌棣栨锛�7澶╋級闅忚涓�瀹氳鍋�
+//                            boolean firstVisit = false;
+//                            if (orgId.equals("47255004333112711A1001")
+//                                    && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1){
+//                                firstVisit = true;
+//                            }
+                            if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")
+//                                && !firstVisit
+                            ) {
                                 //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
                                 serviceSubtask1.setSendstate(4L);
                                 if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))

--
Gitblit v1.9.3