From 40aa3afed411c0bd101fb7a83ae84c4d0902e2e0 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 16 十一月 2026 09:35:03 +0800
Subject: [PATCH] 【丽水】门诊随访leaveldeptcode缺失问题

---
 ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java |  135 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 127 insertions(+), 8 deletions(-)

diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java b/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
index eccdbdf..897f1a9 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
@@ -885,6 +885,39 @@
     }
 
     /**
+     * 鍏煎銆岀瀹�/鐥呭尯銆嶅瓧娈甸噸鍛藉悕鍓嶇殑鏃у叆鍙傘��
+     *
+     * <p>2026-11 璧凤細{@code deptcode/deptname} = 鍦ㄩ櫌绉戝锛寋@code leaveldeptcode/leaveldeptname} = 绂婚櫌绉戝銆�
+     * 浣嗗墠绔�/鏃ц皟鐢ㄦ柟锛坽@code /serviceSubtask/addSubTask}锛変粛鍙兘鎶婄瀹ゆ斁鍦� {@code deptcode/deptname} 閲屻��
+     * 鑻ヤ笉褰掍綅锛屽瓙浠诲姟浼氳惤鍒般�屽湪闄㈢淮搴︺�嶏紝鍒楄〃鎸夌闄㈢瀹ょ瓫閫夋椂鏌ヤ笉鍒帮紙鏈绾夸笂 2654501/2663019 鍗虫闂锛夈��
+     *
+     * <p>瑙勫垯锛�
+     * <ul>
+     *   <li>鍙闈炲欢缁姢鐞嗭紙{@code service_type != '99'}锛夌敓鏁堬紱99 鍏佽浣跨敤鍦ㄩ櫌缁村害锛�</li>
+     *   <li>绂婚櫌绉戝涓虹┖涓� {@code deptcode} 鏈夊�兼椂锛屾妸 {@code deptcode/deptname} 杩佸埌绂婚櫌缁村害锛�</li>
+     *   <li>娓呯┖鍦ㄩ櫌缁村害锛岄伩鍏嶅悓涓�浠界瀹ゅ悓鏃跺懡涓袱缁勭瓫閫夛紙涓� {@code toSubtaskFromTaskVO} 鐨勫彛寰勪竴鑷达級銆�</li>
+     * </ul>
+     */
+    private void alignLeaveDeptFromLegacyDept(ServiceSubtask serviceSubtask) {
+        if (serviceSubtask == null || "99".equals(serviceSubtask.getServiceType())) {
+            return;
+        }
+        if (StringUtils.isEmpty(serviceSubtask.getLeaveldeptcode())
+                && StringUtils.isNotEmpty(serviceSubtask.getDeptcode())) {
+            serviceSubtask.setLeaveldeptcode(serviceSubtask.getDeptcode());
+        }
+        if (StringUtils.isEmpty(serviceSubtask.getLeaveldeptname())
+                && StringUtils.isNotEmpty(serviceSubtask.getDeptname())) {
+            serviceSubtask.setLeaveldeptname(serviceSubtask.getDeptname());
+        }
+        // 鎵嬪伐鏂板鍏ュ彛娌℃湁銆屽湪闄㈢淮搴︺�嶇殑鍙潬鏉ユ簮锛涗换鍔¢厤缃噷鐨勭瀹や笉鏄偅鑰呮湰浜虹殑鍦ㄩ櫌绉戝銆�
+        serviceSubtask.setDeptcode(null);
+        serviceSubtask.setDeptname(null);
+        serviceSubtask.setHospitaldistrictcode(null);
+        serviceSubtask.setHospitaldistrictname(null);
+    }
+
+    /**
      * 鏂板鍗曚竴浠诲姟锛堥殢璁匡級
      *
      * @param serviceSubtask 鍗曚竴浠诲姟锛堥殢璁匡級
@@ -892,6 +925,8 @@
      */
     @Override
     public Map<String, Object> insertServiceSubtask(ServiceSubtask serviceSubtask) {
+        // 鍏煎 2026-11 瀛楁閲嶅懡鍚嶅墠鐨勬棫鍏ュ弬锛�/addSubTask 浠嶅彲鑳芥妸绉戝鏀惧湪 deptcode/deptname 閲�
+        alignLeaveDeptFromLegacyDept(serviceSubtask);
         List<ServiceSubtask> serviceSubtasks = null;
         //鍏堟煡璇竴涓嬭鎮h�呮槸鍚﹀凡缁忓垱寤烘牴鎹畇erviceType,sendstate,inhospid,patid,orgid
         //杩欐牱鍒ゆ柇涓昏鏄负浜嗘兂璁╂柊鍗庡尰闄㈢殑澶栭儴瀵煎叆鎮h�呭垱寤轰换鍔★紝涔熻兘鐢ㄨ繖涓帴鍙�
@@ -1870,6 +1905,25 @@
                             serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                         }
                     }
