From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1,患者过滤状态修改(之前只支持发送之前的过滤,现在支持发送之后的过滤,如果任务发送后,外链不能再打开) 2.在出入院表新增入院申请单字段 3.采集入院数据时,同时要采集importanceFlagCode    emergencyLevelCode 4.外链的发送,也要查询子任务状态,如果是不执行,也不能再发送

---
 smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index 17bb6a6..89185dd 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -14,6 +14,7 @@
 import com.smartor.domain.*;
 import com.smartor.domain.entity.ServiceSubtaskEntity;
 import com.smartor.mapper.BaseOrganizationMapper;
+import com.smartor.mapper.PatArchiveMapper;
 import com.smartor.mapper.ServiceSubtaskMapper;
 import com.smartor.service.IServiceTaskService;
 import com.smartor.service.ISvyTaskSingleService;
@@ -48,6 +49,8 @@
 
     @Autowired
     private RedisCache redisCache;
+    @Autowired
+    private PatArchiveMapper patArchiveMapper;
 
 
     @Override
@@ -306,7 +309,10 @@
             log.error("360鏌ヨ鏉′欢涓虹┖");
             throw new BaseException("360鏌ヨ鏉′欢涓虹┖");
         }
-        String token = LSHospTokenUtil.getToken(serviceQueryInfo.getXiaoXiTou().getFaSongJGID(),serviceQueryInfo.getUrl());
+        String token = "";
+        if(ObjectUtils.isNotEmpty(serviceQueryInfo.getUrl())){
+            token = LSHospTokenUtil.getToken(serviceQueryInfo.getXiaoXiTou().getFaSongJGID(),serviceQueryInfo.getUrl());
+        }
 
         //鐢ㄦ埛淇℃伅锛岄�氳繃ZuZhiJGID鍘籦se_organization涓幏鍙栨満鏋勪俊鎭�
         if (StringUtils.isBlank(serviceQueryInfo.getYeWuXX().getYongHuXX().getZuZhiJGID()))
@@ -336,6 +342,20 @@
                 result = OkHttpExample.sendPostRequest("https://9.0.124.104:13021/mediinfo-grus-fuwuzxwg/api/esb/lyraSyncRun", jsonString, token);
             }else if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47231022633110211A2101")) {  //涓尰闄�
                 result = OkHttpExample.sendPostRequest("https://9.0.124.104:13011/mediinfo-grus-fuwuzxwg/api/esb/lyraSyncRun", jsonString, token);
+            }else if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("1")) {  //鏉窞甯備竴
+                YeWuXX yeWuXX = serviceQueryInfo.getYeWuXX();
+                BingRenXX bingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? yeWuXX.getBingRenXX() : null;
+                PatArchive patArchive = new PatArchive();
+                if (ObjectUtils.isNotEmpty(bingRenXX)) {
+                    patArchive.setIdcardno(bingRenXX.getZhengJianHM());
+                    if(ObjectUtils.isNotEmpty(patArchive.getIdcardno())){
+                        List<PatArchive> patArchives = patArchiveMapper.selectPatArchiveList(patArchive);
+                        if(CollectionUtils.isNotEmpty(patArchives)){
+                            String patidHis = patArchives.get(0).getPatidHis();
+                            result = OkHttpExample.getUnsafe("http://192.200.81.189:9100/blj/view?BINGRENID="+ patidHis +"&YONGHUID=DBA", token);
+                        }
+                    }
+                }
             }else if(ObjectUtils.isNotEmpty(serviceQueryInfo.getUrl360())){
                 result = OkHttpExample.sendPostRequest(serviceQueryInfo.getUrl360(), jsonString, token);
             }

--
Gitblit v1.9.3