From 0bbbd746e8c39d91ad7b47a4e36e29ab972dc98c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 20 十月 2026 16:56:54 +0800
Subject: [PATCH] 处理长期任务发送问题
---
ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/service/InhospSubtaskWriter.java | 158 +++++++++++++++++++++-------------------------------
1 files changed, 65 insertions(+), 93 deletions(-)
diff --git a/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/service/InhospSubtaskWriter.java b/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/service/InhospSubtaskWriter.java
index 2c3db08..1c755c5 100644
--- a/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/service/InhospSubtaskWriter.java
+++ b/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/service/InhospSubtaskWriter.java
@@ -61,19 +61,29 @@
@Service
public class InhospSubtaskWriter {
- /** 鏅畞鏈烘瀯ID锛堝師 L798 纭紪鐮侊紱宸查�愬瓧鏍稿鍘熷疄鐜� 4 澶勶級 */
+ /**
+ * 鏅畞鏈烘瀯ID锛堝師 L798 纭紪鐮侊紱宸查�愬瓧鏍稿鍘熷疄鐜� 4 澶勶級
+ */
private static final String ORG_JINGNING = "47255004333112711A1001";
- /** 鍑洪櫌闅忚鐨勬湇鍔＄被鍨嬶紙鍐嶅叆闄㈠仠鏈哄垎鏀殑蹇呰鏉′欢锛屽師 L803锛� */
+ /**
+ * 鍑洪櫌闅忚鐨勬湇鍔＄被鍨嬶紙鍐嶅叆闄㈠仠鏈哄垎鏀殑蹇呰鏉′欢锛屽師 L803锛�
+ */
private static final String SERVICE_TYPE_DISCHARGE = "2";
- /** 寰呮墽琛岀姸鎬� */
+ /**
+ * 寰呮墽琛岀姸鎬�
+ */
private static final long SENDSTATE_PENDING = 2L;
- /** 鍋滄満鐘舵�侊紙鍘熷疄鐜版妸 sendstate 缃� 4 琛ㄧず涓嶅啀鎵ц锛� */
+ /**
+ * 鍋滄満鐘舵�侊紙鍘熷疄鐜版妸 sendstate 缃� 4 琛ㄧず涓嶅啀鎵ц锛�
+ */
private static final long SENDSTATE_STOPPED = 4L;
- /** 鐤剧梾缁村害锛坱ype=3锛変笓鐢細鍋滄棫浠诲姟鍚庢妸鎵ц鏂瑰紡鍏ㄧ疆澶辫触 */
+ /**
+ * 鐤剧梾缁村害锛坱ype=3锛変笓鐢細鍋滄棫浠诲姟鍚庢妸鎵ц鏂瑰紡鍏ㄧ疆澶辫触
+ */
private static final String PREACHFORM_STATE_FAIL = "5";
@Autowired
@@ -99,32 +109,29 @@
* 鎶婃偅鑰呭啓杩涢殢璁垮瓙浠诲姟琛� 鈥斺�� 鍘� {@code writeInSubTask(Long taskid, Boolean check, PatMedInhosp,
* PatArchive, Integer type, String config)}銆�
*
- * @param taskid 鍛戒腑鐨勯暱鏈熶换鍔D
- * @param check 鏄惁闇�瑕佸仛"鍐嶅叆闄�"鍘婚噸鏍￠獙
- * @param inhosp 鍑哄叆闄㈣褰�
- * @param archive 鎮ｈ�呮。妗�
- * @param type 0=鑽搧瀹ｆ暀 / 1=绂婚櫌绉戝 / 2=绂婚櫌鐥呭尯 / 3=鐤剧梾 / 4=鍏ラ櫌绉戝 / 5=鍏ラ櫌鐥呭尯
- * @param config {@code sys_config: visit.early.day}
+ * @param taskid 鍛戒腑鐨勯暱鏈熶换鍔D
+ * @param check 鏄惁闇�瑕佸仛"鍐嶅叆闄�"鍘婚噸鏍￠獙
+ * @param inhosp 鍑哄叆闄㈣褰�
+ * @param archive 鎮ｈ�呮。妗�
+ * @param type 0=鑽搧瀹ｆ暀 / 1=绂婚櫌绉戝 / 2=绂婚櫌鐥呭尯 / 3=鐤剧梾 / 4=鍏ラ櫌绉戝 / 5=鍏ラ櫌鐥呭尯
+ * @param config {@code sys_config: visit.early.day}
* @return <b>鏄惁鐪熺殑钀戒簡搴�</b>锛堟垨"鏈潵灏卞凡缁忔湁"锛夈��
- * 杩斿洖鍊兼槸 2026-10"涓�涓偅鑰呭彧鐢熸垚涓�鏉￠殢璁夸换鍔�"鏀归�犵殑鍒ゆ嵁锛�
- * 缂栨帓灞傛寜缁村害浼樺厛绾ч�愪釜灏濊瘯锛屽彧鏈夋嬁鍒� {@code true} 鎵嶇畻璇ョ淮搴︽垚鍔熷苟鍋滄銆�
- * 鍘熷疄鐜版槸 {@code void}锛岀紪鎺掑眰鐢�"璋冪敤浜嗗嚑娆�"褰撴垚鍔熸暟 鈥斺�� 閭ｆ槸閿欑殑
- * 锛堜换鍔℃湭鍙戝竷/琚幓閲嶆椂鍚屾牱鏄�"鐢熸垚浜嗕竴鏉�"锛夈��
+ * 杩斿洖鍊兼槸 2026-10"涓�涓偅鑰呭彧鐢熸垚涓�鏉￠殢璁夸换鍔�"鏀归�犵殑鍒ゆ嵁锛�
+ * 缂栨帓灞傛寜缁村害浼樺厛绾ч�愪釜灏濊瘯锛屽彧鏈夋嬁鍒� {@code true} 鎵嶇畻璇ョ淮搴︽垚鍔熷苟鍋滄銆�
+ * 鍘熷疄鐜版槸 {@code void}锛岀紪鎺掑眰鐢�"璋冪敤浜嗗嚑娆�"褰撴垚鍔熸暟 鈥斺�� 閭ｆ槸閿欑殑
+ * 锛堜换鍔℃湭鍙戝竷/琚幓閲嶆椂鍚屾牱鏄�"鐢熸垚浜嗕竴鏉�"锛夈��
*/
- public boolean writeInSubTask(Long taskid, Boolean check, VisitInhospRow inhosp,
- VisitArchiveRow archive, Integer type, String config) {
- // 鍘� L683-685
+ public boolean writeInSubTask(Long taskid, Boolean check, VisitInhospRow inhosp, VisitArchiveRow archive, Integer type, String config) {
String longTaskReason = inhosp.getLongTaskReason();
String orgId = inhosp.getOrgid();
if (StringUtils.isEmpty(longTaskReason)) {
longTaskReason = "";
}
- // 鍘� L686-728锛氭煡"宸插彂甯冪殑闀挎湡浠诲姟"锛涙煡涓嶅埌鏃舵寜 type 鍐欎笉鍚岀殑鏍囧織浣嶅悗 return
+ // 鏌ヤ换鍔″垱寤烘ā鍧楃殑鏂规硶鏄惁鍙敤
VisitTaskCreateApi taskApi = taskCreateApi();
if (taskApi == null) {
- log.warn("銆愬嚭鍏ラ櫌闅忚銆慥isitTaskCreateApi 涓嶅彲鐢紙浠诲姟鍒涘缓妯″潡鏈閰嶏級锛屾湰鎮ｈ�呬笉鐢熸垚瀛愪换鍔°��"
- + "inhospid={}, taskid={}", inhosp.getInhospid(), taskid);
+ log.warn("銆愬嚭鍏ラ櫌闅忚銆慥isitTaskCreateApi 涓嶅彲鐢紙浠诲姟鍒涘缓妯″潡鏈閰嶏級锛屾湰鎮ｈ�呬笉鐢熸垚瀛愪换鍔°��" + "inhospid={}, taskid={}", inhosp.getInhospid(), taskid);
return false;
}
VisitLongTaskDto serviceTask = taskApi.findPublishedLongTask(taskid);
@@ -145,23 +152,19 @@
// 鎮ｈ�呰閲嶅鎵埌鏃朵細璧�"鍋滄棫 + 鍐� insert 涓�鏉� sendstate=4"鐨勫垎鏀紝
// 姣忚窇涓�杞涓�鏉★紝鏈�缁堝悓涓�鎮ｈ�呭嚑鍗佹潯銆�
// ------------------------------------------------------------------
- if (taskApi.existsSubtask(archive == null ? null : archive.getId(),
- inhosp.getInhospid(), taskid)) {
- log.info("銆愬嚭鍏ラ櫌闅忚銆戞偅鑰厈}鍑洪櫌璁板綍{}浠诲姟{}宸叉湁瀛愪换鍔★紝璺宠繃閲嶅鐢熸垚銆�",
- inhosp.getPatid(), inhosp.getInhospid(), taskid);
+ if (taskApi.existsSubtask(archive == null ? null : archive.getId(), inhosp.getInhospid(), taskid)) {
+ log.info("銆愬嚭鍏ラ櫌闅忚銆戞偅鑰厈}鍑洪櫌璁板綍{}浠诲姟{}宸叉湁瀛愪换鍔★紝璺宠繃閲嶅鐢熸垚銆�", inhosp.getPatid(), inhosp.getInhospid(), taskid);
writeFlagByType(inhosp.getInhospid(), type, "1", null);
return true;
}
- // 鍘� L732-736锛氱粍瑁咃紙鍓綔鐢ㄧ敱鏈被瀹炵幇锛岃 missingOutHospTime锛�
- VisitSubtaskDraft serviceSubtask = subtaskFactory.boxedServiceSubtask(
- toTaskSource(serviceTask, inhosp), inhosp, archive, config, type,
- row -> onMissingOutHospTime(row));
+ // serviceSubtask鏁版嵁缁勮锛堝壇浣滅敤鐢辨湰绫诲疄鐜帮紝瑙� missingOutHospTime锛�
+ VisitSubtaskDraft serviceSubtask = subtaskFactory.boxedServiceSubtask(toTaskSource(serviceTask, inhosp), inhosp, archive, config, type, row -> onMissingOutHospTime(row));
if (ObjectUtils.isEmpty(serviceSubtask)) {
return false;
}
- // 鍘� L737-753锛氬氨璇婄瀹�/鐥呭尯濉厖
+ // 灏辫瘖绉戝/鐥呭尯濉厖
if (type != null && type != 2) {
// 绉戝鍜岀柧鐥� 閮界敤 绉戝濉厖
if ("1".equals(inhosp.getInhospstate())) {
@@ -180,22 +183,19 @@
serviceSubtask.setVisitDeptName(inhosp.getLeavehospitaldistrictname());
}
- // 鍘� L754-755锛氳褰� insertServiceSubtask 鐨勮繑鍥炵姸鎬�
+ // 璁板綍 insertServiceSubtask 鐨勮繑鍥炵姸鎬�
int i = 0;
try {
- // 鍘� L757-758
- if (Boolean.TRUE.equals(check)
- && (serviceSubtask.getTaskSituation() == null || serviceSubtask.getTaskSituation() != 6)) {
- // 鍘� L759-764锛氭煡璇ユ偅鑰� + 璇� taskid 涓嬫墍鏈夊緟鎵ц瀛愪换鍔�
- List<VisitPendingSubtaskDto> pendingList =
- taskApi.findPendingSubtasks(archive.getId(), taskid);
+ if (Boolean.TRUE.equals(check) && (serviceSubtask.getTaskSituation() == null || serviceSubtask.getTaskSituation() != 6)) {
+ // 鏌ヨ鎮ｈ�� + 璇� taskid 涓嬫墍鏈夊緟鎵ц瀛愪换鍔�
+ List<VisitPendingSubtaskDto> pendingList = taskApi.findPendingSubtasks(archive.getId(), taskid);
if (pendingList != null && !pendingList.isEmpty()) {
for (VisitPendingSubtaskDto pending : pendingList) {
- // 鍘� L768-771锛氫笉鏄暱鏈熶换鍔★紝涓嶅鐞�
+ // 涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
if (pending.getLongSendTime() == null) {
continue;
}
- // 鍘� L772-773锛歵ype = 1鎴�2 琛ㄧず "绉戝銆佺梾鍖�"
+ //type = 1鎴�2 琛ㄧず "绉戝銆佺梾鍖�"
if (type != null && (type == 1 || type == 2)) {
Date endTime = serviceSubtask.getEndtime();
Date endTime1 = pending.getEndtime();
@@ -222,14 +222,12 @@
}
continue;
}
- // 鍘� L795-800锛氭櫙瀹� 鍑洪櫌棣栨锛�7澶╋級闅忚涓�瀹氳鍋�
+ //鏅畞 鍑洪櫌棣栨锛�7澶╋級闅忚涓�瀹氳鍋�
boolean firstVisit = ORG_JINGNING.equals(orgId);
if (!firstVisit) {
- // 鍘� L802-803
// 鈿狅笍 鍘熷疄鐜颁笉鍒� serviceType 鏄惁涓� null锛堜細 NPE锛夛紝鍘熸牱淇濈暀
- if (endTime1.before(endTime)
- && SERVICE_TYPE_DISCHARGE.equals(pending.getServiceType())) {
- // 鍘� L804-813锛氭妸寰幆鍒扮殑鏃у瓙浠诲姟鍋滄帀
+ if (endTime1.before(endTime) && SERVICE_TYPE_DISCHARGE.equals(pending.getServiceType())) {
+ // 鎶婂惊鐜埌鐨勬棫瀛愪换鍔″仠鎺�
pending.setSendstate(SENDSTATE_STOPPED);
if (StringUtils.isNotEmpty(serviceSubtask.getRemark())) {
serviceSubtask.setRemark(serviceSubtask.getRemark() + ",绉戝/鐥呭尯鎮ｈ�呭啀鍏ラ櫌");
@@ -243,12 +241,11 @@
i = 1;
}
} else {
- // 鍘� L814-824锛氱浉鍙嶏紝鍒欐妸"褰撳墠鐨�"鏁版嵁鍋滄帀锛堢疆 error + sendstate=4 鍚� insert锛�
+ //鐩稿弽锛屽垯鎶�"褰撳墠鐨�"鏁版嵁鍋滄帀锛堢疆 error + sendstate=4 鍚� insert锛�
serviceSubtask.setResult("error");
serviceSubtask.setSendstate(SENDSTATE_STOPPED);
if (StringUtils.isNotEmpty(serviceSubtask.getRemark())) {
- serviceSubtask.setRemark(serviceSubtask.getRemark()
- + ",褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
+ serviceSubtask.setRemark(serviceSubtask.getRemark() + ",褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
} else {
serviceSubtask.setRemark("褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
}
@@ -258,7 +255,7 @@
}
}
} else if (type != null && type == 3) {
- // 鍘� L826-841锛歵ype=3 鐤剧梾 鈥斺�� 鏃犳潯浠跺仠鏃� + 閲嶆柊鏂板
+ //type=3 鐤剧梾 鈥斺�� 鏃犳潯浠跺仠鏃� + 閲嶆柊鏂板
pending.setSendstate(SENDSTATE_STOPPED);
if (StringUtils.isNotEmpty(serviceSubtask.getRemark())) {
serviceSubtask.setRemark(serviceSubtask.getRemark() + ",鐤剧梾鎮ｈ�呭啀鍏ラ櫌");
@@ -276,7 +273,7 @@
}
}
} else {
- // 鍘� L844-856锛氭病鏈夊緟鎵ц浠诲姟
+ //娌℃湁寰呮墽琛屼换鍔�
markPhoneEmptyIfNeeded(serviceSubtask);
serviceSubtask.setCreateBy(serviceTask.getCreateBy());
serviceSubtask.setCreateTime(new Date());
@@ -284,13 +281,13 @@
addServiceSubtaskPreachform(serviceSubtask, null);
}
} else if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
- // 鍘� L857-862锛氳鎮ｈ�呰杩囨护锛屼笉鐢ㄦ墽琛�
+ // 璇ユ偅鑰呰杩囨护锛屼笉鐢ㄦ墽琛�
serviceSubtask.setCreateBy(serviceTask.getCreateBy());
serviceSubtask.setCreateTime(new Date());
serviceSubtask.setSendstate(SENDSTATE_STOPPED);
i = insert(taskApi, serviceSubtask) ? 1 : 0;
} else {
- // 鍘� L863-875锛氫笉闇�瑕佹牎楠岋紙check=false锛�
+ // 涓嶉渶瑕佹牎楠岋紙check=false锛�
markPhoneEmptyIfNeeded(serviceSubtask);
serviceSubtask.setCreateBy(serviceTask.getCreateBy());
serviceSubtask.setCreateTime(new Date());
@@ -298,19 +295,17 @@
addServiceSubtaskPreachform(serviceSubtask, null);
}
- // 鍘� L877-899锛氭妸 check_flag 鏀规垚 1锛堝凡澶勭悊锛�/ 鐢熸垚澶辫触缃� 2
+ //鎶� check_flag 鏀规垚 1锛堝凡澶勭悊锛�/ 鐢熸垚澶辫触缃� 2
if (i == 1) {
writeFlagByType(inhosp.getInhospid(), type, "1", null);
} else {
- log.info("鐢熸垚瀛愪换鍔″け璐erviceSubtask鐨則askid涓猴細{},patid涓猴細{}",
- serviceSubtask.getTaskid(), serviceSubtask.getPatid());
+ log.info("鐢熸垚瀛愪换鍔″け璐erviceSubtask鐨則askid涓猴細{},patid涓猴細{}", serviceSubtask.getTaskid(), serviceSubtask.getPatid());
writeFlagByType(inhosp.getInhospid(), type, "2", "鐢熸垚瀛愪换鍔″け璐� " + type);
}
return i == 1;
} catch (Exception e) {
- // 鍘� L900-912锛氬嚭閿欏洖婊氫簨鍔�
- log.info("鐢熸垚瀛愪换鍔℃姤閿欏洖婊歴erviceSubtask鐨則askid涓猴細{},patid涓猴細{}",
- serviceSubtask.getTaskid(), serviceSubtask.getPatid());
+ // 鍑洪敊鍥炴粴浜嬪姟
+ log.info("鐢熸垚瀛愪换鍔℃姤閿欏洖婊歴erviceSubtask鐨則askid涓猴細{},patid涓猴細{}", serviceSubtask.getTaskid(), serviceSubtask.getPatid());
// 鈿狅笍 鍘熷疄鐜扮殑 catch 鍙鐞� type 1/2/3/0 鈥斺�� type=4/5 鎶涘紓甯告椂涓嶅洖鍐欎换浣曟爣蹇椾綅銆�
// 鍘熸牱淇濈暀锛堣绫绘敞閲婄 1 鏉★級銆�
writeFlagByTypeForRollback(inhosp.getInhospid(), type, "2", "鐢熸垚瀛愪换鍔℃姤閿欏洖婊� " + type);
@@ -319,10 +314,7 @@
}
}
- // ==========================================================================
- // 鍘� L691-725锛氫换鍔′笉瀛樺湪鏃舵寜 type 鍐欐爣蹇椾綅
- // ==========================================================================
-
+ // 浠诲姟涓嶅瓨鍦ㄦ椂鎸� type 鍐欐爣蹇椾綅
private void writeMissingTaskFlag(VisitInhospRow inhosp, Integer type, String longTaskReason, Long taskid) {
if (type == null) {
return;
@@ -331,42 +323,31 @@
switch (type) {
case 0:
log.info("璇ユ偅鑰呰嵂鍝佸鏁欓暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓猴細{}", taskid);
- flagWriter.setFlagWithReason(inhosp.getInhospid(), "medcheck_flag", "2",
- longTaskReason + " & 璇ユ偅鑰呰嵂鍝佸鏁欓暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+ flagWriter.setFlagWithReason(inhosp.getInhospid(), "medcheck_flag", "2", longTaskReason + " & 璇ユ偅鑰呰嵂鍝佸鏁欓暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
return;
case 1:
log.info("璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓猴細{}", taskid);
- flagWriter.setFlagWithReason(inhosp.getInhospid(), "deptcheck_flag", "2",
- longTaskReason + " & 璇ユ偅鑰呯闄㈢瀹ら暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+ flagWriter.setFlagWithReason(inhosp.getInhospid(), "deptcheck_flag", "2", longTaskReason + " & 璇ユ偅鑰呯闄㈢瀹ら暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
return;
case 2:
- flagWriter.setFlagWithReason(inhosp.getInhospid(), "wardcheck_flag", "2",
- longTaskReason + " & 璇ユ偅鑰呯闄㈢梾鍖洪暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+ flagWriter.setFlagWithReason(inhosp.getInhospid(), "wardcheck_flag", "2", longTaskReason + " & 璇ユ偅鑰呯闄㈢梾鍖洪暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
return;
case 3:
- flagWriter.setFlagWithReason(inhosp.getInhospid(), "diagcheck_flag", "2",
- longTaskReason + " & 璇ユ偅鑰呯柧鐥呴暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+ flagWriter.setFlagWithReason(inhosp.getInhospid(), "diagcheck_flag", "2", longTaskReason + " & 璇ユ偅鑰呯柧鐥呴暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
return;
case 4:
- flagWriter.setFlagWithReason(inhosp.getInhospid(), "in_deptcheck_flag", "2",
- longTaskReason + " & 璇ユ偅鑰呭叆闄㈢瀹ら暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+ flagWriter.setFlagWithReason(inhosp.getInhospid(), "in_deptcheck_flag", "2", longTaskReason + " & 璇ユ偅鑰呭叆闄㈢瀹ら暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
return;
case 5:
- flagWriter.setFlagWithReason(inhosp.getInhospid(), "in_wardcheck_flag", "2",
- longTaskReason + " & 璇ユ偅鑰呭叆闄㈢梾鍖洪暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+ flagWriter.setFlagWithReason(inhosp.getInhospid(), "in_wardcheck_flag", "2", longTaskReason + " & 璇ユ偅鑰呭叆闄㈢梾鍖洪暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
return;
default:
// 鍘熷疄鐜帮細type 涓嶅睘浜� 0-5 鏃讹紝if/else-if 閾惧叏閮ㄤ笉鍛戒腑 鈫� 浠�涔堥兘涓嶅仛銆佷篃涓� return
// 鈫� 缁х画寰�涓嬭蛋锛屾鏃� serviceTask 浠嶆槸 null锛屽埌 L729 涔嬪悗浼� NPE銆�
// 杩欓噷銆愪笉澶嶅埗銆戦偅涓� NPE锛堝畠鍙細鎺╃洊闂锛夛紝鏀逛负璁板綍骞惰繑鍥炪��
- log.warn("銆愬嚭鍏ラ櫌闅忚銆戜换鍔′笉瀛樺湪涓� type={} 涓嶅睘浜� 0-5锛屾棤娉曞垽瀹氬洖鍐欏摢涓爣蹇椾綅銆�"
- + "inhospid={}, taskid={}", type, inhosp.getInhospid(), taskid);
+ log.warn("銆愬嚭鍏ラ櫌闅忚銆戜换鍔′笉瀛樺湪涓� type={} 涓嶅睘浜� 0-5锛屾棤娉曞垽瀹氬洖鍐欏摢涓爣蹇椾綅銆�" + "inhospid={}, taskid={}", type, inhosp.getInhospid(), taskid);
}
}
-
- // ==========================================================================
- // 鍘� L877-912锛氭爣蹇椾綅鍥炲啓锛堟垚鍔� / 澶辫触 / 寮傚父鍥炴粴锛�
- // ==========================================================================
/**
* type 鈫� 鏍囧織浣嶅洖鍐欍��<b>鐓ф妱鍘� L881-885 涓� L892-896 鐨勫垎鏀�</b>銆�
@@ -450,12 +431,8 @@
flagWriter.setFlagWithRemark(inhospid, column, flagValue, remark);
}
- // ==========================================================================
- // 杈呭姪
- // ==========================================================================
-
/**
- * 鍘� L845-851 / L864-870锛氭墜鏈哄彿涓虹┖鏃惰拷鍔犲娉ㄣ�佺疆 sendstate=4銆乺esult=error銆�
+ * 鎵嬫満鍙蜂负绌烘椂杩藉姞澶囨敞銆佺疆 sendstate=4銆乺esult=error銆�
*/
private void markPhoneEmptyIfNeeded(VisitSubtaskDraft d) {
if (StringUtils.isEmpty(d.getPhone())) {
@@ -480,9 +457,7 @@
*/
private void onMissingOutHospTime(VisitInhospRow row) {
flagWriter.setFlag(row.getInhospid(), "deptcheck_flag", "2");
- flagWriter.setFlagWithRemark(row.getInhospid(), "deptcheck_flag", "2",
- (row.getRemark() == null ? "" : row.getRemark())
- + "& 璇ユ偅鑰呯柧鐥呭嚭闄㈡椂闂翠负绌�,鍑洪櫌璁板綍ID涓�:" + row.getInhospid());
+ flagWriter.setFlagWithRemark(row.getInhospid(), "deptcheck_flag", "2", (row.getRemark() == null ? "" : row.getRemark()) + "& 璇ユ偅鑰呯柧鐥呭嚭闄㈡椂闂翠负绌�,鍑洪櫌璁板綍ID涓�:" + row.getInhospid());
}
/**
@@ -495,8 +470,7 @@
* 鈿狅笍 {@code type / sendDay / updateBy / createBy / serviceType / preachform} 绛�
* 閮藉湪 {@link VisitLongTaskDto} 閲屾湁瀵瑰簲瀛楁锛岀洿鎺ユ惉銆�
*/
- private com.ruoyi.inhospvisit.domain.row.VisitTaskRow toTaskSource(VisitLongTaskDto dto,
- VisitInhospRow inhosp) {
+ private com.ruoyi.inhospvisit.domain.row.VisitTaskRow toTaskSource(VisitLongTaskDto dto, VisitInhospRow inhosp) {
com.ruoyi.inhospvisit.domain.row.VisitTaskRow t = new com.ruoyi.inhospvisit.domain.row.VisitTaskRow();
t.setTaskid(dto.getTaskid());
t.setTaskName(dto.getTaskName());
@@ -560,16 +534,14 @@
try {
SubtaskPreachformWriter writer = preachformWriterProvider.stream().findFirst().orElse(null);
if (writer == null) {
- log.warn("銆愬嚭鍏ラ櫌闅忚銆慡ubtaskPreachformWriter 鏈閰嶏紝璺宠繃鎵ц鏂瑰紡鏄庣粏鍐欏叆銆俿ubtaskId={}",
- subtask.getId());
+ log.warn("銆愬嚭鍏ラ櫌闅忚銆慡ubtaskPreachformWriter 鏈閰嶏紝璺宠繃鎵ц鏂瑰紡鏄庣粏鍐欏叆銆俿ubtaskId={}", subtask.getId());
return;
}
writer.addServiceSubtaskPreachform(subtask, sendstate);
} catch (Exception e) {
// 杩欎竴姝ュけ璐ヤ笉搴斿奖鍝嶄富娴佺▼锛堝師瀹炵幇鍦ㄥ悓涓�涓� try 閲岋紝澶辫触浼氳蛋 catch 鍥炴粴鏍囧織浣嶏紱
// 浣嗛偅鏄洜涓哄畠涓� insert 鍚屽睘涓�娆′簨鍔°�傝繖閲屾媶寮�鍚庢寜"灏藉姏鑰屼负"澶勭悊骞惰褰曪級
- log.warn("銆愬嚭鍏ラ櫌闅忚銆戝啓鎵ц鏂瑰紡鏄庣粏澶辫触锛屽凡蹇界暐銆俿ubtaskId={}锛屽師鍥�={}",
- subtask.getId(), e.toString());
+ log.warn("銆愬嚭鍏ラ櫌闅忚銆戝啓鎵ц鏂瑰紡鏄庣粏澶辫触锛屽凡蹇界暐銆俿ubtaskId={}锛屽師鍥�={}", subtask.getId(), e.toString());
}
}
--
Gitblit v1.9.3