From f2ac4bd8bc831c97242ccf4efa04a0c5c8d852f9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 29 十二月 2025 19:46:26 +0800
Subject: [PATCH] 【景宁】代码调整
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 7f0fc07..e595e15 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -550,6 +550,7 @@
//灏嗘偅鑰呮斁鍒皊ubtask涓�
private void writeInSubTask(Long taskid, Boolean check, PatMedInhosp patMedInhosp1, PatArchive patArchive, Integer type, String config) {
String longTaskReason = patMedInhosp1.getLongTaskReason();
+ String orgId = patMedInhosp1.getOrgid();
if (StringUtils.isEmpty(longTaskReason)) longTaskReason = "";
ServiceTask st = new ServiceTask();
st.setTaskid(taskid);
@@ -634,7 +635,16 @@
if (aBoolean) i = 1;
continue;
}
- if (endTime1.before(endTime) && serviceSubtask1.getServiceType().equals("2")) {
+ //鍐嶅叆闄㈤�昏緫
+ //鏅畞 鍑洪櫌棣栨锛�7澶╋級闅忚涓�瀹氳鍋�
+// boolean firstVisit = false;
+// 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()))
@@ -834,13 +844,21 @@
//濡傛灉鏄�氱煡鐨勮瘽锛岄渶瑕佹彁鍓嶅嚑澶╁皢閫氳繃鐭俊鍙戝嚭鍘伙紙鍏蜂綋鍑犲ぉ锛岃繖涓彲浠ラ厤缃湪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));
+ if (patMedInhosp1.getFudate() != null){
+ serviceSubtask.setVisitTime(minusDay(patMedInhosp1.getFudate(),
+ StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
+ }else{
+ //鍒ゆ柇鏄笉鏄櫙瀹�
+ if (patMedInhosp1.getOrgid().equals("47255004333112711A1001"))
+ {
+ serviceSubtask.setVisitTime(null);
+ //涓嶆墽琛�
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setRemark("鏅畞娌℃湁缁欓殢璁挎椂闂达紝涓嶅彂閫侀�氱煡鐭俊");
+ }
+ }
+
}
//鎮ｈ�呭彂閫佹椂闂�
--
Gitblit v1.9.3