From e12b7983327f4881f91c8d081c52abbbf5bbc1e4 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 09 四月 2026 10:52:44 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 291 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 238 insertions(+), 53 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 4ad097d..142cb85 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -52,6 +52,11 @@
private ServiceSubtaskMapper serviceSubtaskMapper;
@Autowired
private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
+ @Autowired
+ private PatMedOperationMapper patMedOperationMapper;
+ @Autowired
+ private PatMedOperationItemMapper patMedOperationItemMapper;
+
@Value("${spring.profiles.active}")
private String active;
@@ -379,59 +384,47 @@
}
}
// 鎵嬫湳闅忚
-// 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);
-// }
-// }
-//
-// } catch (Exception e) {
-// e.printStackTrace();
-// log.error("浜哄憳鎵嬫湳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
-// pmiSS.setOpercheckFlag("2");
-// pmiSS.setLongTaskReason("浜哄憳鎵嬫湳澶勭悊寮傚父锛�" + e.getMessage());
-// patMedInhospMapper.updatePatMedInhosp(pmiSS);
-// }
-// }
+ PatMedOperationItem pmoi = new PatMedOperationItem();
+ //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
+ pmoi.setOpercheckFlag("0");
+ pmoi.setMainFlag("1");
+
+ List<PatMedOperationItem> patMedOperationItems = patMedOperationItemMapper.selectPatMedOperationItemList(pmoi);
+ log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎵嬫湳鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedOperationItems) ? patMedOperationItems.size() : null);
+
+ for (PatMedOperationItem opItem : patMedOperationItems) {
+
+ try {
+ if (StringUtils.isEmpty(opItem.getOplevelcode())) {
+ continue;
+ }
+ // 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
+ ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
+ serviceTaskoper.setLongtask(1L);
+ serviceTaskoper.setOrgid(opItem.getOrgid());
+ serviceTaskoper.setOplevelcode(opItem.getOplevelcode());
+
+ List<ServiceTaskoper> serviceTaskopers = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);
+ //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
+ if (CollectionUtils.isEmpty(serviceTaskopers) || serviceTaskopers.size() == 0) {
+ PatMedOperationItem patMedOperationItem = patMedOperationItemMapper.selectPatMedOperationItemById(opItem.getId());
+ patMedOperationItem.setOpercheckFlag("2");
+ patMedOperationItem.setLongTaskReason(patMedOperationItem.getLongTaskReason() + "鎵�鎮ｇ殑鎵嬫湳鏈厤缃暱鏈熶换鍔�;");
+ patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem);
+ } else {
+ for (ServiceTaskoper serviceTaskoper1 : serviceTaskopers) {
+ writeInSubTaskForOp(serviceTaskoper1.getTaskId(), true, opItem, config);
+ }
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("浜哄憳鎵嬫湳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
+ opItem.setOpercheckFlag("2");
+ opItem.setLongTaskReason("浜哄憳鎵嬫湳澶勭悊寮傚父锛�" + e.getMessage());
+ patMedOperationItemMapper.updatePatMedOperationItem(opItem);
+ }
+ }
}
//鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭ｄ箣鍓嶇殑鍑洪櫌鎮ｈ�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
@@ -958,6 +951,133 @@
}
}
+
+ /**
+ *
+ * @param taskid 浠诲姟id
+ * @param check 鏄惁闇�瑕佹牎楠�
+ * @param patMedOperationItem 鎵嬫湳璁板綍
+ * @param config 閰嶇疆淇℃伅 visit.early.day
+ */
+ //灏嗘偅鑰呮斁鍒皊ubtask涓� 鎵嬫湳涓撶敤
+ private void writeInSubTaskForOp(Long taskid, Boolean check, PatMedOperationItem patMedOperationItem, String config) {
+ String longTaskReason = patMedOperationItem.getLongTaskReason();
+ String orgId = patMedOperationItem.getOrgid();
+ if (StringUtils.isEmpty(longTaskReason)) longTaskReason = "";
+ ServiceTask st = new ServiceTask();
+ st.setTaskid(taskid);
+ st.setSendState(2L);
+ List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
+ ServiceTask serviceTask = null;
+ if (CollectionUtils.isEmpty(serviceTasks)) {
+ log.info("璇ユ墜鏈搴旀墜鏈瓑绾х殑闀挎湡浠诲姟涓嶅瓨鍦�,浠诲姟ID涓猴細{}", taskid);
+ patMedOperationItem.setOpercheckFlag("2");
+ patMedOperationItem.setLongTaskReason(longTaskReason + " & 璇ユ墜鏈搴旀墜鏈瓑绾х殑闀挎湡浠诲姟涓嶅瓨鍦�,浠诲姟ID涓�:" + taskid);
+ patMedOperationItemMapper.insertPatMedOperationItem(patMedOperationItem);
+ return;
+ } else {
+ serviceTask = serviceTasks.get(0);
+ }
+ if (Objects.isNull(patMedOperationItem.getOpid())) {
+ return;
+ }
+ if (Objects.isNull(patMedOperationItem.getOplevelcode())) {
+ return;
+ }
+ PatMedOperation patMedOperation = patMedOperationMapper.selectPatMedOperationById(patMedOperationItem.getOpid());
+ if (Objects.isNull(patMedOperation)) {
+ return;
+ }
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOperation.getPatid());
+ if (Objects.isNull(patArchive)) {
+ return;
+ }
+ //灏佽serviceSubtask
+ ServiceSubtask serviceSubtask = boxedServiceSubtaskForOp(serviceTask, patMedOperation, patMedOperationItem, patArchive, config);
+ if (ObjectUtils.isEmpty(serviceSubtask)) {
+ return;
+ }
+ serviceSubtask.setVisitDeptCode(patMedOperation.getReqdeptcode());
+ serviceSubtask.setVisitDeptName(patMedOperation.getReqdeptname());
+ //璁板綍insertServiceSubtask璇彞杩斿洖鐘舵��
+ Integer i = 0;
+ try {
+ //鍏堝垽鏂竴涓嬶紝鏄惁闇�瑕佹牎楠�
+ if (check && (Objects.isNull(serviceSubtask.getTaskSituation()) || serviceSubtask.getTaskSituation() != 6)) {
+ //鍦ㄦ柊澧炰箣鍓嶏紝鍏堥�氳繃鎮ｈ�匢D锛宻endstate=2鏌ヨ涓�涓嬶紝鍦ㄦ墍鏈夐暱鏈熶换鍔′腑锛屾槸涓嶆槸杩樻湁璇ユ偅鑰呭緟鎵ц鐨勪换鍔★紝鏈夌殑璇�,姣旇緝涔嬪墠鐨別ndtime鏄惁灏忎簬褰撳墠鐨別ndtaime,濡傛灉涔嬪墠鐨勫皬浜庣幇鍦ㄧ殑锛屽垯鐩存帴灏嗕箣鍓嶇殑鍋滄帀锛堝師鍥犲啀鍏ラ櫌锛�
+ ServiceSubtaskEntity subtask = new ServiceSubtaskEntity();
+ subtask.setPatid(patArchive.getId());
+ subtask.setSendstate(2L);
+ subtask.setTaskid(taskid);
+ List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
+// log.info("璇ユ偅鑰呭緟鎵ц鐨勪换鍔�:{}", CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.size() : null);
+ if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
+ for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
+ if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
+ //涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
+ continue;
+ }
+ }
+ } else {
+ if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
+ if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
+ serviceSubtask.setRemark(serviceSubtask.getRemark() + ",鎵嬫満鍙蜂负绌�");
+ else serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setResult("error");
+ }
+ serviceSubtask.setCreateBy(serviceTask.getCreateBy());
+ serviceSubtask.setCreateTime(new Date());
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ addServiceSubtaskPreachform(serviceSubtask, null);
+ }
+ } else if (serviceSubtask.getTaskSituation() == 6) {
+ //璇存槑璇ユ偅鑰呮槸琚繃婊ょ殑锛屼笉鐢ㄥ啀鎵ц浜�
+ serviceSubtask.setCreateBy(serviceTask.getCreateBy());
+ serviceSubtask.setCreateTime(new Date());
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ } else {
+ if (StringUtils.isEmpty(serviceSubtask.getPhone())) {
+ if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
+ serviceSubtask.setRemark(serviceSubtask.getRemark() + ",鎵嬫満鍙蜂负绌�");
+ else serviceSubtask.setRemark("鎵嬫満鍙蜂负绌�");
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setResult("error");
+ }
+ serviceSubtask.setCreateBy(serviceTask.getCreateBy());
+ serviceSubtask.setCreateTime(new Date());
+ i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ addServiceSubtaskPreachform(serviceSubtask, null);
+ }
+
+ //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
+ if (i == 1) {
+ PatMedOperationItem patMedOperationItem2 = new PatMedOperationItem();
+ patMedOperationItem2.setId(patMedOperationItem.getId());
+ patMedOperationItem2.setOpercheckFlag("1");
+ patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem2);
+ } else {
+ //鐢熸垚瀛愪换鍔″け璐ワ紝
+ log.info("鐢熸垚瀛愪换鍔″け璐erviceSubtask鐨則askid涓猴細{},patid涓猴細{}", serviceSubtask.getTaskid(), serviceSubtask.getPatid());
+ PatMedOperationItem patMedOperationItem2 = new PatMedOperationItem();
+ patMedOperationItem2.setId(patMedOperationItem.getId());
+ patMedOperationItem2.setOpercheckFlag("2");
+ patMedOperationItem2.setRemark("鐢熸垚瀛愪换鍔″け璐� 4");
+ patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem2);
+ }
+ } catch (Exception e) {
+ //鍑洪敊鍥炴粴浜嬪姟
+
+ log.info("鐢熸垚瀛愪换鍔℃姤閿欏洖婊歴serviceSubtask鐨則askid涓猴細{},patid涓猴細{}", serviceSubtask.getTaskid(), serviceSubtask.getPatid());
+ PatMedOperationItem patMedOperationItem2 = new PatMedOperationItem();
+ patMedOperationItem2.setId(patMedOperationItem.getId());
+ patMedOperationItem2.setOpercheckFlag("2");
+ patMedOperationItem2.setRemark("鐢熸垚瀛愪换鍔℃姤閿欏洖婊� 4");
+ patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem2);
+ e.printStackTrace();
+ }
+ }
+
private Integer addServiceSubtaskPreachform(ServiceSubtask serviceSubtask, String sendstate) {
//灏唒reachformDesc鐨刯son瀵硅薄锛屾斁鍒發ist闆嗗悎涓�
ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
@@ -1083,6 +1203,71 @@
return serviceSubtask;
}
+ //灏佽serviceSubtask
+ private ServiceSubtask boxedServiceSubtaskForOp(ServiceTask serviceTask, PatMedOperation patMedOperation, PatMedOperationItem patMedOperationItem, PatArchive patArchive, String config) {
+ ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
+ serviceSubtask.setTaskid(serviceTask.getTaskid());
+ if (StringUtils.isNotEmpty(serviceTask.getLibtemplateid()))
+ serviceSubtask.setLibtemplateid(Long.valueOf(serviceTask.getLibtemplateid()));
+ serviceSubtask.setNurseId(patMedOperation.getNurseId());
+ serviceSubtask.setNurseName(patMedOperation.getNurseName());
+// serviceSubtask.setInhospid(patMedInhosp.getInhospid());
+ serviceSubtask.setDrcode(patMedOperation.getDrcode());
+ serviceSubtask.setDrname(patMedOperation.getDrname());
+ serviceSubtask.setDeptcode(patMedOperation.getDeptcode());
+ serviceSubtask.setDeptname(patMedOperation.getDeptname());
+
+ serviceSubtask.setTemplateid(serviceTask.getTemplateid());
+ serviceSubtask.setTemplatename(serviceTask.getTemplatename());
+ serviceSubtask.setPatid(patArchive.getId());
+ serviceSubtask.setSendname(patArchive.getName());
+ serviceSubtask.setSfzh(patArchive.getIdcardno());
+ serviceSubtask.setPhone(patArchive.getTelcode());
+ if (StringUtils.isBlank(patArchive.getTelcode())) serviceSubtask.setPhone(patArchive.getRelativetelcode());
+ serviceSubtask.setSex(patArchive.getSex());
+ serviceSubtask.setAge(patArchive.getAge());
+ serviceSubtask.setSendstate(2L);
+ serviceSubtask.setManagementDoctor(patMedOperation.getDrname());
+ serviceSubtask.setManagementDoctorCode(patMedOperation.getDrcode());
+// serviceSubtask.setStarttime(patMedInhosp.getStarttime());
+// serviceSubtask.setEndtime(patMedInhosp.getEndtime());
+
+ serviceSubtask.setServiceType(serviceTask.getServiceType());
+ serviceSubtask.setPreachform(serviceTask.getPreachform());
+ serviceSubtask.setHospType("2");
+ serviceSubtask.setCreateTime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ serviceSubtask.setCreateBy(patMedOperation.getNurseName());
+// serviceSubtask.setLeavehospitaldistrictcode(patArchive.getLeavehospitaldistrictcode());
+// serviceSubtask.setLeavehospitaldistrictname(patArchive.getLeavehospitaldistrictname());
+ serviceSubtask.setOperationItemId(patMedOperationItem.getId());
+ serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
+ serviceSubtask.setUpdateTime(new Date());
+ //璁剧疆鍙戦�佹椂闂�
+ if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
+ Date newDate = null;
+ //todo
+ newDate = addDays(patMedOperation.getCreateTime(), serviceTask.getSendDay().intValue());
+ serviceSubtask.setLongSendTime(newDate);
+ serviceSubtask.setVisitTime(newDate);
+
+ //濡傛灉鏄�氱煡鐨勮瘽锛岄渶瑕佹彁鍓嶅嚑澶╁皢閫氳繃鐭俊鍙戝嚭鍘伙紙鍏蜂綋鍑犲ぉ锛岃繖涓彲浠ラ厤缃湪sys_conf琛ㄤ腑锛�
+ if ("3".equals(serviceTask.getType())) {
+ serviceSubtask.setVisitTime(minusDay(newDate, StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
+ }
+
+ //鎮ｈ�呭彂閫佹椂闂�
+ if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
+ String remark = patArchive.getNotrequiredreason();
+ serviceSubtask.setRemark(remark);
+ serviceSubtask.setResult("error");
+ serviceSubtask.setTaskSituation(6);
+ //涓嶆墽琛�
+ serviceSubtask.setSendstate(4L);
+ }
+ return serviceSubtask;
+ }
+
/**
* 鍑忓幓鐩稿簲澶╂暟
*
--
Gitblit v1.9.3