From b058875036ee856b20f0fae98d292a82bf2157e2 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 27 二月 2026 09:22:51 +0800
Subject: [PATCH] 【丽水】增加注释
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 168 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 124 insertions(+), 44 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..aa20bd1 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -253,8 +253,8 @@
for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config);
}
- patMedInhosp1.setDeptcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+// patMedInhosp1.setDeptcheckFlag("1");
+// patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
}
} catch (Exception e) {
@@ -307,8 +307,8 @@
for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiBQ1, patArchive, 2, config);
}
- pmiBQ1.setWardcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+// pmiBQ1.setWardcheckFlag("1");
+// patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
}
@@ -363,8 +363,8 @@
for (ServiceTaskdiag serviceTaskdept1 : serviceTaskdiags) {
writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiJB, patArchive, 3, config);
}
- pmiJB.setDiagcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(pmiJB);
+// pmiJB.setDiagcheckFlag("1");
+// patMedInhospMapper.updatePatMedInhosp(pmiJB);
}
} catch (Exception e) {
@@ -385,6 +385,75 @@
List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) {
dealInHospInfo(patMedInhospList);
+ }
+ return 1;
+ }
+
+ public int dealOutHospInfo1(String config) {
+ //鑾峰彇浠诲姟淇℃伅
+ ServiceTask st = new ServiceTask();
+ st.setDelFlag("0");
+ st.setLongTask(1);
+ List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
+ log.info("銆恉ealOutHospInfo1銆戣幏鍙栧埌{}涓暱鏈熶换鍔�", serviceTasks.size());
+
+ PatMedInhosp pmks = new PatMedInhosp();
+ //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
+ pmks.setDeptcheckFlag("0");
+ pmks.setInhospstate("1");
+ pmks.setFuflag("1");
+ List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(pmks);
+
+ log.info("dealOutHospInfo1 闇�瑕佸鐞嗙殑鍑洪櫌閮ㄩ棬鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhosps)
+ ? patMedInhosps.size() : null);
+ for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
+ String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+ patMedInhosp1.setTagname(tagname);
+ }
+
+ //绉戝
+ for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
+ //鐥呬汉杞闀挎湡浠诲姟 闀挎湡浠诲姟閰嶇疆闅忚
+ for(ServiceTask serviceTask : serviceTasks) {
+
+ }
+ //鑾峰彇鎮ｈ�呬俊鎭�
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
+ if (Objects.isNull(patArchive)) {
+ patMedInhosp1.setDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ continue;
+ }
+ try {
+ //鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟
+ ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+ serviceTaskdept.setLongtask(1L);
+ serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
+ serviceTaskdept.setDeptType("1");
+ serviceTaskdept.setOrgid(patMedInhosp1.getOrgid());
+ List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+ //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+ if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
+ PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+ patMedInhosp1.setDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆闀挎湡浠诲姟;");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ } else {
+ for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
+ writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config);
+ }
+// patMedInhosp1.setDeptcheckFlag("1");
+// patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("浜哄憳绉戝澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ patMedInhosp1.setDeptcheckFlag("2");
+ patMedInhosp1.setLongTaskReason("浜哄憳绉戝澶勭悊寮傚父锛�" + e.getMessage());
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ }
}
return 1;
}
@@ -547,6 +616,15 @@
return calendar.getTime();
}
+ /**
+ *
+ * @param taskid 浠诲姟id
+ * @param check 鏄惁闇�瑕佹牎楠�
+ * @param patMedInhosp1 鐥呬汉鍑哄叆闄俊鎭�
+ * @param patArchive 鐥呬汉淇℃伅
+ * @param type 闅忚绫诲瀷(1-绉戝锛�2-鐥呭尯锛�3-鐤剧梾锛�
+ * @param config 閰嶇疆淇℃伅 visit.early.day
+ */
//灏嗘偅鑰呮斁鍒皊ubtask涓�
private void writeInSubTask(Long taskid, Boolean check, PatMedInhosp patMedInhosp1, PatArchive patArchive, Integer type, String config) {
String longTaskReason = patMedInhosp1.getLongTaskReason();
@@ -557,7 +635,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 +653,7 @@
patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
return;
}
- }else {
+ } else {
serviceTask = serviceTasks.get(0);
}
if (Objects.isNull(patMedInhosp1.getEndtime())) {
@@ -583,7 +661,7 @@
}
//灏佽serviceSubtask
ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive, config);
- if(ObjectUtils.isEmpty(serviceSubtask)){
+ if (ObjectUtils.isEmpty(serviceSubtask)) {
return;
}
if (type != 2) {
@@ -605,7 +683,7 @@
subtask.setSendstate(2L);
subtask.setTaskid(taskid);
List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
- log.info("璇ユ偅鑰呭緟鎵ц鐨勪换鍔�:{}", CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.size() : null);
+// log.info("璇ユ偅鑰呭緟鎵ц鐨勪换鍔�:{}", CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.size() : null);
if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
@@ -617,7 +695,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 +704,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 +716,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 +795,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();
@@ -833,6 +912,9 @@
if (!Objects.isNull(patMedInhosp1.getEndtime())) {
newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());
} else {
+ patMedInhosp1.setDeptcheckFlag("2");
+ patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 璇ユ偅鑰呯柧鐥呭嚭闄㈡椂闂翠负绌�,鍑洪櫌璁板綍ID涓�:" + patMedInhosp1.getInhospid());
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
//濡傛灉鍑洪櫌鏃堕棿涓虹┖锛屽垯杩斿洖涓�涓柊瀵硅薄
return new ServiceSubtask();
}
@@ -844,13 +926,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