From 879bc177f31717f6d4a4998840e786a668256e97 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 06 八月 2026 15:52:01 +0800
Subject: [PATCH] 【景宁】查询随访任务组科室关联列表、查询随访任务组疾病关联列表

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 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 4e6ad83..4350848 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -886,12 +886,12 @@
         if (ObjectUtils.isEmpty(serviceSubtask)) {
             return;
         }
-        if (StringUtils.isNotEmpty(patMedOperationItem.getDeptcode())) {
-            serviceSubtask.setVisitDeptCode(patMedOperationItem.getDeptcode());
-            serviceSubtask.setVisitDeptName(patMedOperationItem.getDeptname());
+        if (StringUtils.isNotEmpty(patMedOperationItem.getLeaveldeptcode())) {
+            serviceSubtask.setVisitDeptCode(patMedOperationItem.getLeaveldeptcode());
+            serviceSubtask.setVisitDeptName(patMedOperationItem.getLeaveldeptname());
         } else {
-            serviceSubtask.setVisitDeptCode(patMedOperationItem.getHospitaldistrictcode());
-            serviceSubtask.setVisitDeptName(patMedOperationItem.getHospitaldistrictname());
+            serviceSubtask.setVisitDeptCode(patMedOperationItem.getLeavehospitaldistrictcode());
+            serviceSubtask.setVisitDeptName(patMedOperationItem.getLeavehospitaldistrictname());
         }
         //璁板綍insertServiceSubtask璇彞杩斿洖鐘舵��
         Integer i = 0;
@@ -1280,8 +1280,11 @@
                 serviceTaskoper.setOplevelcode(opItem.getOplevelcode());
 
                 //鏍规嵁绉戝銆佺梾鍖鸿繃婊�
-                serviceTaskoper.setDeptCode(opItem.getDeptcode());
-                serviceTaskoper.setWardCode(opItem.getHospitaldistrictcode());
+                if(StringUtils.isNotEmpty(opItem.getLeaveldeptcode())){
+                    serviceTaskoper.setDeptCode(opItem.getLeaveldeptcode());
+                }else {
+                    serviceTaskoper.setWardCode(opItem.getLeavehospitaldistrictcode());
+                }
 
                 List<ServiceTaskoper> serviceTaskopers = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);
                 //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�

--
Gitblit v1.9.3