From 599beddc80e7e50b2099bacdbf7df2d89df00ef2 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期六, 07 十一月 2026 14:42:31 +0800
Subject: [PATCH] fix: 完成时状态与超时判断区分任务组
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | 228 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 190 insertions(+), 38 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
index 8c488f7..b7986ed 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -1,5 +1,7 @@
package com.ruoyi.quartz.service.impl;
+import com.ruoyi.othervisit.api.OtherVisitFacade;
+import com.ruoyi.inhospvisit.api.InhospVisitFacade;
import com.google.gson.Gson;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -9,10 +11,11 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.quartz.mapper.CollectHISMapper;
import com.ruoyi.quartz.service.ICollectHISService;
+import com.smartor.common.SpecificArchiveConstants;
import com.smartor.domain.*;
-import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
import com.smartor.service.IPatMedOuthospService;
+import com.smartor.service.IPatSpecificArchiveGenerateService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
@@ -22,6 +25,7 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -30,17 +34,44 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import com.ruoyi.othervisit.domain.PatMedOperationItem;
+import com.ruoyi.outpatientvisit.mapper.PatMedOuthospMapper;
+import com.ruoyi.othervisit.domain.PatMedOperation;
+import com.ruoyi.outpatientvisit.domain.PatMedOuthosp;
+import com.ruoyi.outpatientvisit.domain.PatMedOuthospQueryReq;
+import com.ruoyi.inhospvisit.domain.PatMedInhosp;
+import com.ruoyi.common.core.domain.entity.PatArchive;
+import com.ruoyi.task.domain.entity.ServiceSubtaskEntity;
+import com.ruoyi.task.domain.ServiceSubtask;
+import com.ruoyi.task.mapper.ServiceSubtaskMapper;
+import com.ruoyi.patarchive.mapper.PatArchiveMapper;
+import com.ruoyi.common.core.domain.entity.Icd10;
+import com.ruoyi.common.mapper.Icd10Mapper;
+import com.ruoyi.system.mapper.ext.SysUser2Mapper;
+import com.ruoyi.system.mapper.ext.SysDept2Mapper;
+import com.ruoyi.system.mapper.ext.SysUserDeptMapper;
+import com.ruoyi.patarchive.mapper.ShardingMapper;
+import com.ruoyi.datacollection.domain.HnDataGatherVO;
@Slf4j
@Service
public class CollectHISServiceImpl implements ICollectHISService {
@Autowired
private CollectHISMapper chMapper;
+ /**
+ * 鎵嬫湳鏁版嵁涓�寰嬬粡 ruoyi-othervisit 鐨勯棬闈㈠彇鐢紙璺ㄦā鍧楁暟鎹闂師鍒欙級銆�
+ */
+ @Autowired
+ private OtherVisitFacade otherVisitFacade;
+
@Autowired
private SysUser2Mapper sysUser2Mapper;
@Autowired
private IPatMedOuthospService patMedOuthospService;
+
+ @Autowired
+ private IPatSpecificArchiveGenerateService patSpecificArchiveGenerateService;
@Autowired
private SysDept2Mapper sysDept2Mapper;
@@ -58,7 +89,7 @@
private PatMedOuthospMapper patMedOuthospMapper;
@Autowired
- private PatMedInhospMapper patMedInhospMapper;
+ private InhospVisitFacade inhospVisitFacade;
@Autowired
private PatArchiveMapper patArchiveMapper;
@@ -89,11 +120,7 @@
@Value("${spring.profiles.active}")
private String active;
- @Autowired
- private PatMedOperationMapper patMedOperationMapper;
- @Autowired
- private PatMedOperationItemMapper patMedOperationItemMapper;
@Override
public List<PatArchive> selectPatArchiveList(PatArchive patArchive) {
@@ -244,7 +271,7 @@
//鍚屾鍑哄叆闄�
PatMedInhosp pmi = new PatMedInhosp();
pmi.setSerialnum(pm.getSerialnum());
- List<PatMedInhosp> patMedInhospList1 = patMedInhospMapper.selectPatMedInhospListBySerialnum(pmi);
+ List<PatMedInhosp> patMedInhospList1 = inhospVisitFacade.selectPatMedInhospListBySerialnum(pmi);
if (patMedInhospList1.size() == 0) {
pm.setCreateTime(new Date());
//甯備竴 闄㈠尯id瀵瑰簲orgid锛屾満鏋刬d涓洪粯璁ょ殑1
@@ -252,7 +279,7 @@
pm.setCampusid(pm.getOrgid());
pm.setOrgid("1");
}
- count += patMedInhospMapper.insertPatMedInhosp(pm);
+ count += inhospVisitFacade.insertPatMedInhosp(pm);
} else {
pm.setInhospid(patMedInhospList1.get(0).getInhospid());
pm.setUpdateTime(new Date());
@@ -261,7 +288,7 @@
pm.setCampusid(pm.getOrgid());
pm.setOrgid("1");
}
- count += patMedInhospMapper.updatePatMedInhosp(pm);
+ count += inhospVisitFacade.updatePatMedInhosp(pm);
}
} catch (Exception ex) {
log.info("鍚屾鍑哄叆闄�:" + ex.getMessage());
@@ -277,13 +304,36 @@
* @return
*/
private Integer syncOuthosp(String startTime, String endTime) {
+ return syncOuthosp(startTime, endTime, null, false);
+ }
+
+ /**
+ * 鍚屾闂ㄨ瘖淇℃伅銆�
+ *
+ * @param startTime 寮�濮嬫椂闂�
+ * @param endTime 缁撴潫鏃堕棿
+ * @param orgid 鏈烘瀯ID锛屼负绌烘椂鍚屾鍏ㄩ儴鏈烘瀯
+ * @param byAdmitDate true=鎸夊氨璇婃棩鏈熻繃婊わ紙琛ラ噰锛夛紱false=鎸夋渶鍚庢洿鏂版椂闂村閲忓悓姝�
+ */
+ private Integer syncOuthosp(String startTime, String endTime, String orgid, boolean byAdmitDate) {
Integer count = 0;
PatMedOuthosp patMedOuthosp = new PatMedOuthosp();
- patMedOuthosp.setLastStartTime(startTime);
- patMedOuthosp.setLastEndTime(endTime);
+ if (byAdmitDate) {
+ patMedOuthosp.setBeginTime(parseDateTime(startTime));
+ patMedOuthosp.setEndTime(parseDateTime(endTime));
+ } else {
+ patMedOuthosp.setLastStartTime(startTime);
+ patMedOuthosp.setLastEndTime(endTime);
+ }
+ patMedOuthosp.setOrgid(orgid);
List<PatMedOuthosp> patMedOuthosps = chMapper.selectPatMedOuthospList(patMedOuthosp);
- log.info("鍚屾闂ㄨ瘖淇℃伅鏁伴噺" + patMedOuthosps.size());
+ log.info("鍚屾闂ㄨ瘖淇℃伅鏁伴噺锛歿}锛宱rgid={}锛宐yAdmitDate={}", patMedOuthosps.size(), orgid, byAdmitDate);
for (PatMedOuthosp patMedOuthosp1 : patMedOuthosps) {
+ // 鎸夋満鏋勮ˉ閲囨椂锛孒IS 瑙嗗浘鏈繑鍥� orgid 鐨勮褰曡ˉ涓婃煡璇㈡潯浠朵腑鐨勬満鏋�
+ if (StringUtils.isEmpty(patMedOuthosp1.getOrgid()) && StringUtils.isNotEmpty(orgid)) {
+ patMedOuthosp1.setOrgid(orgid);
+ }
+ PatArchive localArchive = null;
try {
//鎮ｈ�呭熀鏈俊鎭�
PatArchive patArchive = new PatArchive();
@@ -294,26 +344,47 @@
pa1.setPatientno(patMedOuthosp1.getPatno());
List<PatArchive> patArchives1 = patArchiveMapper.selectPatArchiveList(pa1);
if (CollectionUtils.isNotEmpty(patArchives1)) {
- patArchives.get(0).setId(patArchives1.get(0).getId());
+ localArchive = patArchives1.get(0);
+ patArchives.get(0).setId(localArchive.getId());
patArchives.get(0).setUpdateTime(new Date());
count += patArchiveMapper.updatePatArchive(patArchives.get(0));
} else {
patArchives.get(0).setCreateTime(new Date());
count += patArchiveMapper.insertPatArchiveSingle(patArchives.get(0));
-
+ localArchive = patArchives.get(0);
}
}
} catch (Exception ex) {
log.info("鍚屾偅鑰呭熀鏈俊鎭�:" + ex.getMessage());
}
+ // HIS 鎮ｈ�呬俊鎭己澶辨椂锛屼粛鎸夋偅鑰呯紪鍙峰洖鏌ユ湰鍦版。妗�
+ if (localArchive == null && StringUtils.isNotEmpty(patMedOuthosp1.getPatno())) {
+ try {
+ PatArchive localQuery = new PatArchive();
+ localQuery.setPatientno(patMedOuthosp1.getPatno());
+ List<PatArchive> localArchives = patArchiveMapper.selectPatArchiveList(localQuery);
+ if (CollectionUtils.isNotEmpty(localArchives)) {
+ localArchive = localArchives.get(0);
+ }
+ } catch (Exception ex) {
+ log.info("鍥炴煡鏈湴鎮ｈ�呮。妗堝け璐�:" + ex.getMessage());
+ }
+ }
+
try {
- PatMedOuthosp patMedOuthospTemp = new PatMedOuthosp();
- patMedOuthospTemp.setSerialnum(patMedOuthosp1.getSerialnum());
- List<PatMedOuthosp> patMedOuthospsTemp = chMapper.selectPatMedOuthospList(patMedOuthosp);
- if (patMedOuthospsTemp.size() > 0) {
+ if (localArchive != null && localArchive.getId() != null) {
+ patMedOuthosp1.setPatid(localArchive.getId());
+ }
+ PatMedOuthosp localOuthosp = null;
+ try {
+ localOuthosp = findLocalOuthosp(patMedOuthosp1);
+ } catch (Exception e) {
+ log.warn("鍥炴煡鏈湴闂ㄨ瘖璁板綍澶辫触锛屾寜鏂板澶勭悊锛宻erialnum={}", patMedOuthosp1.getSerialnum(), e);
+ }
+ if (localOuthosp != null) {
patMedOuthosp1.setUpdateTime(new Date());
- patMedOuthosp1.setId(patMedOuthospsTemp.get(0).getId());
+ patMedOuthosp1.setId(localOuthosp.getId());
//甯備竴 闄㈠尯id瀵瑰簲orgid锛屾満鏋刬d涓洪粯璁ょ殑1
if(active.equals("hzszlyy")) {
patMedOuthosp1.setCampusid(patMedOuthosp1.getOrgid());
@@ -329,10 +400,91 @@
}
count += patMedOuthospService.insertPatMedOuthosp(patMedOuthosp1);
}
+ generateSpecificArchive(patMedOuthosp1, localArchive);
} catch (Exception ex) {
- log.info("鍚屾鍑哄叆闄�:" + ex.getMessage());
+ log.info("鍚屾闂ㄨ瘖淇℃伅:" + ex.getMessage());
}
}
+ return count;
+ }
+
+ /**
+ * 鍥炴煡鏈湴闂ㄨ瘖璁板綍锛岄伩鍏嶉噸澶嶉噰闆嗘椂鎻掑叆閲嶅鏁版嵁銆�
+ */
+ private PatMedOuthosp findLocalOuthosp(PatMedOuthosp record) {
+ if (StringUtils.isEmpty(record.getSerialnum()) && StringUtils.isEmpty(record.getOuthospno())) {
+ return null;
+ }
+ PatMedOuthospQueryReq req = new PatMedOuthospQueryReq();
+ req.setSerialnum(record.getSerialnum());
+ req.setOuthospno(record.getOuthospno());
+ req.setOrgid(record.getOrgid());
+ List<PatMedOuthosp> localList = patMedOuthospMapper.callSpQueryOuthosp(req);
+ return CollectionUtils.isNotEmpty(localList) ? localList.get(0) : null;
+ }
+
+ /**
+ * 闂ㄨ瘖鎺ヨ瘖瀹屾垚璁板綍閲囬泦鍚庣敓鎴愪笓绉戞。妗堬紙浠呬附姘村競濡囧辜淇濆仴闄㈢敓鏁堬級銆�
+ */
+ private void generateSpecificArchive(PatMedOuthosp patMedOuthosp, PatArchive patArchive) {
+ if (!SpecificArchiveConstants.LISHUI_MCH_ORG_ID.equals(patMedOuthosp.getOrgid())) {
+ return;
+ }
+ try {
+ int generated = patSpecificArchiveGenerateService.generateByOuthosp(patMedOuthosp, patArchive);
+ if (generated > 0) {
+ log.info("闂ㄨ瘖鎺ヨ瘖瀹屾垚璁板綍鐢熸垚涓撶妗ｆ鎴愬姛锛宱uthospno={}锛岀敓鎴愭暟閲�={}",
+ patMedOuthosp.getOuthospno(), generated);
+ }
+ } catch (Exception e) {
+ log.error("闂ㄨ瘖鎺ヨ瘖瀹屾垚璁板綍鐢熸垚涓撶妗ｆ澶辫触锛宱uthospno={}", patMedOuthosp.getOuthospno(), e);
+ }
+ }
+
+ private Date parseDateTime(String value) {
+ if (StringUtils.isEmpty(value)) {
+ return null;
+ }
+ try {
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(value);
+ } catch (Exception e) {
+ try {
+ return new SimpleDateFormat("yyyy-MM-dd").parse(value);
+ } catch (Exception ex) {
+ log.warn("瑙ｆ瀽闂ㄨ瘖閲囬泦鏃堕棿澶辫触锛歿}", value);
+ return null;
+ }
+ }
+ }
+
+ /**
+ * 鍓嶇/瀹氭椂浠诲姟浼犲叆 yyyy-MM-dd 鏃讹紝缁撴潫鏃堕棿琛ラ綈鍒板綋澶� 23:59:59锛岄伩鍏嶆紡鎺夊綋澶╂暟鎹��
+ */
+ private Date normalizeEndTime(Date endTime) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(endTime);
+ if (calendar.get(Calendar.HOUR_OF_DAY) == 0 && calendar.get(Calendar.MINUTE) == 0
+ && calendar.get(Calendar.SECOND) == 0 && calendar.get(Calendar.MILLISECOND) == 0) {
+ calendar.add(Calendar.DAY_OF_MONTH, 1);
+ calendar.add(Calendar.SECOND, -1);
+ return calendar.getTime();
+ }
+ return endTime;
+ }
+
+ @Override
+ public Integer collectMchOuthospAndGenerateArchive(String orgid, Date startTime, Date endTime) {
+ if (!SpecificArchiveConstants.LISHUI_MCH_ORG_ID.equals(orgid)) {
+ log.warn("閲囬泦闂ㄨ瘖鎺ヨ瘖瀹屾垚璁板綍浠呮敮鎸佷附姘村競濡囧辜淇濆仴闄紝orgid={}", orgid);
+ return 0;
+ }
+ Date end = endTime != null ? normalizeEndTime(endTime) : new Date();
+ Date start = startTime != null ? startTime : new Date(end.getTime() - 24 * 60 * 60 * 1000L);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ log.info("寮�濮嬮噰闆嗕附姘村骞奸棬璇婃帴璇婂畬鎴愯褰曪紝鏃堕棿鑼冨洿锛歿} ~ {}", sdf.format(start), sdf.format(end));
+ int count = syncOuthosp(sdf.format(start), sdf.format(end), orgid, true);
+ log.info("涓芥按濡囧辜闂ㄨ瘖鎺ヨ瘖瀹屾垚璁板綍閲囬泦瀹屾垚锛屾椂闂磋寖鍥达細{} ~ {}锛屽鐞嗘暟閲忥細{}",
+ sdf.format(start), sdf.format(end), count);
return count;
}
@@ -372,15 +524,15 @@
}
PatMedOperation oper = new PatMedOperation();
oper.setOpreqid(operation.getOpreqid());
- List<PatMedOperation> patMedOperations1 = patMedOperationMapper.selectPatMedOperationList(oper);
+ List<PatMedOperation> patMedOperations1 = otherVisitFacade.selectOperationList(oper);
if (CollectionUtils.isNotEmpty(patMedOperations1)) {
operation.setId(patMedOperations1.get(0).getId());
operation.setUpdateTime(new Date());
- count += patMedOperationMapper.updatePatMedOperation(operation);
+ count += otherVisitFacade.updateOperation(operation);
syncOperItem(operation);
} else {
operation.setCreateTime(new Date());
- count += patMedOperationMapper.insertPatMedOperation(operation);
+ count += otherVisitFacade.insertOperation(operation);
syncOperItem(operation);
}
} catch (Exception ex) {
@@ -393,7 +545,7 @@
private Integer cancelOper(PatMedOperation oper){
PatMedOperation operationVo = new PatMedOperation();
operationVo.setOpreqid(oper.getOpreqid());
- List<PatMedOperation> operations = patMedOperationMapper.selectPatMedOperationList(operationVo);
+ List<PatMedOperation> operations = otherVisitFacade.selectOperationList(operationVo);
PatMedOperation operation = new PatMedOperation();
if(CollectionUtils.isEmpty(operations)){
return 0;
@@ -405,7 +557,7 @@
//鑾峰彇闇�瑕佸嚭闄㈡墜鏈殢璁匡紝鏈鐞嗙殑鏁版嵁
pmoi.setOpid(operation.getId().toString());
List<PatMedOperationItem> patMedOperationItems
- = patMedOperationItemMapper.selectOperationItemList(pmoi);
+ = otherVisitFacade.selectOperationItemListByCondition(pmoi);
List<Long> operationItemIds = patMedOperationItems.stream()
.map(PatMedOperationItem::getId)
.filter(Objects::nonNull)
@@ -438,8 +590,8 @@
}
}
operation.setUpdateTime(new Date());
- patMedOperationMapper.updatePatMedOperation(operation);
- patMedOperationItemMapper.deleteSoftPatMedOperationItemByOpId(operation.getOpid());
+ otherVisitFacade.updateOperation(operation);
+ otherVisitFacade.deleteSoftOperationItemByOpId(operation.getOpid());
return 1;
}
@@ -454,7 +606,7 @@
operation.setOpid(operation.getId().toString());
}
operation.setUpdateTime(new Date());
- patMedOperationMapper.updatePatMedOperation(operation);
+ otherVisitFacade.updateOperation(operation);
Integer count = 0;
if(StringUtils.isNotEmpty(operation.getOpid())){
@@ -471,7 +623,7 @@
PatMedOperationItem operItem = new PatMedOperationItem();
operItem.setOperationid(operation.getOpreqid());
- List<PatMedOperationItem> patMedOperationItems1 = patMedOperationItemMapper.selectPatMedOperationItemList(operItem);
+ List<PatMedOperationItem> patMedOperationItems1 = otherVisitFacade.selectOperationItemList(operItem);
Map<String, List<PatMedOperationItem>> maps = ArrayListUtils.splitListsById(patMedOperationItems,
patMedOperationItems1, PatMedOperationItem::getOperationid);
@@ -492,12 +644,12 @@
operationItem.setOperationid(operation.getOpreqid());
operationItem.setOpercheckFlag("0");
operationItem.setCreateTime(new Date());
- count += patMedOperationItemMapper.insertPatMedOperationItem(operationItem);
+ count += otherVisitFacade.insertOperationItem(operationItem);
}
for (PatMedOperationItem operationItem : delItems) {
operationItem.setUpdateTime(new Date());
- count += patMedOperationItemMapper.deletePatMedOperationItemByOperationid(operationItem.getOperationid());
+ count += otherVisitFacade.deleteOperationItemByOperationid(operationItem.getOperationid());
}
for (PatMedOperationItem operationItem : editItems) {
@@ -506,7 +658,7 @@
operationItem.setOpid(operation.getId().toString());
operationItem.setOperationid(operation.getOpreqid());
operationItem.setUpdateTime(new Date());
- count += patMedOperationItemMapper.updatePatMedOperationItemByOperationid(operationItem);
+ count += otherVisitFacade.updateOperationItemByOperationid(operationItem);
}
log.info("鍚屾鎵嬫湳id={}璇︽儏淇℃伅鏁伴噺, 鏂板{}鏉★紝鍒犻櫎{}鏉★紝淇敼{}鏉�", operation.getId(), addItems.size(), delItems.size(), editItems.size());
} catch (Exception ex) {
@@ -514,8 +666,8 @@
}
// try {
-// patMedOperationItemMapper.deleteHardPatMedOperationItemByOpId(operation.getOpid());
-// count += patMedOperationItemMapper.insertPatMedOperationItems(patMedOperationItems);
+// otherVisitFacade.deleteHardOperationItemByOpId(operation.getOpid());
+// count += otherVisitFacade.insertOperationItems(patMedOperationItems);
// }catch (Exception ex) {
// log.info("鍚屾鎵嬫湳璇︽儏淇℃伅:" + ex.getMessage());
// }
@@ -599,20 +751,20 @@
//鍏ラ櫌
pm.setInhospstate("0");
pm.setCreateTime(new Date());
- patMedInhospMapper.insertPatMedInhosp(pm);
+ inhospVisitFacade.insertPatMedInhosp(pm);
} else if (!Objects.isNull(patMedInhosp.getStartOutHospTime()) && !Objects.isNull(patMedInhosp.getEndOutHospTime())) {
//鍑洪櫌
pm.setInhospstate("1");
pm.setUpdateTime(new Date());
PatMedInhosp pmi = new PatMedInhosp();
pmi.setSerialnum(pm.getSerialnum());
- List<PatMedInhosp> patMedInhospList1 = patMedInhospMapper.selectPatMedInhospList(pmi);
+ List<PatMedInhosp> patMedInhospList1 = inhospVisitFacade.selectPatMedInhospList(pmi);
if (CollectionUtils.isEmpty(patMedInhospList1)) {
pm.setCreateTime(new Date());
- patMedInhospMapper.insertPatMedInhosp(pm);
+ inhospVisitFacade.insertPatMedInhosp(pm);
} else {
pm.setInhospid(patMedInhospList1.get(0).getInhospid());
- patMedInhospMapper.updatePatMedInhosp(pm);
+ inhospVisitFacade.updatePatMedInhosp(pm);
}
}
--
Gitblit v1.9.3