From 254932f503b41e246e88d76e33d1a9b860597630 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 26 十月 2026 16:27:03 +0800
Subject: [PATCH] 【丽水】JC_BG_BaoGao 同步报错问题处理

---
 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java |  307 ++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 269 insertions(+), 38 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 1bb31fa..0ae7652 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1,6 +1,9 @@
 package com.smartor.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -11,9 +14,12 @@
 import com.ruoyi.common.utils.DtoConversionUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.system.service.ISysConfigService;
 import com.smartor.domain.*;
 import com.smartor.domain.entity.ServiceSubtaskEntity;
 import com.smartor.mapper.*;
+import com.smartor.service.IPatChildArchiveService;
+import com.smartor.service.IPatMaternityArchiveService;
 import com.smartor.service.IPatMedOuthospService;
 import com.smartor.service.IServiceExternalService;
 import lombok.extern.slf4j.Slf4j;
@@ -70,6 +76,12 @@
     private Icd10Mapper icd10Mapper;
     @Autowired
     private IPatMedOuthospService patMedOuthospService;
+    @Autowired
+    private ISysConfigService configService;
+    @Autowired
+    private IPatMaternityArchiveService patMaternityArchiveService;
+    @Autowired
+    private IPatChildArchiveService patChildArchiveService;
     @Autowired
     private PatMedOuthospMapper patMedOuthospMapper;
     @Autowired
@@ -1312,6 +1324,8 @@
             patMedOuthospService.dealPatMedOuthosp(patMedOuthosp, visitTimeNum);
         }
 
+        genePatSpecificArchive(patMedOuthosp, patArchive);
+
         if (i > 0) {
             return true;
         }
@@ -1842,6 +1856,7 @@
         Map yeWuXX = (Map) dataMap.get("YeWuXX");
         Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
         Map<String, Object> JianChaSQ = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JianChaSQ") : null;
+        Map<String, Object> JianChaBG = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JianChaBG") : null;
         List<HashMap<String, Object>> JianChaBWList = ObjectUtils.isNotEmpty(JianChaSQ) ? (List<HashMap<String, Object>>) JianChaSQ.get("JianChaBWList") : null;
         List<HashMap<String, Object>> ZhenDuanList = ObjectUtils.isNotEmpty(JianChaSQ) ? (List<HashMap<String, Object>>) JianChaSQ.get("ZhenDuanList") : null;
         List<HashMap<String, Object>> epai = ObjectUtils.isNotEmpty(BingRenXX) ? (List<HashMap<String, Object>>) BingRenXX.get("DiZhiXXList") : null;
@@ -1936,6 +1951,9 @@
                 }
             }
         }
