From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
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