+                    // 鐐逛綅琛岋紙2026-11锛宎ppltype=7锛夛細绉戝 / 鐥呭尯 / 鐐逛綅鍦� service_taskdept 閲屾槸
+                    // **鍚勮嚜鐙珛鐨勮**锛屽彲浠ュ叡瀛樹篃鍙互涓嶅叡瀛� 鈥斺�� 鎵�浠ョ偣浣嶈鏄�"棰濆杩藉姞"锛�
+                    // 涓嶆浛鎹笂闈㈢殑绉戝/鐥呭尯琛屻�傜偣浣嶈鐨� dept_code/dept_name 鐣欑┖锛岀紪鐮佸彧钀� point_location銆�
+                    if ("7".equals(serviceTaskVO.getAppltype())) {
+                        String pointLocation = firstNonBlank(serviceTaskVO.getPointLocation(),
+                                serviceTask.getPointLocation());
+                        if (StringUtils.isNotEmpty(pointLocation)) {
+                            ServiceTaskdept pointDept = new ServiceTaskdept();
+                            pointDept.setTaskId(serviceTask.getTaskid());
+                            pointDept.setTaskName(serviceTask.getTaskName());
+                            pointDept.setOrgid(serviceTask.getOrgid());
+                            pointDept.setLongtask(serviceTask.getLongTask() == null ? null
+                                    : Long.valueOf(serviceTask.getLongTask()));
+                            pointDept.setServiceType(serviceTaskVO.getServiceType());
+                            pointDept.setDeptType("3");
+                            pointDept.setPointLocation(pointLocation);
+                            serviceTaskdeptService.insertServiceTaskdept(pointDept);
+                        }
+                    }
                 }
             }
 //闀挎湡浠诲姟锛屼篃鍏佽鍔犱汉浜�
@@ -2249,6 +2303,27 @@
                     scheduleVO.setOplevelCodes(serviceTaskVO.getOplevelcode());
                     scheduleVO.setCreateBy(serviceTask.getUpdateBy());
                     serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
+                } else if (serviceTaskVO.getAppltype().equals("7")) {
+                    // 鎸夌偣浣嶏紙鍚屽痉闇�姹傦級锛氬厛杞垹璇ヤ换鍔℃棫鐨� dept_type='3' 琛岋紝鍐嶆寜鍏ュ弬閲嶅缓
+                    //   锛堜笌绉戝/鐥呭尯銆屽厛鍒犲悗鎻掋�嶅悓鍙e緞锛涚偣浣嶈 dept_code/dept_name 鐣欑┖锛�
+                    ServiceTaskdept oldPoint = new ServiceTaskdept();
+                    oldPoint.setTaskId(serviceTask.getTaskid());
+                    oldPoint.setDeptType("3");
+                    serviceTaskdeptService.deleteServiceTaskdeptByTaskId(oldPoint);
+                    String pointLocation = StringUtils.isNotEmpty(serviceTaskVO.getPointLocation())
+                            ? serviceTaskVO.getPointLocation() : serviceTask.getPointLocation();
+                    if (StringUtils.isNotEmpty(pointLocation)) {
+                        ServiceTaskdept pointDept = new ServiceTaskdept();
+                        pointDept.setTaskId(serviceTask.getTaskid());
+                        pointDept.setTaskName(serviceTask.getTaskName());
+                        pointDept.setOrgid(serviceTaskVO.getOrgid());
+                        pointDept.setLongtask(serviceTask.getLongTask() == null ? null
+                                : Long.valueOf(serviceTask.getLongTask()));
+                        pointDept.setServiceType(serviceTaskVO.getServiceType());
+                        pointDept.setDeptType("3");
+                        pointDept.setPointLocation(pointLocation);
+                        serviceTaskdeptService.insertServiceTaskdept(pointDept);
+                    }
                 }
             }
             if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
