From 88c5064877fa22316d794c225fff3ceced4371f3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 03 三月 2025 20:03:43 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index f4f271c..4a42a20 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -71,6 +71,9 @@
private IPatMedInhospService iPatMedInhospService;
@Autowired
+ private IPatMedOperationService iPatMedOperationService;
+
+ @Autowired
private IServiceSubtaskService iServiceSubtaskService;
@Autowired
@@ -238,6 +241,14 @@
iPatMedInhospService.dealOutHospInfo();
}
+
+ /**
+ * 澶勭悊鎵嬫湳淇℃伅锛岃繘鍏ュ瓙浠诲姟琛�
+ */
+ public void dealOperationInfo() {
+ iPatMedOperationService.dealOperationInfo();
+ }
+
/**
* 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃(寰俊灏忕▼搴�)
*/
@@ -358,8 +369,31 @@
//绾歌川
} else if (descByCode.equals("寰俊灏忕▼搴�")) {
//寰俊灏忕▼搴�
- for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- log.error("寰俊灏忕▼搴忔湡浠诲姟鍙戦��---------杩涙潵浜嗗悧锛焮}", serviceSubtask);
+ log.error("ivrTask1鐨勫�间负锛歿}", ivrTask1);
+ if (ObjectUtils.isNotEmpty(ivrTask1) && ivrTask1.getPatCycle() == 1) {
+ //璇存槑璇ヤ换鍔＄殑鎮ｈ�呮槸寰幆鎵ц鐨�
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setTaskid(ivrTask1.getTaskid());
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+ //杩欓噷闇�瑕佹牴鎹韩浠借瘉鍘婚噸
+ List<ServiceSubtask> serviceSubtaskListFilter = new ArrayList<>();
+ aa:
+ for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
+ for (ServiceSubtask ss : serviceSubtaskListFilter) {
+ if (ss.getSfzh().equals(serviceSubtask.getSfzh())) {
+ continue aa;
+ }
+ }
+ serviceSubtaskListFilter.add(serviceSubtask);
+ }
+ for (ServiceSubtask serviceSubtask : serviceSubtaskListFilter) {
+ //灏嗗瓙浠诲姟ID鍒犻櫎 銆乻endstate鏀规垚3
+ serviceSubtask.setSendstate(3L);
+ serviceSubtask.setId(null);
+ serviceSubtask.setCreateTime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ }
}
} else if (descByCode.equals("鐭俊")) {
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
@@ -590,7 +624,7 @@
patArchive.setSex(thiedInhospInfo.getPatiRecordGender().equals("鐢�") ? 1L : 2L);
patArchive.setNation(thiedInhospInfo.getPatiNation());
patArchive.setNativePlace(thiedInhospInfo.getPatiNationality());
- patArchive.setPlaceOfResidence(thiedInhospInfo.getPatiHomeAddr());
+ patArchive.setPlaceOfResidence(StringUtils.isNotEmpty(thiedInhospInfo.getPatiHomeAddr()) ? thiedInhospInfo.getPatiHomeAddr().replace("null", "") : "");
try {
if (StringUtils.isNotEmpty(thiedInhospInfo.getPatiBirthday()))
patArchive.setBirthdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(thiedInhospInfo.getPatiBirthday()));
@@ -665,6 +699,7 @@
patMedInhosp.setLeavehospitaldistrictcode(thiedInhospInfo.getCurrWardId());
patMedInhosp.setLeavehospitaldistrictname(thiedInhospInfo.getCurrWardName());
patMedInhosp.setLeaveldeptid(thiedInhospInfo.getCurrDeptCode());
+ patMedInhosp.setOrgid("1");
//濡傛灉鏄嚭闄紝鍏堥�氳繃鎮ｈ�呯紪鍙峰拰娴佹按鍙峰幓鏌ヤ竴涓嬶紝鎮ｈ�呮槸鍚﹀瓨鍦紝濡傛灉瀛樺湪锛屽垯杩涜淇敼
PatMedInhosp inhosp = new PatMedInhosp();
inhosp.setPatno(patArchive.getPatientno());
--
Gitblit v1.9.3