From ad53e4af4e4e238453d7613530b501540df915e1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 10 十一月 2025 19:12:24 +0800
Subject: [PATCH] 长期任务，BUG处理
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 7e34d50..2bb0a19 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -51,8 +51,9 @@
@Autowired
private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
- @Value("${visitHosp}")
- private Integer visitHosp;
+ @Value("${spring.profiles.active}")
+ private String active;
+
/**
* 鏌ヨ鎮ｈ�呬綇闄㈣褰�
@@ -63,6 +64,11 @@
@Override
public PatMedInhosp selectPatMedInhospByInhospid(Long inhospid) {
return patMedInhospMapper.selectPatMedInhospByInhospid(inhospid);
+ }
+
+ @Override
+ public List<PatMedInhosp> selectPatMedInhosp(PatMedInhosp patMedInhosp) {
+ return patMedInhospMapper.selectPatMedInhosp(patMedInhosp);
}
/**
@@ -260,8 +266,7 @@
}
//鏍规嵁鎮ｈ�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
- if (visitHosp != 1) {
-
+ if (!active.equals("xh")) {
PatMedInhosp pmbq = new PatMedInhosp();
//鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
pmbq.setWardcheckFlag("0");
@@ -561,6 +566,10 @@
return;
}
ServiceTask serviceTask = serviceTasks.get(0);
+
+ if (Objects.isNull(patMedInhosp1.getEndtime())) {
+ return;
+ }
//灏佽serviceSubtask
ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive);
if (type != 2) {
@@ -627,8 +636,23 @@
}
}
+ } else {
+ if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
+ serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setResult("error");
+ }
+ serviceSubtask.setCreateBy(serviceTask.getCreateBy());
+ serviceSubtask.setCreateTime(new Date());
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ addServiceSubtaskPreachform(serviceSubtask, null);
}
} else {
+ if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
+ serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setResult("error");
+ }
serviceSubtask.setCreateBy(serviceTask.getCreateBy());
serviceSubtask.setCreateTime(new Date());
i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
@@ -657,13 +681,15 @@
}
private Integer addServiceSubtaskPreachform(ServiceSubtask serviceSubtask, String sendstate) {
- //灏唒reachform鐨刯son瀵硅薄锛屾斁鍒發ist闆嗗悎涓�
- String preachform = serviceSubtask.getPreachform();
+ //灏唒reachformDesc鐨刯son瀵硅薄锛屾斁鍒發ist闆嗗悎涓�
+ ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+ String preachformDesc = serviceTask.getPreachformDesc();
+
ObjectMapper objectMapper = new ObjectMapper();
- if (org.apache.commons.lang3.StringUtils.isNotEmpty(preachform)) {
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(preachformDesc)) {
List<ServiceSubtaskPreachform> serviceSubtaskPreachformList = null;
try {
- serviceSubtaskPreachformList = objectMapper.readValue(preachform, new TypeReference<List<ServiceSubtaskPreachform>>() {
+ serviceSubtaskPreachformList = objectMapper.readValue(preachformDesc, new TypeReference<List<ServiceSubtaskPreachform>>() {
});
} catch (JsonProcessingException e) {
log.error("preachform杞琇ist<ServiceSubtaskPreachform>鎶ラ敊浜嗭細{}", e.getMessage());
@@ -676,8 +702,7 @@
if (StringUtils.isNotEmpty(sendstate)) serviceSubtaskPreachform.setSendstate(sendstate);
serviceSubtaskPreachform.setOrgid(serviceSubtask.getOrgid());
- return serviceSubtaskPreachformMapper.insertServiceSubtaskPreachform(serviceSubtaskPreachform);
-
+ serviceSubtaskPreachformMapper.insertServiceSubtaskPreachform(serviceSubtaskPreachform);
}
}
@@ -727,7 +752,13 @@
serviceSubtask.setUpdateTime(new Date());
//璁剧疆鍙戦�佹椂闂�
if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
- Date newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());
+ Date newDate = null;
+ if (!Objects.isNull(patMedInhosp1.getEndtime())) {
+ newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());
+ } else {
+ //濡傛灉鍑洪櫌鏃堕棿涓虹┖锛屽垯杩斿洖涓�涓柊瀵硅薄
+ return new ServiceSubtask();
+ }
serviceSubtask.setLongSendTime(newDate);
serviceSubtask.setVisitTime(newDate);
//濡傛灉鏄�氱煡鐨勮瘽锛岄渶瑕佹彁鍓嶅嚑澶╁皢閫氳繃鐭俊鍙戝嚭鍘伙紙鍏蜂綋鍑犲ぉ锛岃繖涓彲浠ラ厤缃湪sys_conf琛ㄤ腑锛�
--
Gitblit v1.9.3