From 8114cd50c016dd4de2c650fe006226defb4bbb8c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 30 十二月 2025 10:57:19 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 73 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 37 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 4a6b037..605dd8a 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -557,7 +557,7 @@
st.setSendState(2L);
List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
ServiceTask serviceTask = null;
- if(CollectionUtils.isEmpty(serviceTasks)){
+ if (CollectionUtils.isEmpty(serviceTasks)) {
if (type == 1) {
log.info("璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓猴細{}", taskid);
patMedInhosp1.setDeptcheckFlag("2");
@@ -575,7 +575,7 @@
patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
return;
}
- }else {
+ } else {
serviceTask = serviceTasks.get(0);
}
if (Objects.isNull(patMedInhosp1.getEndtime())) {
@@ -583,7 +583,7 @@
}
//灏佽serviceSubtask
ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive, config);
- if(ObjectUtils.isEmpty(serviceSubtask)){
+ if (ObjectUtils.isEmpty(serviceSubtask)) {
return;
}
if (type != 2) {
@@ -617,7 +617,7 @@
Date endTime = serviceSubtask.getEndtime();
Date endTime1 = serviceSubtask1.getEndtime();
//鍑洪櫌鏃堕棿鍒ょ┖锛屽鏋滀负绌鸿烦杩�
- if(ObjectUtils.isEmpty(endTime)){
+ if (ObjectUtils.isEmpty(endTime)) {
serviceSubtask.setResult("error");
serviceSubtask.setRemark("鍑洪櫌鏃堕棿涓虹┖锛宻erviceSubtask鐨処d涓�" + serviceSubtask.getId());
serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
@@ -626,7 +626,7 @@
if (aBoolean) i = 1;
continue;
}
- if(ObjectUtils.isEmpty(endTime1)){
+ if (ObjectUtils.isEmpty(endTime1)) {
serviceSubtask1.setResult("error");
serviceSubtask1.setRemark("鍑洪櫌鏃堕棿涓虹┖锛宻erviceSubtask鐨処d涓�" + serviceSubtask1.getId());
serviceSubtask1.setUpdateBy(serviceTask.getUpdateBy());
@@ -638,32 +638,33 @@
//鍐嶅叆闄㈤�昏緫
//鏅畞 鍑洪櫌棣栨锛�7澶╋級闅忚涓�瀹氳鍋�
boolean firstVisit = false;
- if (orgId.equals("47255004333112711A1001")
- && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1){
+ if (orgId.equals("47255004333112711A1001") && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
firstVisit = true;
}
- if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")
- && !firstVisit) {
- //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
- 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);
+ if (!firstVisit) {
+ //鏅畞鐨勪笉闇�瑕佸皢涔嬪墠鐨勪换鍔″仠鎺夛紝鍏ㄧ敓鎴�
+ 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 琛ㄧず鐤剧梾
@@ -716,14 +717,14 @@
}
//灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
- if(i == 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 {
+ } else {
//鐢熸垚瀛愪换鍔″け璐ワ紝
log.info("鐢熸垚瀛愪换鍔″け璐erviceSubtask鐨則askid涓猴細{},patid涓猴細{}", serviceSubtask.getTaskid(), serviceSubtask.getPatid());
PatMedInhosp patMedInhosp2 = new PatMedInhosp();
@@ -844,13 +845,11 @@
if ("3".equals(serviceTask.getType())) {
serviceSubtask.setVisitTime(minusDay(newDate, StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
//濡傛灉璇ュ嚭闄㈣褰曟湁闅忚鏃堕棿锛屽垯鐢ㄤ粬鑷繁鐨勯殢璁挎椂闂�
- if (patMedInhosp1.getFudate() != null){
- serviceSubtask.setVisitTime(minusDay(patMedInhosp1.getFudate(),
- StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
- }else{
+ if (patMedInhosp1.getFudate() != null) {
+ serviceSubtask.setVisitTime(minusDay(patMedInhosp1.getFudate(), StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
+ } else {
//鍒ゆ柇鏄笉鏄櫙瀹�
- if (patMedInhosp1.getOrgid().equals("47255004333112711A1001"))
- {
+ if (patMedInhosp1.getOrgid().equals("47255004333112711A1001")) {
serviceSubtask.setVisitTime(null);
//涓嶆墽琛�
serviceSubtask.setSendstate(4L);
--
Gitblit v1.9.3