From f282cbb3b22ab8c0cf3d5b9e58ab18af381e4d22 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 13 三月 2026 11:05:24 +0800
Subject: [PATCH] 【丽水】出院随访查询,统计没有同步excep

---
 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 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 3882848..1a003c6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -189,6 +189,7 @@
 
     @Override
     public Boolean addUserDeptInfo(Map dataMap) {
+        //todo
         log.info("ServiceExternalServiceImpl---addUserDeptInfo鐨勬柊澧炵殑鍊间负锛歿}", dataMap);
         Map yeWuXX = (Map) dataMap.get("YeWuXX");
         Map<String, Object> keShiYH = (Map<String, Object>) yeWuXX.get("KeShiYH");
@@ -201,7 +202,8 @@
         //鑾峰彇褰撳墠鐢ㄦ埛Name瀵瑰簲鐨剈ser淇℃伅
         SysUser sysUser = null;
         SysUser sysUserVo = new SysUser();
-        sysUserVo.setUserName(externalUserDeptInfo.getYongHuDLM());
+//        sysUserVo.setUserName(externalUserDeptInfo.getYongHuDLM());
+        sysUserVo.setHisUserId(externalUserDeptInfo.getYongHuID());
         sysUserVo.setOrgid(externalUserDeptInfo.getZuZhiJGID());
         //涓芥按鏃犻櫌鍖猴紝榛樿鍊兼槸 1
         sysUserVo.setCampusid("1");
@@ -510,6 +512,8 @@
         ExternalInHospPatientAddrInfo externalInHospPatientAddrInfo = null;
         ExternalInHospPatientLiaisonInfo externalInHospPatientLiaisonInfo = null;
         List<ExternalInHospPatientAddrInfo> epai2 = null;
+        //姝讳骸鏍囪
+        Boolean deathFlag = false;
         if (CollectionUtils.isNotEmpty(epai)) {
             epai2 = epai.stream().map(map -> {
                 ExternalInHospPatientAddrInfo info = new ExternalInHospPatientAddrInfo();
@@ -571,6 +575,14 @@
             patMedInhosp1.setNurseName(ObjectUtils.isNotEmpty(JiuZhenXX.get("ZeRenHSXM")) ? JiuZhenXX.get("ZeRenHSXM").toString() : null);
             patMedInhosp1.setNurseId(ObjectUtils.isNotEmpty(JiuZhenXX.get("ZeRenHSID")) ? JiuZhenXX.get("ZeRenHSID").toString() : null);
             patMedInhosp1.setBedNo(ObjectUtils.isNotEmpty(JiuZhenXX.get("DangQianCWMC")) ? JiuZhenXX.get("DangQianCWMC").toString() : null);
+
+            //绂婚櫌鏂瑰紡浠g爜 1-鍖荤灘绂婚櫌 2-鍖诲槺杞櫌 3-鍖诲槺杞ぞ鍖哄崼鐢熸湇鍔℃満鏋�/涔¢晣鍗敓闄�
+            // 4-闈炲尰鍢辩闄� 5-姝讳骸 9-鍏朵粬 10-浠嬪叆瀹� 20-鎵嬫湳瀹�
+            String liYuanQxdm = ObjectUtils.isNotEmpty(JiuZhenXX.get("LiYuanQXDM")) ? JiuZhenXX.get("LiYuanQXDM").toString() : null;
+            //鍒ゆ柇鐥呬汉鏄惁姝讳骸
+            if(ObjectUtils.isNotEmpty(liYuanQxdm) &&("5").equals(liYuanQxdm)){
+                deathFlag = true;
+            }
         }
         patMedInhosp1.setUpdateTime(new Date());
         patMedInhosp1.setTelcode(patArchive.getTelcode());
@@ -614,6 +626,23 @@
         }
 
         patMedInhosp1.setInhospstate("1");
+        if(deathFlag){
+            //鐥呬汉姝讳骸鏃犻』闅忚
+            patMedInhosp1.setFuflag("1");
+            //鏇存柊鐥呬汉 notrequiredFlag
+            patArchive.setNotrequiredFlag("1");
+            patArchiveMapper.updatePatArchive(patArchive);
+            //瀵瑰凡缁忕敓鎴愮殑闅忚浠诲姟杩涜澶勭悊
+            ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
+            serviceSubtaskVO.setPatid(patArchive.getId());
+            serviceSubtaskVO.setSendstate(2L);
+            List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+            for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+                serviceSubtask.setSendstate(6L);
+                serviceSubtask.setRemark(serviceSubtask.getRemark() + ";鐥呬汉宸叉浜★紝涓嶉殢璁�");
+                serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+            }
+        }
         if (CollectionUtils.isNotEmpty(patMedInhospList)) {
             patMedInhosp1.setUpdateTime(new Date());
             patMedInhosp1.setOrgid(ObjectUtils.isNotEmpty(BingRenXX) && ObjectUtils.isNotEmpty(BingRenXX.get("ZuZhiJGID")) ? BingRenXX.get("ZuZhiJGID").toString() : null);

--
Gitblit v1.9.3