From 2ed0ca8b57481a2c647d163380a3ff4997fd2f35 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 17 十二月 2025 10:17:48 +0800
Subject: [PATCH] 【丽水】首页查询出、入院看病人次和人数，出院服务量分为首次服务、再次服务、专病服务
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 253 ++++++++++++++++++++++++++++++--------------------
1 files changed, 151 insertions(+), 102 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 27de461..fd3b395 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -16,7 +16,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import java.io.IOException;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.*;
@@ -544,30 +546,36 @@
st.setTaskid(taskid);
st.setSendState(2L);
List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
- if (CollectionUtils.isEmpty(serviceTasks) && type == 1) {
- log.info("璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓猴細{}", taskid);
- patMedInhosp1.setDeptcheckFlag("2");
- patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呯闄㈢瀹ら暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
- return;
- } else if (CollectionUtils.isEmpty(serviceTasks) && type == 2) {
- patMedInhosp1.setWardcheckFlag("2");
- patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呯闄㈢梾鍖洪暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
- return;
- } else if (CollectionUtils.isEmpty(serviceTasks) && type == 3) {
- patMedInhosp1.setDiagcheckFlag("2");
- patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呯柧鐥呴暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
- return;
+ ServiceTask serviceTask = null;
+ if(CollectionUtils.isEmpty(serviceTasks)){
+ if (type == 1) {
+ log.info("璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓猴細{}", taskid);
+ patMedInhosp1.setDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呯闄㈢瀹ら暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ return;
+ } else if (type == 2) {
+ patMedInhosp1.setWardcheckFlag("2");
+ patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呯闄㈢梾鍖洪暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ return;
+ } else if (type == 3) {
+ patMedInhosp1.setDiagcheckFlag("2");
+ patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呯柧鐥呴暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ return;
+ }
+ }else {
+ serviceTask = serviceTasks.get(0);
}
- ServiceTask serviceTask = serviceTasks.get(0);
-
if (Objects.isNull(patMedInhosp1.getEndtime())) {
return;
}
//灏佽serviceSubtask
ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive, config);
+ if(ObjectUtils.isEmpty(serviceSubtask)){
+ return;
+ }
if (type != 2) {
//绉戝鍜岀柧鐥� 閮界敤 绉戝濉厖
serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeaveldeptcode());
@@ -576,68 +584,105 @@
serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
serviceSubtask.setVisitDeptName(patMedInhosp1.getLeavehospitaldistrictname());
}
-
-
+ //璁板綍insertServiceSubtask璇彞杩斿洖鐘舵��
Integer i = 0;
- //鍏堝垽鏂竴涓嬶紝鏄惁闇�瑕佹牎楠�
- if (check && serviceSubtask.getTaskSituation() != 6) {
- //鍦ㄦ柊澧炰箣鍓嶏紝鍏堥�氳繃鎮ｈ�匢D锛宻endstate=2鏌ヨ涓�涓嬶紝鍦ㄦ墍鏈夐暱鏈熶换鍔′腑锛屾槸涓嶆槸杩樻湁璇ユ偅鑰呭緟鎵ц鐨勪换鍔★紝鏈夌殑璇�,姣旇緝涔嬪墠鐨別ndtime鏄惁灏忎簬褰撳墠鐨別ndtaime,濡傛灉涔嬪墠鐨勫皬浜庣幇鍦ㄧ殑锛屽垯鐩存帴灏嗕箣鍓嶇殑鍋滄帀锛堝師鍥犲啀鍏ラ櫌锛�
- ServiceSubtaskVO subtask = new ServiceSubtaskVO();
- subtask.setPatid(patArchive.getId());
- subtask.setSendstate(2L);
- subtask.setTaskid(taskid);
- List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
- log.info("璇ユ偅鑰呭緟鎵ц鐨勪换鍔�:{}", CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.size() : null);
- if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
- for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
- if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
- //涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
- continue;
- }
- //type = 1鎴�2 琛ㄧず 鈥濈瀹ゃ�佺梾鍖衡��
- if (type == 1 || type == 2) {
- if (serviceSubtask1.getEndtime().before(serviceSubtask.getEndtime()) && serviceSubtask1.getServiceType().equals("2")) {
- //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
+ try {
+ //鍏堝垽鏂竴涓嬶紝鏄惁闇�瑕佹牎楠�
+ if (check && (Objects.isNull(serviceSubtask.getTaskSituation()) || serviceSubtask.getTaskSituation() != 6)) {
+ //鍦ㄦ柊澧炰箣鍓嶏紝鍏堥�氳繃鎮ｈ�匢D锛宻endstate=2鏌ヨ涓�涓嬶紝鍦ㄦ墍鏈夐暱鏈熶换鍔′腑锛屾槸涓嶆槸杩樻湁璇ユ偅鑰呭緟鎵ц鐨勪换鍔★紝鏈夌殑璇�,姣旇緝涔嬪墠鐨別ndtime鏄惁灏忎簬褰撳墠鐨別ndtaime,濡傛灉涔嬪墠鐨勫皬浜庣幇鍦ㄧ殑锛屽垯鐩存帴灏嗕箣鍓嶇殑鍋滄帀锛堝師鍥犲啀鍏ラ櫌锛�
+ ServiceSubtaskVO subtask = new ServiceSubtaskVO();
+ subtask.setPatid(patArchive.getId());
+ subtask.setSendstate(2L);
+ subtask.setTaskid(taskid);
+ List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
+ log.info("璇ユ偅鑰呭緟鎵ц鐨勪换鍔�:{}", CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.size() : null);
+ if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
+ for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
+ if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
+ //涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
+ continue;
+ }
+ //type = 1鎴�2 琛ㄧず 鈥濈瀹ゃ�佺梾鍖衡��
+ if (type == 1 || type == 2) {
+ Date endTime = serviceSubtask.getEndtime();
+ Date endTime1 = serviceSubtask1.getEndtime();
+ //鍑洪櫌鏃堕棿鍒ょ┖锛屽鏋滀负绌鸿烦杩�
+ if(ObjectUtils.isEmpty(endTime)){
+ serviceSubtask.setResult("error");
+ serviceSubtask.setRemark("鍑洪櫌鏃堕棿涓虹┖锛宻erviceSubtask鐨処d涓�" + serviceSubtask.getId());
+ serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
+ serviceSubtask.setUpdateTime(new Date());
+ Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+ if (aBoolean) i = 1;
+ continue;
+ }
+ if(ObjectUtils.isEmpty(endTime1)){
+ serviceSubtask1.setResult("error");
+ serviceSubtask1.setRemark("鍑洪櫌鏃堕棿涓虹┖锛宻erviceSubtask鐨処d涓�" + serviceSubtask1.getId());
+ serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
+ serviceSubtask1.setUpdateTime(new Date());
+ Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ if (aBoolean) i = 1;
+ continue;
+ }
+ if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")) {
+ //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
+ serviceSubtask1.setSendstate(4L);
+ if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
+ serviceSubtask.setRemark(serviceSubtask.getRemark() + ",绉戝/鐥呭尯鎮ｈ�呭啀鍏ラ櫌");
+ else serviceSubtask.setRemark("绉戝/鐥呭尯鎮ｈ�呭啀鍏ラ櫌");
+ serviceSubtask1.setResult("error");
+ serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
+ serviceSubtask1.setUpdateTime(new Date());
+ Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ if (aBoolean) i = 1;
+ } else {
+ //鐩稿弽,鍒欏皢褰撴湁鐨勬暟鎹仠鎺�
+ serviceSubtask.setResult("error");
+ serviceSubtask.setSendstate(4L);
+ if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
+ serviceSubtask.setRemark(serviceSubtask.getRemark() + ",褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
+ else serviceSubtask.setRemark("褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
+ serviceSubtask.setCreateBy(serviceTask.getCreateBy());
+ serviceSubtask.setCreateTime(new Date());
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ }
+ } else if (type == 3) {
+ //type=3 琛ㄧず鐤剧梾
+ //灏嗕箣鍓嶇殑鍋滄帀
serviceSubtask1.setSendstate(4L);
if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
serviceSubtask.setRemark(serviceSubtask.getRemark() + ",鐤剧梾鎮ｈ�呭啀鍏ラ櫌");
else serviceSubtask.setRemark("鐤剧梾鎮ｈ�呭啀鍏ラ櫌");
serviceSubtask1.setResult("error");
-// serviceSubtask1.setFinishtime(new Date());
- serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
- serviceSubtask1.setUpdateTime(new Date());
- Boolean aBoolean = serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
- if (aBoolean) i = 1;
- } else {
- //鐩稿弽,鍒欏皢褰撴湁鐨勬暟鎹仠鎺�
- serviceSubtask.setResult("error");
-// serviceSubtask.setFinishtime(new Date());
- serviceSubtask.setSendstate(4L);
- if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
- serviceSubtask.setRemark(serviceSubtask.getRemark() + ",褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
- else serviceSubtask.setRemark("褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
- serviceSubtask.setCreateBy(serviceTask.getCreateBy());
- serviceSubtask.setCreateTime(new Date());
- i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
- }
- } else if (type == 3) {
- //type=3 琛ㄧず鐤剧梾
- //灏嗕箣鍓嶇殑鍋滄帀
- serviceSubtask1.setSendstate(4L);
- if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
- serviceSubtask.setRemark(serviceSubtask.getRemark() + ",鐤剧梾鎮ｈ�呭啀鍏ラ櫌");
- else serviceSubtask.setRemark("鐤剧梾鎮ｈ�呭啀鍏ラ櫌");
- serviceSubtask1.setResult("error");
// serviceSubtask1.setFinishtime(new Date());
- serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
- serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
- //閲嶆柊鏂板瀛愪换鍔�
- i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
- //杩欓噷闇�瑕佸叏澶辫触
- addServiceSubtaskPreachform(serviceSubtask, "5");
+ serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ //閲嶆柊鏂板瀛愪换鍔�
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ //杩欓噷闇�瑕佸叏澶辫触
+ addServiceSubtaskPreachform(serviceSubtask, "5");
+ }
}
+ } else {
+ if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
+ if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
+ serviceSubtask.setRemark(serviceSubtask.getRemark() + ",鎵嬫満鍙蜂负绌�");
+ else 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 (serviceSubtask.getTaskSituation() == 6) {
+ //璇存槑璇ユ偅鑰呮槸琚繃婊ょ殑锛屼笉鐢ㄥ啀鎵ц浜�
+ serviceSubtask.setCreateBy(serviceTask.getCreateBy());
+ serviceSubtask.setCreateTime(new Date());
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
} else {
if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
@@ -651,43 +696,37 @@
i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
addServiceSubtaskPreachform(serviceSubtask, null);
}
- } else if (serviceSubtask.getTaskSituation() == 6) {
- //璇存槑璇ユ偅鑰呮槸琚繃婊ょ殑锛屼笉鐢ㄥ啀鎵ц浜�
- serviceSubtask.setCreateBy(serviceTask.getCreateBy());
- serviceSubtask.setCreateTime(new Date());
- i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
- } else {
- if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
- if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
- serviceSubtask.setRemark(serviceSubtask.getRemark() + ",鎵嬫満鍙蜂负绌�");
- else serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
- serviceSubtask.setSendstate(4L);
- serviceSubtask.setResult("error");
- }
- serviceSubtask.setCreateBy(serviceTask.getCreateBy());
- serviceSubtask.setCreateTime(new Date());
- i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
- addServiceSubtaskPreachform(serviceSubtask, null);
- }
- if (i == 1) {
- //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
- PatMedInhosp patMedInhosp2 = new PatMedInhosp();
- patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
- if (type == 1) patMedInhosp2.setDeptcheckFlag("1");
- if (type == 2) patMedInhosp2.setWardcheckFlag("1");
- if (type == 3) patMedInhosp2.setDiagcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
- } else {
- //鐢熸垚瀛愪换鍔″け璐ワ紝
- log.info("鐢熸垚瀛愪换鍔″け璐erviceSubtask鐨則askid涓猴細{},patid涓猴細{}", serviceSubtask.getTaskid(), serviceSubtask.getPatid());
+ //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
+ if(i == 1){
+ PatMedInhosp patMedInhosp2 = new PatMedInhosp();
+ patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
+ if (type == 1) patMedInhosp2.setDeptcheckFlag("1");
+ if (type == 2) patMedInhosp2.setWardcheckFlag("1");
+ if (type == 3) patMedInhosp2.setDiagcheckFlag("1");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
+ }else {
+ //鐢熸垚瀛愪换鍔″け璐ワ紝
+ log.info("鐢熸垚瀛愪换鍔″け璐erviceSubtask鐨則askid涓猴細{},patid涓猴細{}", serviceSubtask.getTaskid(), serviceSubtask.getPatid());
+ PatMedInhosp patMedInhosp2 = new PatMedInhosp();
+ patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
+ if (type == 1) patMedInhosp2.setDeptcheckFlag("2");
+ if (type == 2) patMedInhosp2.setWardcheckFlag("2");
+ if (type == 3) patMedInhosp2.setDiagcheckFlag("2");
+ patMedInhosp2.setRemark("鐢熸垚瀛愪换鍔″け璐� " + type);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
+ }
+ } catch (Exception e) {
+ //鍑洪敊鍥炴粴浜嬪姟
+ log.info("鐢熸垚瀛愪换鍔℃姤閿欏洖婊歴erviceSubtask鐨則askid涓猴細{},patid涓猴細{}", serviceSubtask.getTaskid(), serviceSubtask.getPatid());
PatMedInhosp patMedInhosp2 = new PatMedInhosp();
patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
if (type == 1) patMedInhosp2.setDeptcheckFlag("2");
if (type == 2) patMedInhosp2.setWardcheckFlag("2");
if (type == 3) patMedInhosp2.setDiagcheckFlag("2");
- patMedInhosp2.setRemark("鐢熸垚瀛愪换鍔″け璐� " + type);
+ patMedInhosp2.setRemark("鐢熸垚瀛愪换鍔℃姤閿欏洖婊� " + type);
patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
+ e.printStackTrace();
}
}
@@ -729,6 +768,10 @@
//灏佽serviceSubtask
private ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedInhosp patMedInhosp1, PatArchive patArchive, String config) {
+ //澧炲姞serviceTask鍒ょ┖
+// if(Objects.isNull(serviceTask)){
+// return null;
+// }
ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
serviceSubtask.setTaskid(serviceTask.getTaskid());
if (StringUtils.isNotEmpty(serviceTask.getLibtemplateid()))
@@ -777,10 +820,15 @@
}
serviceSubtask.setLongSendTime(newDate);
serviceSubtask.setVisitTime(newDate);
+
if (patMedInhosp1.getFudate() != null) serviceSubtask.setVisitTime(patMedInhosp1.getFudate());
//濡傛灉鏄�氱煡鐨勮瘽锛岄渶瑕佹彁鍓嶅嚑澶╁皢閫氳繃鐭俊鍙戝嚭鍘伙紙鍏蜂綋鍑犲ぉ锛岃繖涓彲浠ラ厤缃湪sys_conf琛ㄤ腑锛�
if ("3".equals(serviceTask.getType())) {
serviceSubtask.setVisitTime(minusDay(newDate, StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
+ //鍒ゆ柇鏄笉鏄櫙瀹�
+ if (patMedInhosp1.getOrgid().equals("47255004333112711A1001"))
+ serviceSubtask.setVisitTime(null);
+
//濡傛灉璇ュ嚭闄㈣褰曟湁闅忚鏃堕棿锛屽垯鐢ㄤ粬鑷繁鐨勯殢璁挎椂闂�
if (patMedInhosp1.getFudate() != null)
serviceSubtask.setVisitTime(minusDay(patMedInhosp1.getFudate(), StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
@@ -826,7 +874,7 @@
subtask.setSendstate(2L);
List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
// log.error("鍏ラ櫌鐨勬偅鑰呭緟鎵ц鐨勪换鍔�:{}", selectServiceSubtaskList);
- if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
+ if (CollectionUtils.isNotEmpty(selectServiceSubtaskList)) {
for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
//涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
@@ -844,7 +892,8 @@
}
}
//灏嗘偅鍏ョ殑鍏ラ櫌鏁版嵁璁剧疆涓哄凡澶勭悊
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ //鏇存柊鐘舵�佸�� patMedInhosp1.setDeptcheckFlag("0");
+ //patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
} catch (Exception e) {
log.error("鍏ラ櫌鏁版嵁淇℃伅鍑哄紓甯镐簡锛歿},{}", patMedInhosp1, e.getMessage());
}
--
Gitblit v1.9.3