From 85183ce29f27f67edf9b80d9b15efff48091449f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 09 四月 2026 13:49:42 +0800
Subject: [PATCH] 省立同德门急诊采集功能提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 131 +++++++++++++++++++++++--------------------
1 files changed, 70 insertions(+), 61 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 5db5a50..4ad097d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -378,60 +378,60 @@
patMedInhospMapper.updatePatMedInhosp(pmiJB);
}
}
-
- PatMedInhosp pmss = new PatMedInhosp();
- //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
- pmss.setOpercheckFlag("0");
- pmss.setInhospstate("1");
- pmss.setFuflag("1");
- List<PatMedInhosp> patMedInhospSSs = patMedInhospMapper.selectPatMedInhospList(pmss);
- log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鐤剧梾鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhospSSs) ? patMedInhospSSs.size() : null);
- for (PatMedInhosp patMedInhosp1 : patMedInhospSSs) {
- String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
- patMedInhosp1.setTagname(tagname);
- }
-
- for (PatMedInhosp pmiSS : patMedInhospSSs) {
- //鑾峰彇鎮ｈ�呬俊鎭�
- PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(pmiSS.getPatid());
- if (Objects.isNull(patArchive)) {
- pmiSS.setDiagcheckFlag("2");
- pmiSS.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
- patMedInhospMapper.updatePatMedInhosp(pmiSS);
- continue;
- }
- try {
-// if (StringUtils.isEmpty(pmiSS.getLeaveicd10code())) {
-// continue;
+// 鎵嬫湳闅忚
+// PatMedInhosp pmss = new PatMedInhosp();
+// //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
+// pmss.setOpercheckFlag("0");
+// pmss.setInhospstate("1");
+// pmss.setFuflag("1");
+// List<PatMedInhosp> patMedInhospSSs = patMedInhospMapper.selectPatMedInhospList(pmss);
+// log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鐤剧梾鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhospSSs) ? patMedInhospSSs.size() : null);
+// for (PatMedInhosp patMedInhosp1 : patMedInhospSSs) {
+// String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid());
+// patMedInhosp1.setTagname(tagname);
+// }
+//
+// for (PatMedInhosp pmiSS : patMedInhospSSs) {
+// //鑾峰彇鎮ｈ�呬俊鎭�
+// PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(pmiSS.getPatid());
+// if (Objects.isNull(patArchive)) {
+// pmiSS.setDiagcheckFlag("2");
+// pmiSS.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
+// patMedInhospMapper.updatePatMedInhosp(pmiSS);
+// continue;
+// }
+// try {
+//// if (StringUtils.isEmpty(pmiSS.getLeaveicd10code())) {
+//// continue;
+//// }
+// // 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
+// ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
+// serviceTaskoper.setLongtask(1L);
+// serviceTaskoper.setOrgid(pmiSS.getOrgid());
+// //todo
+// serviceTaskoper.setOplevelcode("");
+//
+// List<ServiceTaskoper> serviceTaskopers = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);
+// //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+// if (CollectionUtils.isEmpty(serviceTaskopers) || serviceTaskopers.size() == 0) {
+// PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiSS.getInhospid());
+// pmiSS.setOpercheckFlag("2");
+// pmiSS.setLongTaskReason(patMedInhosp.getLongTaskReason() + "鎵�鎮ｇ殑鎵嬫湳鏈厤缃暱鏈熶换鍔�;");
+// patMedInhospMapper.updatePatMedInhosp(pmiSS);
+// } else {
+// for (ServiceTaskoper serviceTaskoper1 : serviceTaskopers) {
+// writeInSubTask(serviceTaskoper1.getTaskId(), true, pmiSS, patArchive, 3, config);
+// }
// }
- // 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
- ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
- serviceTaskoper.setLongtask(1L);
- serviceTaskoper.setOrgid(pmiSS.getOrgid());
- //todo
- serviceTaskoper.setOplevelcode("");
-
- List<ServiceTaskoper> serviceTaskopers = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);
- //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
- if (CollectionUtils.isEmpty(serviceTaskopers) || serviceTaskopers.size() == 0) {
- PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(pmiSS.getInhospid());
- pmiSS.setOpercheckFlag("2");
- pmiSS.setLongTaskReason(patMedInhosp.getLongTaskReason() + "鎵�鎮ｇ殑鎵嬫湳鏈厤缃暱鏈熶换鍔�;");
- patMedInhospMapper.updatePatMedInhosp(pmiSS);
- } else {
- for (ServiceTaskoper serviceTaskoper1 : serviceTaskopers) {
- writeInSubTask(serviceTaskoper1.getTaskId(), true, pmiSS, patArchive, 3, config);
- }
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- log.error("浜哄憳鎵嬫湳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
- pmiSS.setOpercheckFlag("2");
- pmiSS.setLongTaskReason("浜哄憳鎵嬫湳澶勭悊寮傚父锛�" + e.getMessage());
- patMedInhospMapper.updatePatMedInhosp(pmiSS);
- }
- }
+//
+// } catch (Exception e) {
+// e.printStackTrace();
+// log.error("浜哄憳鎵嬫湳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+// pmiSS.setOpercheckFlag("2");
+// pmiSS.setLongTaskReason("浜哄憳鎵嬫湳澶勭悊寮傚父锛�" + e.getMessage());
+// patMedInhospMapper.updatePatMedInhosp(pmiSS);
+// }
+// }
}
//鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭ｄ箣鍓嶇殑鍑洪櫌鎮ｈ�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
@@ -1117,15 +1117,24 @@
//涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
continue;
}
- if (serviceSubtask1.getEndtime().before(patMedInhosp1.getStarttime())) {
- //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
-// log.error("鎮ｈ�呭啀鍏ラ櫌鐨剆erviceSubtask1涓�:{}", serviceSubtask1);
- serviceSubtask1.setSendstate(4L);
- serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
- serviceSubtask1.setResult("error");
-// serviceSubtask1.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ //鏅畞 鍑洪櫌棣栨锛�7澶╋級闅忚涓�瀹氳鍋�
+ boolean firstVisit = false;
+ if (serviceSubtask1.getOrgid().equals("47255004333112711A1001")
+ && serviceSubtask1.getVisitCount() != null && serviceSubtask1.getVisitCount() == 1) {
+ firstVisit = true;
}
+ if (!firstVisit) {
+ if (serviceSubtask1.getEndtime().before(patMedInhosp1.getStarttime())) {
+ //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
+// log.error("鎮ｈ�呭啀鍏ラ櫌鐨剆erviceSubtask1涓�:{}", serviceSubtask1);
+ serviceSubtask1.setSendstate(4L);
+ serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
+ serviceSubtask1.setResult("error");
+// serviceSubtask1.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ }
+ }
+
}
}
//灏嗘偅鍏ョ殑鍏ラ櫌鏁版嵁璁剧疆涓哄凡澶勭悊
--
Gitblit v1.9.3