From 673757e7a669769041a54ef6471b4d8d250e3416 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 28 七月 2026 18:23:52 +0800
Subject: [PATCH] 【丽水】JZ_MZ_WanChengJZ 就诊信息同步生成随访任务
---
smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java | 62 +++++++++++++++++++++++++++++++
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 16 ++++++++
smartor/src/main/java/com/smartor/service/IPatMedOuthospService.java | 4 ++
3 files changed, 82 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedOuthospService.java b/smartor/src/main/java/com/smartor/service/IPatMedOuthospService.java
index 2535163..1a2ab3b 100644
--- a/smartor/src/main/java/com/smartor/service/IPatMedOuthospService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatMedOuthospService.java
@@ -1,5 +1,6 @@
package com.smartor.service;
+import java.util.Date;
import java.util.List;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -69,4 +70,7 @@
public Integer dealOutpatientInfo();
public ServiceSubtask boxedServiceSubtask(ServiceTask serviceTask, PatMedOuthosp patMedOuthosp, PatArchive patArchive);
+
+ //闂ㄨ瘖璁板綍鍐嶆闅忚
+ public Integer followUpAgainByPatMedOuthosp(PatMedOuthosp patMedOuthosp, Date adminDate, Integer visitTimeNum);
}
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 bf908b7..74c33b8 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
@@ -531,6 +531,68 @@
return serviceSubtask;
}
+ /**
+ *
+ * @param patMedOuthosp
+ * @return
+ */
+ @Override
+ public Integer followUpAgainByPatMedOuthosp(PatMedOuthosp patMedOuthosp,Date adminDate, Integer visitTimeNum){
+ int hoursToAdd = visitTimeNum * 24;
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(adminDate);
+ calendar.add(Calendar.HOUR_OF_DAY, hoursToAdd);
+ Date newDate = calendar.getTime();
+
+ Integer i = 0;
+ String deptcode = patMedOuthosp.getDeptcode();
+ Long patid = patMedOuthosp.getPatid();
+ //鏌ョ湅鏈夋棤杩涜涓殑浠诲姟
+ ServiceSubtaskEntity serviceSubtaskEntity0 = new ServiceSubtaskEntity();
+ serviceSubtaskEntity0.setOrgid(patMedOuthosp.getOrgid());
+ serviceSubtaskEntity0.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 7L)));
+ serviceSubtaskEntity0.setPatid(patid);
+ serviceSubtaskEntity0.setDeptcode(deptcode);
+ serviceSubtaskEntity0.setSort(0);
+ List<ServiceSubtask> serviceSubtaskList0 = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskEntity0);
+ if(!CollectionUtils.isEmpty(serviceSubtaskList0)){
+ ServiceSubtask serviceSubtask0 = serviceSubtaskList0.get(0);
+ serviceSubtask0.setSendstate(6L);
+ serviceSubtask0.setUpdateTime(new Date());
+ serviceSubtask0.setFinishtime(adminDate);
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask0);
+
+ ServiceSubtask serviceSubtask1 = serviceSubtaskList0.get(0);
+ serviceSubtask1.setSendstate(2L);
+ serviceSubtask1.setCreateTime(new Date());
+ serviceSubtask1.setUpdateTime(new Date());
+
+ serviceSubtask1.setVisitTime(newDate);
+ serviceSubtask1.setLongSendTime(newDate);
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask1);
+ }else {
+ //鏌ョ湅宸插畬鎴愮殑浠诲姟
+// ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
+// serviceSubtaskEntity0.setOrgid(patMedOuthosp.getOrgid());
+// serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
+// serviceSubtaskEntity.setPatid(patid);
+// serviceSubtaskEntity.setDeptcode(deptcode);
+// serviceSubtaskEntity.setSort(0);
+// List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskEntity);
+// if(!CollectionUtils.isEmpty(serviceSubtaskList)){
+// ServiceSubtask serviceSubtask = serviceSubtaskList.get(0);
+// serviceSubtask.setSendstate(2L);
+// serviceSubtask.setCreateTime(new Date());
+// serviceSubtask.setUpdateTime(new Date());
+//
+// serviceSubtask.setVisitTime(newDate);
+// serviceSubtask.setLongSendTime(newDate);
+// i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+// }
+ }
+ return i;
+ }
+
private Date addDays(Date date, Integer days) {
if (days == null) {
days = 1;
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 66d22d4..04e91f6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1204,12 +1204,23 @@
patMedOuthosp.setFuflag("1");
}
}
+ Integer visitTimeNum = null;
+ String visitTimeUnit = "澶�";
for (ExternalWZInfo externalWZInfo : ExternalWZInfoList) {
if (externalWZInfo.getWenZhenLXMC().equals("鐜扮梾鍙�")) {
patMedOuthosp.setHpi(externalWZInfo.getNeiRong());
}
if (externalWZInfo.getWenZhenLXMC().equals("涓昏瘔")) {
patMedOuthosp.setMainsuit(externalWZInfo.getNeiRong());
+ }
+ if (externalWZInfo.getWenZhenLXMC().equals("闅忚澶╂暟")) {
+ String visitTimeNumStr = externalWZInfo.getNeiRong();
+ if(StringUtils.isNotEmpty(visitTimeNumStr) && visitTimeNumStr.matches("^-?\\d+$")){
+ visitTimeNum = Integer.parseInt(visitTimeNumStr);
+ }
+ }
+ if (externalWZInfo.getWenZhenLXMC().equals("闅忚澶╂暟鍗曚綅")) {
+ visitTimeUnit = externalWZInfo.getNeiRong();
}
}
int i = 0;
@@ -1231,6 +1242,11 @@
i = patMedOuthospService.insertPatMedOuthosp(patMedOuthosp);
}
+ Date adminDate = externalJZInfo.getJiuZhenRQ();
+ //瀹屾垚鎺ヨ瘖 宸茬粡瀹屾垚浠诲姟鍐嶆闅忚
+ if(ObjectUtils.isNotEmpty(visitTimeNum) && ObjectUtils.isNotEmpty(adminDate)){
+ patMedOuthospService.followUpAgainByPatMedOuthosp(patMedOuthosp, adminDate, visitTimeNum);
+ }
if (i > 0) {
return true;
--
Gitblit v1.9.3