From ae086bc3ad6f785e6368b84e57a7e199c675779b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 02 四月 2025 11:42:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 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 30d1d81..d704bd2 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
@@ -22,6 +22,7 @@
import com.smartor.mapper.ServiceTaskMapper;
import com.smartor.mapper.SysUserImportMapper;
import com.smartor.service.*;
+import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -219,7 +220,7 @@
public void dealHisData2() {
//灏嗘偅鑰呬俊鎭�佸嚭闄€�侀棬璇婃暟鎹叏閮ㄩ噰闆�
// 鎸囧畾鐨勫紑濮嬫棩鏈�
- LocalDate endDate = LocalDate.of(2024, 9, 1);
+ LocalDate endDate = LocalDate.of(2025, 3, 3);
// 褰撳墠鏃ユ湡
LocalDate currentDate = LocalDate.now();
// 瀹氫箟鏃ユ湡鏍煎紡
@@ -334,6 +335,14 @@
//濡備綍浠诲姟琚�滄殏鍋溾�濇垨鈥滅粓姝⑩��
break;
}
+ if (org.apache.commons.lang3.StringUtils.isEmpty(serviceSubtask.getPhone())) {
+ serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setResult("error");
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+ continue;
+ }
boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
//璇存槑鏄珛鍗冲彂閫�(鍏堟妸娑堟伅鏀惧埌cache-0涓紝 displayNo涓嶇煡閬撴�庝箞閰嶇疆)
if (dateToday) {
@@ -369,7 +378,8 @@
//绾歌川
} else if (descByCode.equals("寰俊灏忕▼搴�")) {
//寰俊灏忕▼搴�
- if (ivrTask1.getPatCycle() == 1) {
+ log.error("ivrTask1鐨勫�间负锛歿}", ivrTask1);
+ if (ObjectUtils.isNotEmpty(ivrTask1) && ivrTask1.getPatCycle() == 1) {
//璇存槑璇ヤ换鍔＄殑鎮ｈ�呮槸寰幆鎵ц鐨�
ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
serviceSubtaskVO.setTaskid(ivrTask1.getTaskid());
@@ -389,9 +399,24 @@
//灏嗗瓙浠诲姟ID鍒犻櫎 銆乻endstate鏀规垚3
serviceSubtask.setSendstate(3L);
serviceSubtask.setId(null);
+ serviceSubtask.setFinishtime(null);
serviceSubtask.setCreateTime(new Date());
serviceSubtask.setUpdateTime(new Date());
- serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ //澶勭悊閲嶅鏂板闂锛屽厛鏌ヤ竴涓嬩粖澶╂槸涓嶆槸鏈夋柊澧炶繃锛屾柊澧炶繃灏变笉鏂板浜�
+ ServiceSubtaskVO ssvo = new ServiceSubtaskVO();
+ LocalDate today = LocalDate.now();
+ LocalTime startOfDay = LocalTime.of(0, 0, 0);
+ LocalTime endOfDay = LocalTime.of(23, 59, 59);
+ Date startOfDayDate = Date.from(today.atTime(startOfDay).atZone(ZoneId.systemDefault()).toInstant());
+ Date endOfDayDate = Date.from(today.atTime(endOfDay).atZone(ZoneId.systemDefault()).toInstant());
+ ssvo.setCreateStartTime(startOfDayDate);
+ ssvo.setCreateEndTime(endOfDayDate);
+ ssvo.setCreateBy(serviceSubtask.getCreateBy());
+ ssvo.setSendname(serviceSubtask.getSendname());
+ ssvo.setSfzh(serviceSubtask.getSfzh());
+ List<ServiceSubtask> serviceSubtaskListByCreateTime = serviceSubtaskMapper.selectServiceSubtaskListByCreateTime(ssvo);
+ if (CollectionUtils.isEmpty(serviceSubtaskListByCreateTime))
+ serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
}
}
} else if (descByCode.equals("鐭俊")) {
@@ -414,12 +439,14 @@
continue;
}
String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
+ String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
SendMagParam sendMagParam = new SendMagParam();
sendMagParam.setType("4");
ServiceOutPath serviceOutPath = new ServiceOutPath();
serviceOutPath.setParam1(taskId);
serviceOutPath.setParam2(patid);
serviceOutPath.setParam3(ivrTask1.getTaskName());
+ serviceOutPath.setParam6(subId);
serviceOutPath.setCreateTime(new Date());
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
String format = String.format("%03X", serviceOutPath.getId());
@@ -573,7 +600,7 @@
String filename = null;
if (cry.equals("0")) filename = "鍏ラ櫌淇℃伅" + System.currentTimeMillis();
if (cry.equals("1")) filename = "鍑洪櫌淇℃伅" + System.currentTimeMillis();
- File file = new File("D:\\public\\鍗庡崜闆嗘垚骞冲彴鏁版嵁\\" + filename);
+ File file = new File("D:\\public\\HIS鏁版嵁閲囬泦\\" + filename);
if (!file.exists()) {
// 濡傛灉鏂囦欢涓嶅瓨鍦紝鍒欏垱寤烘柊鏂囦欢
try {
@@ -623,10 +650,10 @@
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()));
+ patArchive.setBirthdate(new SimpleDateFormat("yyyy-MM-dd").parse(thiedInhospInfo.getPatiBirthday()));
} catch (ParseException e) {
e.printStackTrace();
}
@@ -655,6 +682,7 @@
patMedInhosp.setNurseId(thiedInhospInfo.getNurseId());
patMedInhosp.setNurseName(thiedInhospInfo.getNurseName());
patMedInhosp.setSerialnum(thiedInhospInfo.getInpatientId());
+ patMedInhosp.setFuflag("1");
if (cry.equals("0")) {
patMedInhosp.setInhospstate("0");
} else if (cry.equals("1")) {
@@ -698,6 +726,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