+        if (ObjectUtils.isNotEmpty(JianChaBG)) {
+            patMedInspection.setAppliyid(ObjectUtils.isNotEmpty(JianChaBG.get("ShenQingDID")) ? JianChaBG.get("ShenQingDID").toString() : null);
+        }
         if (CollectionUtils.isNotEmpty(JianChaBWList)) {
             List<ExternalInspectionJC> externalInspectionJC = JianChaBWList.stream().map(map -> {
                 ExternalInspectionJC info = new ExternalInspectionJC();
@@ -1981,75 +1999,192 @@
     }
 
     //妫�鏌ヨ鎯呮坊鍔�
+    @SuppressWarnings("unchecked")
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean addInspectBGService(Map dataMap) {
         log.info("ServiceExternalServiceImpl---addInspectBGService鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
         Map xiaoXiTou = (Map) dataMap.get("XiaoXiTou");
         Map yeWuXX = (Map) dataMap.get("YeWuXX");
         Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null;
         Map<String, Object> JianChaBG = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JianChaBG") : null;
-        List<HashMap<String, Object>> JianChaBWList = ObjectUtils.isNotEmpty(JianChaBG) ? (List<HashMap<String, Object>>) JianChaBG.get("JianChaBWList") : null;
+        if (ObjectUtils.isEmpty(BingRenXX)) {
+            throw new BaseException("妫�鏌ユ姤鍛婂悓姝ュけ璐ワ細BingRenXX涓嶈兘涓虹┖");
+        }
+        if (ObjectUtils.isEmpty(JianChaBG)) {
+            throw new BaseException("妫�鏌ユ姤鍛婂悓姝ュけ璐ワ細JianChaBG涓嶈兘涓虹┖");
+        }
+
+        // 鏈烘瀯浼樺厛鍙栨秷鎭ご锛屽叾娆″彇鎮h�呬俊鎭紝鍜屾鏌ョ敵璇疯ˉ寤洪�昏緫淇濇寔涓�鑷�
+        String orgid = ObjectUtils.isNotEmpty(xiaoXiTou) ? getMapValue(xiaoXiTou, "FaSongJGID") : null;
+        if (StringUtils.isBlank(orgid)) {
+            orgid = getMapValue(BingRenXX, "ZuZhiJGID");
+        }
+        String bingAnHao = getMapValue(BingRenXX, "BingAnHao");
+        String bingRenID = getMapValue(BingRenXX, "BingRenID");
+        String xingMing = getMapValue(BingRenXX, "XingMing");
+        String shenQingDID = getMapValue(JianChaBG, "ShenQingDID");
+        if (StringUtils.isBlank(orgid) || StringUtils.isBlank(bingAnHao) || StringUtils.isBlank(bingRenID)
+                || StringUtils.isBlank(xingMing) || StringUtils.isBlank(shenQingDID)) {
+            throw new BaseException("妫�鏌ユ姤鍛婂悓姝ュけ璐ワ細BingRenXX.ZuZhiJGID/BingAnHao/BingRenID/XingMing銆丣ianChaBG.ShenQingDID涓嶈兘涓虹┖");
+        }
+
         PatMedInspection patMedInspection = new PatMedInspection();
         PatMedInspectionItem patMedInspectionItem = new PatMedInspectionItem();
-        patMedInspection.setOrgid(BingRenXX.get("ZuZhiJGID").toString());
+        patMedInspection.setOrgid(orgid);
         //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
         patMedInspection.setCampusid("1");
-        patMedInspection.setInhospno(BingRenXX.get("BingAnHao").toString());
-        patMedInspection.setPatidHis(BingRenXX.get("BingRenID").toString());
-        patMedInspection.setPatname(BingRenXX.get("XingMing").toString());
-        patMedInspection.setAppliyid(JianChaBG.get("ShenQingDID").toString());
+        patMedInspection.setInhospno(bingAnHao);
+        patMedInspection.setPatidHis(bingRenID);
+        patMedInspection.setPatname(xingMing);
+        patMedInspection.setAppliyid(shenQingDID);
         //鏌ユ壘鎮h�呮鏌ユ楠屼俊鎭紝濡傛灉鏃狅紝杩涜鏂板姞
         List<PatMedInspection> patMedInspections = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
-        if (CollectionUtils.isNotEmpty(patMedInspections)) {
-            patMedInspectionItem.setInspectionid(patMedInspections.get(0).getId().intValue());
-        } else {
+        if (CollectionUtils.isEmpty(patMedInspections)) {
             addInspectService(dataMap);
-            List<PatMedInspection> patMedInspections2 = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
-            patMedInspectionItem.setInspectionid(patMedInspections2.get(0).getId().intValue());
+            patMedInspections = patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
+            if (CollectionUtils.isEmpty(patMedInspections)) {
+                throw new BaseException("妫�鏌ユ姤鍛婂悓姝ュけ璐ワ細鏈壘鍒版垨鍒涘缓妫�鏌ヤ富璁板綍锛孲henQingDID=" + shenQingDID);
+            }
         }
+        patMedInspectionItem.setInspectionid(patMedInspections.get(0).getId().intValue());
         //妫�鏌ユ楠屾姤鍛婃暟鎹鐞�
-        patMedInspectionItem.setOrgid(BingRenXX.get("ZuZhiJGID").toString());
+        patMedInspectionItem.setOrgid(orgid);
         //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
         patMedInspectionItem.setCampusid("1");
         List<PatMedInspectionItem> patMedInspectionItems = patMedInspectionItemMapper.selectPatMedInspectionItemList(patMedInspectionItem);
-        if (ObjectUtils.isNotEmpty(JianChaBG)) {
-            patMedInspectionItem.setInspectionName(JianChaBG.get("JianChaHao").toString());
-            patMedInspectionItem.setReportid(JianChaBG.get("JianChaHao").toString());
-            patMedInspectionItem.setStatuscode(JianChaBG.get("DangQianZTDM").toString());
-            patMedInspectionItem.setStatusname(JianChaBG.get("DangQianZTMC").toString());
-            patMedInspectionItem.setReportid(JianChaBG.get("BaoGaoRID").toString());
-            patMedInspectionItem.setReportername(JianChaBG.get("BaoGaoRXM").toString());
-            patMedInspectionItem.setDiagimpression(JianChaBG.get("ZhenDuanYX").toString());
-            patMedInspectionItem.setDiagfindings(JianChaBG.get("ZhenDuanSJ").toString());
-            patMedInspectionItem.setDiagsuggestion(JianChaBG.get("ZhenDuanJY").toString());
-            patMedInspectionItem.setReporturl(JianChaBG.get("BaoGaoYXDZ").toString());
-            patMedInspectionItem.setCriticalFlag(Integer.valueOf(JianChaBG.get("WeiJiZBZ").toString()));
-            patMedInspectionItem.setCriticalContent(JianChaBG.get("WeiJiZNR").toString());
-            patMedInspectionItem.setReportdeptid(JianChaBG.get("BaoGaoKSID").toString());
-            patMedInspectionItem.setReportdeptname(JianChaBG.get("BaoGaoKSMC").toString());
-            patMedInspectionItem.setResultcode(JianChaBG.get("JianChaJGDM").toString());
-            patMedInspectionItem.setResultname(JianChaBG.get("JianChaJGMC").toString());
-            if (ObjectUtils.isNotEmpty(JianChaBG.get("BaoGaoSJ"))) {
-                try {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                    patMedInspection.setOpendate(simpleDateFormat.parse(JianChaBG.get("BaoGaoSJ").toString()));
-                } catch (ParseException e) {
-                    e.printStackTrace();
+
+        // 鍏煎 PACS 瀹為檯鎶ユ枃锛氭姤鍛婁汉銆佹姤鍛婃椂闂淬�佹姤鍛婂湴鍧�绛夊瓧娈靛悕涓庢爣鍑嗘姤鏂囧瓨鍦ㄥ樊寮�
+        String jianChaHao = getMapValue(JianChaBG, "JianChaHao");
+        String reportId = getMapValue(JianChaBG, "BaoGaoID");
+        if (StringUtils.isBlank(reportId)) {
+            reportId = getMapValue(JianChaBG, "BaoGaoRID");
+        }
+        if (StringUtils.isBlank(reportId)) {
+            reportId = jianChaHao;
+        }
+        String inspectionName = StringUtils.isNotBlank(jianChaHao) ? jianChaHao : reportId;
+        if (StringUtils.isBlank(inspectionName)) {
+            inspectionName = shenQingDID;
+        }
+        String reporterId = getMapValue(JianChaBG, "BaoGaoRID", "ZhiXingRID", "KaiDanRID");
+        String reporterName = getMapValue(JianChaBG, "BaoGaoRXM", "ZhiXingRXM", "KaiDanRXM");
+        String reportUrl = getMapValue(JianChaBG, "BaoGaoYXDZ", "TuWenBGXZDZ", "PDFurl");
+        String reportDateStr = getMapValue(JianChaBG, "BaoGaoSJ", "ZhiXingSJ");
+
+        patMedInspectionItem.setInspectionName(inspectionName);
+        patMedInspectionItem.setReportid(reportId);
+        patMedInspectionItem.setStatuscode(getMapValue(JianChaBG, "DangQianZTDM"));
+        patMedInspectionItem.setStatusname(getMapValue(JianChaBG, "DangQianZTMC"));
+        patMedInspectionItem.setReporterid(reporterId);
+        patMedInspectionItem.setReportername(reporterName);
+        patMedInspectionItem.setDiagimpression(getMapValue(JianChaBG, "ZhenDuanYX"));
+        patMedInspectionItem.setDiagfindings(getMapValue(JianChaBG, "ZhenDuanSJ"));
+        patMedInspectionItem.setDiagsuggestion(getMapValue(JianChaBG, "ZhenDuanJY"));
+        patMedInspectionItem.setReporturl(reportUrl);
+        patMedInspectionItem.setCriticalFlag(parseInteger(getMapValue(JianChaBG, "WeiJiZBZ")));
+        patMedInspectionItem.setCriticalContent(getMapValue(JianChaBG, "WeiJiZNR"));
+        patMedInspectionItem.setReportdeptid(getMapValue(JianChaBG, "BaoGaoKSID"));
+        patMedInspectionItem.setReportdeptname(getMapValue(JianChaBG, "BaoGaoKSMC"));
+        patMedInspectionItem.setResultcode(getMapValue(JianChaBG, "JianChaJGDM"));
+        patMedInspectionItem.setResultname(getMapValue(JianChaBG, "JianChaJGMC"));
+        Date reportDate = parseDateTime(reportDateStr);
+        if (reportDate != null) {
+            patMedInspectionItem.setReportdate(reportDate);
+        }
+
+        // 鍚屼竴妫�鏌ヤ笅鍙兘瀛樺湪澶氭潯鎶ュ憡鏄庣粏锛屼紭鍏堟寜鎶ュ憡ID銆佹鏌ュ彿鍖归厤锛岄伩鍏嶆洿鏂伴敊琛�
+        PatMedInspectionItem existingItem = null;
+        if (CollectionUtils.isNotEmpty(patMedInspectionItems)) {
+            for (PatMedInspectionItem item : patMedInspectionItems) {
+                if (StringUtils.isNotBlank(reportId) && reportId.equals(item.getReportid())) {
+                    existingItem = item;
+                    break;
                 }
             }
+            if (existingItem == null) {
+                for (PatMedInspectionItem item : patMedInspectionItems) {
+                    if (StringUtils.isNotBlank(inspectionName) && inspectionName.equals(item.getInspectionName())) {
+                        existingItem = item;
+                        break;
+                    }
+                }
+            }
+            if (existingItem == null) {
+                existingItem = patMedInspectionItems.get(0);
+            }
         }
-        if (ObjectUtils.isNotEmpty(patMedInspectionItems)) {
+
+        if (existingItem != null) {
+            // 鏇存柊蹇呴』甯︿笂涓婚敭锛屽惁鍒� update ... where id = null 浼氬奖鍝� 0 琛岋紝鎺ュ彛杩斿洖澶辫触
+            patMedInspectionItem.setId(existingItem.getId());
             patMedInspectionItem.setUpdateTime(new Date());
             int i = patMedInspectionItemMapper.updatePatMedInspectionItem(patMedInspectionItem);
-            if (i != 1) return false;
+            if (i < 1) {
+                throw new BaseException("妫�鏌ユ姤鍛婃槑缁嗘洿鏂板け璐ワ紝id=" + existingItem.getId());
+            }
         } else {
             patMedInspectionItem.setDelFlag("0");
             patMedInspectionItem.setCreateTime(new Date());
             int i = patMedInspectionItemMapper.insertPatMedInspectionItem(patMedInspectionItem);
-            if (i != 1) return false;
+            if (i != 1) {
+                throw new BaseException("妫�鏌ユ姤鍛婃槑缁嗘柊澧炲け璐ワ紝ShenQingDID=" + shenQingDID);
+            }
         }
 
         return true;
+    }
+
+    /**
+     * 浠庢姤鏂囦腑鎸夐『搴忚幏鍙栫涓�涓潪绌哄瓧娈碉紝鍏煎涓嶅悓鍘傚晢鐨勫瓧娈靛懡鍚�
+     */
+    private String getMapValue(Map<String, Object> source, String... keys) {
+        if (source == null || keys == null) {
+            return null;
+        }
+        for (String key : keys) {
+            Object value = source.get(key);
+            if (value != null && StringUtils.isNotBlank(String.valueOf(value))) {
+                return String.valueOf(value);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 瑙f瀽妫�鏌ユ姤鍛婃椂闂达紝鍏煎甯歌鏃ユ湡鏃堕棿鏍煎紡
+     */
+    private Date parseDateTime(String dateTime) {
+        if (StringUtils.isBlank(dateTime)) {
+            return null;
+        }
+        String[] patterns = {"yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd'T'HH:mm:ss", "yyyy-MM-dd"};
+        for (String pattern : patterns) {
+            try {
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
+                simpleDateFormat.setLenient(false);
+                return simpleDateFormat.parse(dateTime);
+            } catch (ParseException ignored) {
+                // 灏濊瘯涓嬩竴绉嶆牸寮�
+            }
+        }
+        log.warn("妫�鏌ユ姤鍛婃椂闂存牸寮忔棤娉曡В鏋愶細{}", dateTime);
+        return null;
+    }
+
+    /**
+     * 瑙f瀽妫�鏌ユ姤鍛婃暟瀛楀瓧娈碉紝閬垮厤闈炴暟瀛楀唴瀹瑰鑷存帴鍙f姤閿�
+     */
+    private Integer parseInteger(String value) {
+        if (StringUtils.isBlank(value)) {
+            return null;
+        }
+        try {
+            return Integer.valueOf(value.trim());
+        } catch (NumberFormatException e) {
+            log.warn("妫�鏌ユ姤鍛婃暟瀛楀瓧娈垫棤娉曡浆鎹細{}", value);
+            return null;
+        }
     }
 
     @Override
@@ -2323,4 +2458,100 @@
         }
         return 1;
     }
+
+    //鏂板鎮h�呬笓绉戞。妗堝熀鏈俊鎭�
+    private void genePatSpecificArchive(PatMedOuthosp patMedOuthosp, PatArchive patArchive) {
+        String deptCategory = judgeDeptCategory(patMedOuthosp.getDeptcode(), patMedOuthosp.getOrgid());
+
+        boolean isGynecology = "1".equals(deptCategory);  // 鏄惁濡囩
+        boolean isPediatrics = "2".equals(deptCategory);  // 鏄惁鍎跨
+
+        if (isGynecology) {
+            // 璧板绉戞。妗堢敓鎴愰�昏緫
+            PatMaternityArchiveDetail patMaternityArchiveDetail
+                    = DtoConversionUtils.sourceToTarget(patMedOuthosp, PatMaternityArchiveDetail.class);
+            patMaternityArchiveDetail.setSourceType("1");
+            patMaternityArchiveDetail.setPhone(patArchive.getTelcode());
+            patMaternityArchiveDetail.setPatid(patArchive.getId());
+            patMaternityArchiveDetail.setPatname(patArchive.getName());
+            patMaternityArchiveDetail.setBirthdate(patArchive.getBirthdate());
+            patMaternityArchiveDetail.setSex(patArchive.getSex());
+            patMaternityArchiveDetail.setAddress(patArchive.getPlaceOfResidence());
+            patMaternityArchiveDetail.setOuthospno(patMedOuthosp.getOuthospno());
+            patMaternityArchiveDetail.setSerialnum(patMedOuthosp.getSerialnum());
+            patMaternityArchiveDetail.setIcd10code(patMedOuthosp.getIcd10code());
+            patMaternityArchiveDetail.setDeptcode(patMedOuthosp.getDeptcode());
+            patMaternityArchiveDetail.setDeptname(patMedOuthosp.getDeptname());
+            patMaternityArchiveDetail.setDoctorName(patMedOuthosp.getDrname());
+            patMaternityArchiveDetail.setDoctorCode(patMedOuthosp.getDrcode());
+            patMaternityArchiveDetail.setManagementDoctorName(patMedOuthosp.getDrname());
+            patMaternityArchiveDetail.setManagementDoctorCode(patMedOuthosp.getDrcode());
+            patMaternityArchiveDetail.setOrgid(patMedOuthosp.getOrgid());
+            patMaternityArchiveDetail.setCampusid(patMedOuthosp.getCampusid());
+            patMaternityArchiveService.insertOrUpdateMaternityArchive(patMaternityArchiveDetail);
+        } else if (isPediatrics) {
+            // 璧板効绉戞。妗堢敓鎴愰�昏緫
+            PatChildArchiveDetail patChildArchiveDetail
+                    = DtoConversionUtils.sourceToTarget(patMedOuthosp, PatChildArchiveDetail.class);
+            patChildArchiveDetail.setSourceType("1");
+            patChildArchiveDetail.setPhone(patArchive.getTelcode());
+            patChildArchiveDetail.setPatid(patArchive.getId());
+            patChildArchiveDetail.setPatname(patArchive.getName());
+            patChildArchiveDetail.setBirthdate(patArchive.getBirthdate());
+            patChildArchiveDetail.setSex(patArchive.getSex());
+//            patChildArchiveDetail.setAddress(patArchive.getPlaceOfResidence());
+            patChildArchiveDetail.setOuthospno(patMedOuthosp.getOuthospno());
+            patChildArchiveDetail.setSerialnum(patMedOuthosp.getSerialnum());
+            patChildArchiveDetail.setIcd10code(patMedOuthosp.getIcd10code());
+            patChildArchiveDetail.setDeptcode(patMedOuthosp.getDeptcode());
+            patChildArchiveDetail.setDeptname(patMedOuthosp.getDeptname());
+            patChildArchiveDetail.setDoctorName(patMedOuthosp.getDrname());
+            patChildArchiveDetail.setDoctorCode(patMedOuthosp.getDrcode());
+            patChildArchiveDetail.setManagementDoctorName(patMedOuthosp.getDrname());
+            patChildArchiveDetail.setManagementDoctorCode(patMedOuthosp.getDrcode());
+            patChildArchiveDetail.setOrgid(patMedOuthosp.getOrgid());
+            patChildArchiveDetail.setCampusid(patMedOuthosp.getCampusid());
+            patChildArchiveService.insertOrUpdateChildArchive(patChildArchiveDetail);
+        } else {
+            // 鏈懡涓厤缃紝涓嶇敓鎴愭。妗�
+        }
+    }
+
+    /**
+     * 鍒ゆ柇褰撳墠绉戝灞炰簬濡囩杩樻槸鍎跨
+     *
+     * @param deptCode 褰撳墠绉戝/鐥呭尯 Code锛屽 "D004"
+     * @param orgid    鍖婚櫌鏈烘瀯ID
+     * @return deptCategory锛�1-濡囩 2-鍎跨锛沶ull-鏈厤缃垨鏈懡涓�
+     */
+    public String judgeDeptCategory(String deptCode, String orgid) {
+        if (StringUtils.isEmpty(deptCode)) {
+            return null;
+        }
+
+        // 浼樺厛鍙栨満鏋勭骇閰嶇疆锛屽彇涓嶅埌鍐嶅彇鍏ㄥ眬閰嶇疆
+        String configValue = configService.selectConfigByKey("sys.dept.category",
+                orgid);
+        if (StringUtils.isEmpty(configValue)) {
+            configValue = configService.selectConfigByKey("sys.dept.category");
+        }
+        if (StringUtils.isEmpty(configValue)) {
+            return null;
+        }
+
+        JSONArray configs = JSON.parseArray(configValue);
+        if (configs == null || configs.isEmpty()) {
+            return null;
+        }
+
+        for (int i = 0; i < configs.size(); i++) {
+            JSONObject cfg = configs.getJSONObject(i);
+            JSONArray deptCodes = cfg.getJSONArray("deptCodes");
+            if (deptCodes != null && deptCodes.contains(deptCode)) {
+                return cfg.getString("deptCategory");
+            }
+        }
+        return null;
+    }
+
 }

--
Gitblit v1.9.3