@@ -5471,16 +5546,46 @@
         String ip = localIP;
         ServiceTask serviceTask = new ServiceTask();
         serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceTaskVo.getTaskid());
+        if (ObjectUtils.isEmpty(serviceTask)) {
+            // 浠诲姟涓嶅瓨鍦� 鈫� 涓嶅彲鑳芥湁 data锛岀洿鎺ユ姏涓氬姟寮傚父锛堟帴鍙e眰浼氳浆鎴� code=500锛�
+            throw new BaseException("鎵爜鐢熸垚浠诲姟澶辫触锛氫换鍔′笉瀛樺湪鎴栧凡鍒犻櫎锛坱askid=" + serviceTaskVo.getTaskid() + "锛�");
+        }
         if (ObjectUtils.isNotEmpty(serviceTask)) {
             try {
                 ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
-                if (ObjectUtils.isNotEmpty(serviceTaskVo.getDeptcode())) {
-                    serviceTaskdept.setDeptType("1");
-                    serviceTaskdept.setDeptCode(serviceTaskVo.getDeptcode());
-                }
-                if (ObjectUtils.isNotEmpty(serviceTaskVo.getLeavehospitaldistrictcode())) {
+                // 缁村害锛堢瀹�/鐥呭尯/鐐逛綅锛夌敱浠诲姟鐨� appltype 鍐冲畾锛�1=绉戝銆�2=鐥呭尯銆�7=鐐逛綅銆�
+                //   涓夌缁村害鍦� service_taskdept 閲屾槸**鍚勮嚜鐙珛鐨勮**锛堝悇鑷殑鍒楋級锛屽彲浠ュ叡瀛樸�佷篃鍙互涓嶅叡瀛橈紱
+                //   浣嗘煡琛屾椂蹇呴』鍙甫涓�涓淮搴� 鈥斺�� 鍚﹀垯浼氱敤 A 缁村害鐨勭紪鐮佸幓鎾� B 缁村害鐨勮锛�
+                //   鑰岀偣浣嶈鐨� dept_code 鏈潵灏辨槸绌虹殑銆�
+                String appltype = serviceTask.getAppltype();
+                if ("7".equals(appltype)) {
+                    serviceTaskdept.setDeptType("3");
+                    serviceTaskdept.setPointLocation(firstNonBlank(serviceTaskVo.getPointLocation(),
+                            serviceTask.getPointLocation()));
+                } else if ("2".equals(appltype)) {
                     serviceTaskdept.setDeptType("2");
-                    serviceTaskdept.setDeptCode(serviceTaskVo.getLeavehospitaldistrictcode());
+                    // 浠诲姟涓婄殑绉戝/鐥呭尯鍙兘鏄�楀彿澶氶�夛紝鏌� service_taskdept 瑕佺敤鍗曞�硷紙鍙栫涓�涓級
+                    serviceTaskdept.setDeptCode(firstNonBlank(serviceTaskVo.getLeavehospitaldistrictcode(),
+                            firstValue(serviceTask.getLeavehospitaldistrictcode())));
+                } else if ("1".equals(appltype)) {
+                    serviceTaskdept.setDeptType("1");
+                    serviceTaskdept.setDeptCode(firstNonBlank(serviceTaskVo.getDeptcode(),
+                            firstValue(serviceTask.getDeptcode())));
+                } else {
+                    // appltype 涓虹┖鐨勫巻鍙蹭换鍔★細娌跨敤鏀归�犲墠鐨勫彛寰勶紙绉戝 鈫� 鐥呭尯锛屽悗鍐欑殑瑕嗙洊鍏堝啓鐨勶級锛�
+                    // 鐐逛綅浣滀负绗笁缁达紝鍙湪浼犱簡鐐逛綅鏃惰ˉ涓娿��
+                    if (ObjectUtils.isNotEmpty(serviceTaskVo.getDeptcode())) {
+                        serviceTaskdept.setDeptType("1");
+                        serviceTaskdept.setDeptCode(serviceTaskVo.getDeptcode());
+                    }
+                    if (ObjectUtils.isNotEmpty(serviceTaskVo.getLeavehospitaldistrictcode())) {
+                        serviceTaskdept.setDeptType("2");
+                        serviceTaskdept.setDeptCode(serviceTaskVo.getLeavehospitaldistrictcode());
+                    }
+                    if (ObjectUtils.isNotEmpty(serviceTaskVo.getPointLocation())) {
+                        serviceTaskdept.setDeptType("3");
+                        serviceTaskdept.setPointLocation(serviceTaskVo.getPointLocation());
+                    }
                 }
                 serviceTaskdept.setServiceType(serviceTask.getServiceType());
                 serviceTaskdept.setOrgid(serviceTask.getOrgid());
@@ -5517,10 +5622,21 @@
                         iServiceOutPathService.updateServiceOutPath(serviceOutPath);
 
                     }
+                } else {
+                    // 閰嶇疆缂哄け灞炪�屼笟鍔″彲棰勬湡銆嶆儏鍐碉細甯︿笂鎺掓煡淇℃伅鎶涘嚭鍘伙紙涓嶅悶锛夛紝
+                    // 鎺ュ彛灞傛嵁姝よ繑鍥� code=500 + 鏄庣‘ msg锛岄伩鍏嶃��200 + 绌� data銆嶃��
+                    throw new BaseException("鎵爜鐢熸垚浠诲姟澶辫触锛氭湭鍖归厤鍒颁换鍔$淮搴﹂厤缃紙taskid=" + serviceTaskVo.getTaskid()
+                            + "锛宎ppltype=" + appltype
+                            + "锛宒eptType=" + serviceTaskdept.getDeptType()
+                            + "锛宒eptCode=" + serviceTaskdept.getDeptCode()
+                            + "锛宲ointLocation=" + serviceTaskdept.getPointLocation() + "锛�");
                 }
+            } catch (BaseException be) {
+                // 鈿狅笍 蹇呴』鎺掑湪 catch (Exception) 涔嬪墠锛欱aseException 鏄� RuntimeException锛�
+                //    鍚﹀垯鍒氭姏鍑虹殑涓氬姟寮傚父浼氳涓嬮潰鏁存鍚炴帀锛屾帴鍙e張鍙樻垚 200 + 绌� data銆�
+                throw be;
             } catch (Exception e) {
-                e.printStackTrace();
-                log.error("銆愭壂鐮佺敓鎴愪换鍔°�戝鐞嗗紓甯革細{}", e.getMessage());
+                log.error("銆愭壂鐮佺敓鎴愪换鍔°�戝鐞嗗紓甯革細taskid={}锛寋}", serviceTaskVo.getTaskid(), e.getMessage(), e);
             }
         }
         return content;
@@ -5538,6 +5654,9 @@
         if (StringUtils.isNotEmpty(serviceTaskdept.getDeptType()) && serviceTaskdept.getDeptType().equals("1")) {
             serviceSubtask.setLeaveldeptcode(serviceTaskdept.getDeptCode());
             serviceSubtask.setLeaveldeptname(serviceTaskdept.getDeptName());
+        } else if (StringUtils.isNotEmpty(serviceTaskdept.getDeptType()) && serviceTaskdept.getDeptType().equals("3")) {
+            // 鐐逛綅琛岋紙dept_type='3'锛夛細dept_code/dept_name 涓虹┖锛岀偣浣嶅彧钀� point_location
+            serviceSubtask.setPointLocation(serviceTaskdept.getPointLocation());
         } else {
             serviceSubtask.setLeavehospitaldistrictcode(serviceTaskdept.getDeptCode());
             serviceSubtask.setLeavehospitaldistrictname(serviceTaskdept.getDeptName());

--
Gitblit v1.9.3