From 1468abbfadd8ba623c85e0c871aade69607ce085 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 25 二月 2025 14:24:54 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 170 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 107 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 a9157b0..c0bbaa3 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -28,9 +28,14 @@
public class PatMedInhospServiceImpl implements IPatMedInhospService {
@Autowired
private PatMedInhospMapper patMedInhospMapper;
+ @Autowired
+ private ServiceCheckMapper serviceCheckMapper;
@Autowired
private ServiceTaskdeptMapper serviceTaskdeptMapper;
+
+ @Autowired
+ private ServiceTaskdiagMapper serviceTaskdiagMapper;
@Autowired
private PatArchiveMapper patArchiveMapper;
@@ -50,6 +55,7 @@
private ServiceSubtaskMapper serviceSubtaskMapper;
@Autowired
private SysUserDeptMapper sysUserDeptMapper;
+
@Value("${createTaskServiceType}")
private List<String> createTaskServiceType;
@@ -202,32 +208,66 @@
log.error("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎮ｈ�呬俊鎭細{}", patMedInhosps);
for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
+ //鍏堟牴鎹瀹ゅ幓service_check鏌ヨcheck_visit_flag鏄牴鎹�滅瀹も�濋殢璁匡紝杩樻槸鏍规嵁鈥滅涓�璇婃柇鈥濋殢璁�
+ ServiceCheck serviceCheck = new ServiceCheck();
+ serviceCheck.setDeptCode(patMedInhosp1.getDeptcode());
+ serviceCheck.setOrgid(patMedInhosp1.getOrgid());
+ List<ServiceCheck> serviceChecks = serviceCheckMapper.selectServiceCheckList(serviceCheck);
+ //鑾峰彇鎮ｈ�呬俊鎭�
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
try {
- //鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟
- ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
- serviceTaskdept.setLongtask(1L);
- serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
- serviceTaskdept.setServiceType("2");
- List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
- //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堟殏瀹氾紝灏嗗嚭鍏ラ櫌琛ㄧ殑check_flag璁剧疆涓�2 锛宭ong_task_reason 璁板綍鍘熷洜锛�
- if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
- patMedInhosp1.setCheckFlag("2");
- patMedInhosp1.setLongTaskReason("璇ユ偅鑰呮墍鍦ㄧ瀹わ紝鏈厤缃暱鏈熶换鍔�");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
- continue;
- } else if (serviceTaskdepts.size() > 1) {
- //濡傛灉鏌ヨ鍑哄涓换鍔★紝閭ｅ氨鍙栫涓�涓紝骞跺湪鎮ｈ�呭娉ㄤ竴涓�
- List<Long> tempList = serviceTaskdepts.stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
- patMedInhosp1.setLongTaskReason("璇ユ偅鑰呮墍鍦ㄧ瀹わ紝鏈夊涓嚭闄㈤殢璁块暱鏈熶换鍔�:" + tempList);
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
- ServiceTaskdept serviceTaskdept1 = serviceTaskdepts.get(0);
- serviceTaskdepts = new ArrayList<>();
- serviceTaskdepts.add(serviceTaskdept1);
+ if (CollectionUtils.isEmpty(serviceChecks) || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 1 || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 3) {
+ //鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟
+ ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
+ serviceTaskdept.setLongtask(1L);
+ serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
+ serviceTaskdept.setServiceType("2");
+ List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
+ //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堟殏瀹氾紝灏嗗嚭鍏ラ櫌琛ㄧ殑check_flag璁剧疆涓�2 锛宭ong_task_reason 璁板綍鍘熷洜锛�
+ if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
+ patMedInhosp1.setCheckFlag("2");
+ patMedInhosp1.setLongTaskReason("璇ユ偅鑰呮墍鍦ㄧ瀹わ紝鏈厤缃暱鏈熶换鍔�;");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ continue;
+ } else if (serviceTaskdepts.size() > 1) {
+ //濡傛灉鏌ヨ鍑哄涓换鍔★紝閭ｅ氨鍙栫涓�涓紝骞跺湪鎮ｈ�呭娉ㄤ竴涓�
+ List<Long> tempList = serviceTaskdepts.stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
+ patMedInhosp1.setLongTaskReason("璇ユ偅鑰呮墍鍦ㄧ瀹わ紝鏈夊涓嚭闄㈤殢璁块暱鏈熶换鍔�:" + tempList);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ ServiceTaskdept serviceTaskdept1 = serviceTaskdepts.get(0);
+ serviceTaskdepts = new ArrayList<>();
+ serviceTaskdepts.add(serviceTaskdept1);
+ }
+
+ writeInSubTask(serviceTaskdepts.get(0).getTaskId(), true, patMedInhosp1, patArchive);
+ } else if (serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 2 || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 3) {
+ //涓芥按闇�瑕佹牴鎹闄㈢柧鐥呭璇ョ梾浜虹敓鎴愪竴娆￠殢璁�
+ String[] split = patMedInhosp1.getIcd10code().split(",");
+ ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
+ serviceTaskdiag.setLongtask(1L);
+ serviceTaskdiag.setIcd10code(split[0]);
+ serviceTaskdiag.setServiceType("2");
+ List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagList(serviceTaskdiag);
+ PatMedInhosp patMedInhosp2 = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
+ //濡傛灉鐤剧梾缂栫爜涓虹┖锛堟殏瀹氾紝灏嗗嚭鍏ラ櫌琛ㄧ殑check_flag璁剧疆涓�3 锛宭ong_task_reason 璁板綍鍘熷洜锛�
+ if (CollectionUtils.isEmpty(serviceTaskdiags) || serviceTaskdiags.size() == 0) {
+ patMedInhosp1.setCheckFlag("3");
+ patMedInhosp1.setLongTaskReason(patMedInhosp2.getLongTaskReason() + "璇ユ偅鑰呯殑绗竴鐤剧梾缂栫爜锛屾湭閰嶇疆闀挎湡浠诲姟;");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ continue;
+ } else if (serviceTaskdiags.size() > 1) {
+ //濡傛灉鏌ヨ鍑哄涓换鍔★紝閭ｅ氨鍙栫涓�涓紝骞跺湪鎮ｈ�呭娉ㄤ竴涓�
+ List<Long> tempList = serviceTaskdiags.stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
+ patMedInhosp1.setLongTaskReason(patMedInhosp2.getLongTaskReason() + "璇ユ偅鑰呯殑绗竴鐤剧梾缂栫爜锛屾湁澶氫釜鍑洪櫌闅忚闀挎湡浠诲姟:" + tempList);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ ServiceTaskdiag serviceTaskdiag1 = serviceTaskdiags.get(0);
+ serviceTaskdiags = new ArrayList<>();
+ serviceTaskdiags.add(serviceTaskdiag1);
+ }
+ writeInSubTask(serviceTaskdiags.get(0).getTaskId(), false, patMedInhosp1, patArchive);
}
- //鑾峰彇鎮ｈ�呬俊鎭�
- PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
- writeInSubTask(serviceTaskdepts, patMedInhosp1, patArchive);
+
} catch (Exception e) {
e.printStackTrace();
log.error("浜哄憳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
@@ -297,34 +337,35 @@
}
//灏嗘偅鑰呮斁鍒皊ubtask涓�
- private void writeInSubTask(List<ServiceTaskdept> serviceTaskdepts, PatMedInhosp patMedInhosp1, PatArchive patArchive) {
+ private void writeInSubTask(Long taskid, Boolean check, PatMedInhosp patMedInhosp1, PatArchive patArchive) {
String longTaskReason = patMedInhosp1.getLongTaskReason();
if (StringUtils.isEmpty(longTaskReason)) longTaskReason = "";
- for (ServiceTaskdept std : serviceTaskdepts) {
- Long taskid = std.getTaskId();
- ServiceTask st = new ServiceTask();
- st.setTaskid(taskid);
- st.setSendState(2L);
- List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
- if (CollectionUtils.isEmpty(serviceTasks)) {
- log.error("璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓猴細{}", taskid);
- patMedInhosp1.setCheckFlag("2");
- patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
- continue;
- }
- ServiceTask serviceTask = serviceTasks.get(0);
- if (!createTaskServiceType.contains(serviceTask.getServiceType())) {
- //涓嶆槸鍏佽鐨勬湇鍔＄被鍨嬶紝鍒檆ontinue
- log.error("璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔＄殑鏈嶅姟绫诲瀷涓嶅湪鑷姩鐢熸垚鐨勬湇鍔＄被鍨嬪垪琛ㄤ腑,浠诲姟ID涓猴細{}", taskid);
- patMedInhosp1.setCheckFlag("2");
- patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔＄殑鏈嶅姟绫诲瀷涓嶅湪鑷姩鐢熸垚鐨勬湇鍔＄被鍨嬪垪琛ㄤ腑,浠诲姟ID涓猴細" + taskid);
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
- continue;
- }
- //灏佽serviceSubtask
- ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive);
- Integer i = 0;
+// Long taskid = std.getTaskId();
+ ServiceTask st = new ServiceTask();
+ st.setTaskid(taskid);
+ st.setSendState(2L);
+ List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
+ if (CollectionUtils.isEmpty(serviceTasks)) {
+ log.error("璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓猴細{}", taskid);
+ patMedInhosp1.setCheckFlag("2");
+ patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔′笉瀛樺湪,浠诲姟ID涓�:" + taskid);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ return;
+ }
+ ServiceTask serviceTask = serviceTasks.get(0);
+ if (!createTaskServiceType.contains(serviceTask.getServiceType())) {
+ //涓嶆槸鍏佽鐨勬湇鍔＄被鍨嬶紝鍒檆ontinue
+ log.error("璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔＄殑鏈嶅姟绫诲瀷涓嶅湪鑷姩鐢熸垚鐨勬湇鍔＄被鍨嬪垪琛ㄤ腑,浠诲姟ID涓猴細{}", taskid);
+ patMedInhosp1.setCheckFlag("2");
+ patMedInhosp1.setLongTaskReason(longTaskReason + " & 璇ユ偅鑰呭嚭闄㈤殢璁块暱鏈熶换鍔＄殑鏈嶅姟绫诲瀷涓嶅湪鑷姩鐢熸垚鐨勬湇鍔＄被鍨嬪垪琛ㄤ腑,浠诲姟ID涓猴細" + taskid);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ return;
+ }
+ //灏佽serviceSubtask
+ ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive);
+ Integer i = 0;
+ //鍏堝垽鏂竴涓嬶紝鏄惁闇�瑕佹牎楠�
+ if (check) {
//鍦ㄦ柊澧炰箣鍓嶏紝鍏堥�氳繃鎮ｈ�匢D锛宻endstate=2鏌ヨ涓�涓嬶紝鍦ㄦ墍鏈夐暱鏈熶换鍔′腑锛屾槸涓嶆槸杩樻湁璇ユ偅鑰呭緟鎵ц鐨勪换鍔★紝鏈夌殑璇�,姣旇緝涔嬪墠鐨別ndtime鏄惁灏忎簬褰撳墠鐨別ndtaime,濡傛灉涔嬪墠鐨勫皬浜庣幇鍦ㄧ殑锛屽垯鐩存帴灏嗕箣鍓嶇殑鍋滄帀锛堝師鍥犲啀鍏ラ櫌锛�
ServiceSubtaskVO subtask = new ServiceSubtaskVO();
subtask.setPatid(patArchive.getId());
@@ -351,25 +392,28 @@
serviceSubtask.setFinishtime(new Date());
serviceSubtask.setSendstate(4L);
serviceSubtask.setRemark("褰撳墠鎮ｈ�呭嚭闄㈡椂闂村悗鏈夊緟鎵ц鐨勫嚭闄㈤殢璁块暱鏈熶换鍔�");
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
}
}
}
+ } else {
i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
- if (i == 1) {
- //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
- PatMedInhosp patMedInhosp2 = new PatMedInhosp();
- patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
- patMedInhosp2.setCheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
- } else {
- //鐢熸垚瀛愪换鍔″け璐ワ紝
- log.error("鐢熸垚瀛愪换鍔″け璐erviceSubtask涓猴細{}", serviceSubtask);
- PatMedInhosp patMedInhosp2 = new PatMedInhosp();
- patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
- patMedInhosp2.setRemark("鐢熸垚瀛愪换鍔″け璐�");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
- }
}
+ if (i == 1) {
+ //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
+ PatMedInhosp patMedInhosp2 = new PatMedInhosp();
+ patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
+ patMedInhosp2.setCheckFlag("1");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
+ } else {
+ //鐢熸垚瀛愪换鍔″け璐ワ紝
+ log.error("鐢熸垚瀛愪换鍔″け璐erviceSubtask涓猴細{}", serviceSubtask);
+ PatMedInhosp patMedInhosp2 = new PatMedInhosp();
+ patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
+ patMedInhosp2.setRemark("鐢熸垚瀛愪换鍔″け璐�");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
+ }
+
}
//灏佽serviceSubtask
--
Gitblit v1.9.3