From 06feddd673c57d60be77ce8e64c63008605b8502 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 25 五月 2026 10:26:40 +0800
Subject: [PATCH] 【丽水】patItem 报错问题处理
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 115 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 72 insertions(+), 43 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 e350c70..63a7c46 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
@@ -20,6 +20,7 @@
import com.ruoyi.quartz.util.CreateDataTable;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysDeptService;
import com.smartor.common.LSHospTokenUtil;
import com.smartor.common.MtSubmitSmUtil;
import com.smartor.domain.*;
@@ -136,6 +137,8 @@
@Autowired
IPatArchiveService patArchiveService;
+ @Autowired
+ ISysDeptService sysDeptService;
@Autowired
IPatMedOuthospService patMedOuthospService;
@@ -365,43 +368,43 @@
log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滃叆闄⑩�濈祼鏉熼噰闆嗘暟鎹紝闄㈠尯锛歿}", cid);
// 闂ㄦ�ヨ瘖鍒嗛〉閲囬泦锛氭瘡椤�1000鏉★紝鐩村埌鏃犳暟鎹负姝�(鍗楀崕闄勪竴鐨勫厛涓嶉噰闂ㄦ�ヨ瘖鏁版嵁)
- if (active.trim().equals("sltd")) {
- log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滈棬鎬ヨ瘖鈥濆紑濮嬪垎椤甸噰闆嗘暟鎹紝闄㈠尯锛歿}", cid);
- serviceSLTDInhospReqVO.setStartHeadTime(null);
- serviceSLTDInhospReqVO.setStartTailTime(null);
- serviceSLTDInhospReqVO.setEncounterTimeStart(nowTime);
- serviceSLTDInhospReqVO.setEncounterTimeEnd(nowTime);
- if (active.trim().equals("nhfy")) {
- serviceSLTDInhospReqVO.setEncounterTimeStart(yesterdayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
- serviceSLTDInhospReqVO.setEncounterTimeEnd(todayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
- }
- serviceSLTDInhospReqVO.setStatusList(null);
- List<String> list1 = new ArrayList<>();
- list1.add("FH0108.01");
- list1.add("FH0108.03");
- serviceSLTDInhospReqVO.setHealthcareRecordTypeList(list1);
- long outpPage = 1L;
- final long OUTP_PAGE_SIZE = 1000L;
- while (true) {
- serviceSLTDInhospReqVO.setCurrent(outpPage);
- serviceSLTDInhospReqVO.setSize(OUTP_PAGE_SIZE);
- log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滈棬鎬ヨ瘖鈥濋噰闆嗙{}椤垫暟鎹紝闄㈠尯锛歿}", outpPage, cid);
- List<ServiceSLTDInhospResDTO> outpResult = serviceSLTDHealthcareRecordService.queryHealthcareRecordList(serviceSLTDInhospReqVO);
- if (CollectionUtils.isEmpty(outpResult)) {
- log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滈棬鎬ヨ瘖鈥濈{}椤垫棤鏁版嵁锛岄噰闆嗙粨鏉燂紝闄㈠尯锛歿}", outpPage, cid);
- break;
- }
- log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滈棬鎬ヨ瘖鈥濈{}椤甸噰闆唟}鏉★紝闄㈠尯锛歿}", outpPage, outpResult.size(), cid);
- if (outpResult.size() < OUTP_PAGE_SIZE) {
- break;
- }
- outpPage++;
- }
- // 娓呴櫎鍒嗛〉鍙傛暟锛岄伩鍏嶅奖鍝嶅悗缁嚭鍏ラ櫌鏌ヨ
- serviceSLTDInhospReqVO.setCurrent(null);
- serviceSLTDInhospReqVO.setSize(null);
- log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滈棬鎬ヨ瘖鈥濆垎椤甸噰闆嗗畬鎴愶紝闄㈠尯锛歿}", cid);
- }
+// if (active.trim().equals("sltd")) {
+// log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滈棬鎬ヨ瘖鈥濆紑濮嬪垎椤甸噰闆嗘暟鎹紝闄㈠尯锛歿}", cid);
+// serviceSLTDInhospReqVO.setStartHeadTime(null);
+// serviceSLTDInhospReqVO.setStartTailTime(null);
+// serviceSLTDInhospReqVO.setEncounterTimeStart(nowTime);
+// serviceSLTDInhospReqVO.setEncounterTimeEnd(nowTime);
+// if (active.trim().equals("nhfy")) {
+// serviceSLTDInhospReqVO.setEncounterTimeStart(yesterdayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+// serviceSLTDInhospReqVO.setEncounterTimeEnd(todayZero.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+// }
+// serviceSLTDInhospReqVO.setStatusList(null);
+// List<String> list1 = new ArrayList<>();
+// list1.add("FH0108.01");
+// list1.add("FH0108.03");
+// serviceSLTDInhospReqVO.setHealthcareRecordTypeList(list1);
+// long outpPage = 1L;
+// final long OUTP_PAGE_SIZE = 1000L;
+// while (true) {
+// serviceSLTDInhospReqVO.setCurrent(outpPage);
+// serviceSLTDInhospReqVO.setSize(OUTP_PAGE_SIZE);
+// log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滈棬鎬ヨ瘖鈥濋噰闆嗙{}椤垫暟鎹紝闄㈠尯锛歿}", outpPage, cid);
+// List<ServiceSLTDInhospResDTO> outpResult = serviceSLTDHealthcareRecordService.queryHealthcareRecordList(serviceSLTDInhospReqVO);
+// if (CollectionUtils.isEmpty(outpResult)) {
+// log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滈棬鎬ヨ瘖鈥濈{}椤垫棤鏁版嵁锛岄噰闆嗙粨鏉燂紝闄㈠尯锛歿}", outpPage, cid);
+// break;
+// }
+// log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滈棬鎬ヨ瘖鈥濈{}椤甸噰闆唟}鏉★紝闄㈠尯锛歿}", outpPage, outpResult.size(), cid);
+// if (outpResult.size() < OUTP_PAGE_SIZE) {
+// break;
+// }
+// outpPage++;
+// }
+// // 娓呴櫎鍒嗛〉鍙傛暟锛岄伩鍏嶅奖鍝嶅悗缁嚭鍏ラ櫌鏌ヨ
+// serviceSLTDInhospReqVO.setCurrent(null);
+// serviceSLTDInhospReqVO.setSize(null);
+// log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滈棬鎬ヨ瘖鈥濆垎椤甸噰闆嗗畬鎴愶紝闄㈠尯锛歿}", cid);
+// }
log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滃嚭闄⑩�濆紑濮嬮噰闆嗘暟鎹紝闄㈠尯锛歿}", cid);
serviceSLTDInhospReqVO.setStartHeadTime(null);
@@ -417,7 +420,10 @@
serviceSLTDInhospReqVO.setHealthcareRecordTypeList(null);
List<String> list2 = new ArrayList<>();
// list2.add("FH0108.02");
+ //鍑洪櫌
list2.add("FH0109.27");
+ //棰勫嚭闄�
+ list2.add("FH0109.25");
serviceSLTDInhospReqVO.setStatusList(list2);
log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滃嚭闄⑩�濋噰闆嗘暟鎹叆鍙傦細{}", serviceSLTDInhospReqVO);
serviceSLTDHealthcareRecordService.queryHealthcareRecordList(serviceSLTDInhospReqVO);
@@ -865,14 +871,37 @@
}
}
} else if (active.equals("hzszlyy")) {//甯備竴鍖婚櫌
- SysDept sysDept = sysDeptMapper.selectDeptByCode("2", user.getOrgid(), wardCode);
String content = sendMagParam.getContent().replace("銆愭柊鍗庡尰闄€��", "");
- String result = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, sendMagParam.getPhone(), content);
- //杩欓噷闇�瑕佹牴鎹畆esult杩斿洖鐨勫�煎幓鍒ゆ柇锛屾槸鍚︽垚鍔燂紝鐒跺悗灏嗗�艰祴鍊肩粰isSuccess
- if (StringUtils.isNotEmpty(result) && result.contains("澶勭悊鎴愬姛")) {
- isSuccess = "true";
- }
+ SysDept sysDeptVo = new SysDept();
+ List<SysDept> sysDepts = new ArrayList<>();
+ if (ObjectUtils.isNotEmpty(serviceSubtask.getDeptcode())){
+ sysDeptVo.setDeptType("1");
+ sysDeptVo.setOrgid(serviceSubtask.getOrgid());
+ sysDeptVo.setDeptCode(serviceSubtask.getDeptcode());
+ sysDeptService.selectDeptList(sysDeptVo);
+ }else if(ObjectUtils.isNotEmpty(serviceSubtask.getLeavehospitaldistrictcode())){
+ sysDeptVo.setDeptType("2");
+ sysDeptVo.setOrgid(serviceSubtask.getOrgid());
+ sysDeptVo.setDeptCode(serviceSubtask.getLeavehospitaldistrictcode());
+ sysDeptService.selectDeptList(sysDeptVo);
+ }
+ SysDept sysDept = CollectionUtils.isNotEmpty(sysDepts) ? sysDepts.get(0) : new SysDept();
+ String campusid = ObjectUtils.isNotEmpty(sysDept) ? sysDept.getCampusid() : "2";
+ //婀栨花鍗曠嫭鍙戦�佹柟寮�
+ if("1".equals(campusid)){
+ String result = smsUtils.sendSms1(xhsmsPath, xhsmsAccount, xhsmsPwd, sendMagParam.getPhone(), content);
+ //杩欓噷闇�瑕佹牴鎹畆esult杩斿洖鐨勫�煎幓鍒ゆ柇锛屾槸鍚︽垚鍔燂紝鐒跺悗灏嗗�艰祴鍊肩粰isSuccess
+ if (StringUtils.isNotEmpty(result) && result.contains("澶勭悊鎴愬姛")) {
+ isSuccess = "true";
+ }
+ }else {
+ String result = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, sendMagParam.getPhone(), content);
+ //杩欓噷闇�瑕佹牴鎹畆esult杩斿洖鐨勫�煎幓鍒ゆ柇锛屾槸鍚︽垚鍔燂紝鐒跺悗灏嗗�艰祴鍊肩粰isSuccess
+ if (StringUtils.isNotEmpty(result) && result.contains("澶勭悊鎴愬姛")) {
+ isSuccess = "true";
+ }
+ }
}
//浠诲姟鍙戦�佽褰�
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
--
Gitblit v1.9.3