From 1bd118f44a45b2da389de83608dc980a1ad7c170 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 25 四月 2026 17:48:26 +0800
Subject: [PATCH] 添加一下 @DateTimeFormat
---
smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 543439b..89185dd 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -12,7 +12,9 @@
import com.smartor.common.LSHospTokenUtil;
import com.smartor.common.LyraTokenUtil;
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;
@@ -47,6 +49,8 @@
@Autowired
private RedisCache redisCache;
+ @Autowired
+ private PatArchiveMapper patArchiveMapper;
@Override
@@ -98,7 +102,7 @@
iServiceTaskService.updateServiceTask(serviceTask2);
//鑾峰彇鍒拌浠诲姟鎵�鏈夌殑鏈嶅姟锛屽苟浠庨槦鍒楅噷鍒犻櫎
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
serviceSubtaskVO.setTaskid(serviceTask2.getTaskid());
serviceSubtaskVO.setSendstate(2L);
List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
@@ -152,7 +156,7 @@
public ServiceTaskVO queryTaskByCondition(ServiceSubtask serviceSubtask) {
//瀹氫箟鎮ｈ�呬笌鍗曚竴浠诲姟鍏宠仈琛ㄩ泦鍚�
List<PatTaskRelevance> patTaskRelevances = new ArrayList<>();
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
serviceSubtaskVO.setTaskid(serviceSubtask.getTaskid());
List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isEmpty(selectServiceSubtaskList) || selectServiceSubtaskList.size() == 0) {
@@ -283,7 +287,7 @@
serviceSubtask.setCreateTime(new Date());
serviceSubtask.setLeavehospitaldistrictcode(serviceTaskVO.getDistrictcode());
//鍏堟煡璇竴閬嶏紝璇askGuid鏄惁瀛樺湪
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
serviceSubtaskVO.setTaskGuid(serviceTaskVO.getTaskguid());
List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
@@ -305,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()))
@@ -335,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