From ae3d8d1b4e5d77323197aa298e3c767dc4859f0e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 23 四月 2025 17:03:58 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java | 2
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 181 +++++++++++++++++++++++++++++---------------
2 files changed, 120 insertions(+), 63 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 4136526..8fd0c47 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -189,30 +189,25 @@
@Override
public int dealOutHospInfo() {
- //瀹氫箟涓変釜鍙橀噺鐢ㄦ潵璁板綍锛岃繖涓偅鑰呮槸涓嶆槸涓変釜闅忚閮芥槸涓虹┖
- Boolean deptIsNull = false;
- Boolean wardIsNull = false;
- Boolean diagIsNull = false;
- PatMedInhosp patMedInhosp = new PatMedInhosp();
+ PatMedInhosp pmks = new PatMedInhosp();
//鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
- patMedInhosp.setDeptcheckFlag("0");
- patMedInhosp.setInhospstate("1");
- patMedInhosp.setFuflag("1");
- List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
- log.error("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎮ｈ�呬俊鎭細{}", patMedInhosps);
+ pmks.setDeptcheckFlag("0");
+ pmks.setInhospstate("1");
+ pmks.setFuflag("1");
+ List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(pmks);
+ log.error("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌閮ㄩ棬鎮ｈ�呬俊鎭細{}", patMedInhosps);
for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
patMedInhosp1.setTagname(tagname);
}
+ //绉戝
for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
//鑾峰彇鎮ｈ�呬俊鎭�
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
if (Objects.isNull(patArchive)) {
patMedInhosp1.setDeptcheckFlag("2");
- patMedInhosp1.setWardcheckFlag("2");
- patMedInhosp1.setDiagcheckFlag("2");
patMedInhosp1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
continue;
@@ -223,59 +218,19 @@
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) {
- deptIsNull = true;
+ 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);
}
patMedInhosp1.setDeptcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
- }
-
- //鏍规嵁鎮ｈ�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
- if (visitHosp != 1) {
- serviceTaskdept.setLongtask(1L);
- serviceTaskdept.setDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
- serviceTaskdept.setDeptType("2");
- List<ServiceTaskdept> serviceTaskdeptList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
- //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
- if (CollectionUtils.isEmpty(serviceTaskdeptList) || serviceTaskdeptList.size() == 0) {
- wardIsNull = true;
- } else {
- for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
- writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 2);
- }
- patMedInhosp1.setWardcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
- }
-
- // 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
- ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
- serviceTaskdiag.setLongtask(1L);
- serviceTaskdiag.setIcd10code(patMedInhosp1.getLeaveicd10code());
- List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagList(serviceTaskdiag);
- //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
- if (CollectionUtils.isEmpty(serviceTaskdiags) || serviceTaskdiags.size() == 0) {
- diagIsNull = true;
- } else {
-
- for (ServiceTaskdiag serviceTaskdept1 : serviceTaskdiags) {
- writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 3);
- }
- patMedInhosp1.setDiagcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
- }
- }
-
- //涓変釜閮戒负绌猴紝娌℃硶闅忚浜�
- if (diagIsNull == true && deptIsNull == true && wardIsNull == true) {
- patMedInhosp1.setDeptcheckFlag("2");
- patMedInhosp1.setWardcheckFlag("2");
- patMedInhosp1.setDiagcheckFlag("2");
- patMedInhosp1.setLongTaskReason("璇ユ偅鑰呮墍鍦ㄧ瀹ゃ�佺梾鍖� 鎴栨墍鎮ｇ殑鐤剧梾锛屾湭閰嶇疆闀挎湡浠诲姟;");
patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
}
@@ -285,14 +240,116 @@
}
}
+ //鏍规嵁鎮ｈ�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑闀挎湡浠诲姟,鏂板崕鍖婚櫌鍙互鍏堜笉鐢ㄦ牴鎹梾鍖哄拰鐤剧梾鏉ュ仛
+ if (visitHosp != 1) {
+
+ PatMedInhosp pmbq = new PatMedInhosp();
+ //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
+ pmbq.setWardcheckFlag("0");
+ pmbq.setInhospstate("1");
+ pmbq.setFuflag("1");
+ List<PatMedInhosp> patMedInhospBQs = patMedInhospMapper.selectPatMedInhospList(pmbq);
+ log.error("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鐥呭尯鎮ｈ�呬俊鎭細{}", patMedInhosps);
+ for (PatMedInhosp patMedInhosp1 : patMedInhospBQs) {
+ String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+ patMedInhosp1.setTagname(tagname);
+ }
+
+ //鐥呭尯鏁版嵁澶勭悊
+ for (PatMedInhosp pmiBQ1 : patMedInhospBQs) {
+ //鑾峰彇鎮ｈ�呬俊鎭�
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(pmiBQ1.getPatid());
+ if (Objects.isNull(patArchive)) {
+ pmiBQ1.setWardcheckFlag("2");
+ pmiBQ1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
+ patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+ continue;
+ }
+ try {
+ ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+ serviceTaskdept.setLongtask(1L);
+ serviceTaskdept.setDeptCode(pmiBQ1.getLeavehospitaldistrictcode());
+ serviceTaskdept.setDeptType("2");
+ serviceTaskdept.setOrgid(pmiBQ1.getOrgid());
+ List<ServiceTaskdept> serviceTaskdeptList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+ //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+ if (CollectionUtils.isEmpty(serviceTaskdeptList) || serviceTaskdeptList.size() == 0) {
+ PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiBQ1.getInhospid());
+ pmiBQ1.setWardcheckFlag("2");
+ pmiBQ1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ梾鍖烘湭閰嶇疆闀挎湡浠诲姟;");
+ patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+ } else {
+ for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
+ writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiBQ1, patArchive, 2);
+ }
+ pmiBQ1.setWardcheckFlag("1");
+ patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+ }
+
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("浜哄憳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ }
+ }
+
+ PatMedInhosp pmjb = new PatMedInhosp();
+ //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
+ pmjb.setDiagcheckFlag("0");
+ pmjb.setInhospstate("1");
+ pmjb.setFuflag("1");
+ List<PatMedInhosp> patMedInhospJBs = patMedInhospMapper.selectPatMedInhospList(pmjb);
+ log.error("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鐤剧梾鎮ｈ�呬俊鎭細{}", patMedInhosps);
+ for (PatMedInhosp patMedInhosp1 : patMedInhospJBs) {
+ String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+ patMedInhosp1.setTagname(tagname);
+ }
+
+ for (PatMedInhosp pmiJB : patMedInhospJBs) {
+ //鑾峰彇鎮ｈ�呬俊鎭�
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(pmiJB.getPatid());
+ if (Objects.isNull(patArchive)) {
+ pmiJB.setDiagcheckFlag("2");
+ pmiJB.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
+ patMedInhospMapper.updatePatMedInhosp(pmiJB);
+ continue;
+ }
+ try {
+ // 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
+ ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
+ serviceTaskdiag.setLongtask(1L);
+ serviceTaskdiag.setIcd10code(pmiJB.getLeaveicd10code());
+ serviceTaskdiag.setOrgid(pmiJB.getOrgid());
+
+ List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagList(serviceTaskdiag);
+ //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+ if (CollectionUtils.isEmpty(serviceTaskdiags) || serviceTaskdiags.size() == 0) {
+ PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiJB.getInhospid());
+ pmiJB.setDiagcheckFlag("2");
+ pmiJB.setLongTaskReason(patMedInhosp.getLongTaskReason() + "鎵�鎮ｇ殑鐤剧梾鏈厤缃暱鏈熶换鍔�;");
+ patMedInhospMapper.updatePatMedInhosp(pmiJB);
+ } else {
+ for (ServiceTaskdiag serviceTaskdept1 : serviceTaskdiags) {
+ writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiJB, patArchive, 3);
+ }
+ pmiJB.setDiagcheckFlag("1");
+ patMedInhospMapper.updatePatMedInhosp(pmiJB);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("浜哄憳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ }
+ }
+ }
+
+
//鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭ｄ箣鍓嶇殑鍑洪櫌鎮ｈ�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
patMedInhosp.setDeptcheckFlag("0");
patMedInhosp.setInhospstate("0");
List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
- for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
- String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
- patMedInhosp1.setTagname(tagname);
- }
if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) {
dealInHospInfo(patMedInhospList);
}
@@ -597,7 +654,7 @@
serviceSubtask.setSendstate(2L);
serviceSubtask.setStarttime(patMedInhosp1.getStarttime());
serviceSubtask.setEndtime(patMedInhosp1.getEndtime());
- serviceSubtask.setServiceType("2");
+ serviceSubtask.setServiceType(serviceTask.getServiceType());
serviceSubtask.setPreachform(serviceTask.getPreachform());
serviceSubtask.setHospType("2");
serviceSubtask.setCreateTime(new Date());
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
index 8bc7444..34b0d00 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
@@ -274,7 +274,7 @@
serviceSubtask.setSex(patArchive.getSex());
serviceSubtask.setAge(patArchive.getAge());
serviceSubtask.setSendstate(2L);
- serviceSubtask.setServiceType("3");
+ serviceSubtask.setServiceType(serviceTask.getServiceType());
serviceSubtask.setPreachform(serviceTask.getPreachform());
serviceSubtask.setHospType("1");
serviceSubtask.setCreateTime(new Date());
--
Gitblit v1.9.3