From 5dcd6447f315e821727508cd26bf05f8220b39c8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 09 四月 2026 13:54:47 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 442 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 424 insertions(+), 18 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 605dd8a..142cb85 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
+import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
import com.smartor.service.IPatMedInhospService;
import lombok.extern.slf4j.Slf4j;
@@ -40,6 +41,8 @@
@Autowired
private ServiceTaskdiagMapper serviceTaskdiagMapper;
@Autowired
+ private ServiceTaskoperMapper serviceTaskoperMapper;
+ @Autowired
private PatArchiveMapper patArchiveMapper;
@Autowired
private PatArchiveImportMapper patArchiveImportMapper;
@@ -49,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;
@@ -253,8 +261,8 @@
for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config);
}
- patMedInhosp1.setDeptcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+// patMedInhosp1.setDeptcheckFlag("1");
+// patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
}
} catch (Exception e) {
@@ -307,8 +315,8 @@
for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiBQ1, patArchive, 2, config);
}
- pmiBQ1.setWardcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
+// pmiBQ1.setWardcheckFlag("1");
+// patMedInhospMapper.updatePatMedInhosp(pmiBQ1);
}
@@ -363,8 +371,8 @@
for (ServiceTaskdiag serviceTaskdept1 : serviceTaskdiags) {
writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiJB, patArchive, 3, config);
}
- pmiJB.setDiagcheckFlag("1");
- patMedInhospMapper.updatePatMedInhosp(pmiJB);
+// pmiJB.setDiagcheckFlag("1");
+// patMedInhospMapper.updatePatMedInhosp(pmiJB);
}
} catch (Exception e) {
@@ -373,6 +381,48 @@
pmiJB.setDiagcheckFlag("2");
pmiJB.setLongTaskReason("浜哄憳鐤剧梾澶勭悊寮傚父锛�" + e.getMessage());
patMedInhospMapper.updatePatMedInhosp(pmiJB);
+ }
+ }
+// 鎵嬫湳闅忚
+ 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);
}
}
}
@@ -388,6 +438,149 @@
}
return 1;
}
+
+ /**
+ * 澶氱淮搴﹂殢璁�
+ * @param config
+ * @return
+ */
+ public int dealOutHospInfoByDimension(String config) {
+ // 涓�娆℃�ф煡鍑烘墍鏈夐渶瑕佸鐞嗙殑鍑洪櫌鎮ｈ�咃紙涓変釜缁村害浠绘剰涓�涓湭瀹屾垚锛�
+ List<PatMedInhosp> patList = patMedInhospMapper.selectNeedProcessList();
+ log.info("銆愮粺涓�鎵弿銆戝緟澶勭悊鎮ｈ�呮暟锛歿}", patList.size());
+
+ for (PatMedInhosp patMedInhosp1 : patList) {
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
+ if (Objects.isNull(patArchive)) {
+ // 涓変釜缁村害閮芥爣璁颁负澶辫触
+ markAllFlagsAsError(patMedInhosp1, "鎮ｈ�呭熀鏈俊鎭负绌�");
+ continue;
+ }
+
+ // 鈹�鈹� 缁村害1锛氱瀹� 鈹�鈹�
+ if ("0".equals(patMedInhosp1.getDeptcheckFlag())) {
+ processTasksByDimension(patMedInhosp1, patArchive, config, 1);
+ }
+
+ // 鈹�鈹� 缁村害2锛氱梾鍖� 鈹�鈹�锛堟柊鍗庡尰闄㈣烦杩囷級
+ if (!active.equals("xh") && "0".equals(patMedInhosp1.getWardcheckFlag())) {
+ processTasksByDimension(patMedInhosp1, patArchive, config, 2);
+ }
+
+ // 鈹�鈹� 缁村害3锛氱柧鐥� 鈹�鈹�锛堟柊鍗庡尰闄㈣烦杩囷級
+ if (!active.equals("xh") && "0".equals(patMedInhosp1.getDiagcheckFlag())) {
+ processTasksByDimension(patMedInhosp1, patArchive, config, 3);
+ }
+ }
+ return 1;
+ }
+
+ /**
+ * 鎸夌淮搴︽壘鍒版墍鏈夊尮閰嶉暱鏈熶换鍔★紝鎵归噺鐢熸垚 subtask
+ * type: 1=绉戝, 2=鐥呭尯, 3=鐤剧梾
+ */
+ private void processTasksByDimension(PatMedInhosp patMedInhosp1,
+ PatArchive patArchive,
+ String config, int type) {
+ List<Long> matchedTaskIds = findMatchingTaskIds(patMedInhosp1, type);
+
+ if (CollectionUtils.isEmpty(matchedTaskIds)) {
+ String reason = getDimensionReason(type);
+ markFlagAsNoConfig(patMedInhosp1, type, reason);
+ return;
+ }
+
+ // 涓�鏉� inhosp 璁板綍 鈫� 澶氫釜鍖归厤浠诲姟 鈫� 澶氭潯 subtask
+ for (Long taskId : matchedTaskIds) {
+ writeInSubTask(taskId, true, patMedInhosp1, patArchive, type, config);
+ }
+ }
+
+ private String getDimensionReason(int type){
+ switch (type) {
+ case 1: { // 绉戝
+ return "鏈壘鍒扮瀹ゅ尮閰嶇殑闀挎湡浠诲姟";
+ }
+ case 2: { // 鐥呭尯
+ return "鏈壘鍒扮梾鍖哄尮閰嶇殑闀挎湡浠诲姟";
+ }
+ case 3: { // 鐤剧梾
+ return "鏈壘鍒扮柧鐥呭尮閰嶇殑闀挎湡浠诲姟";
+ }
+ }
+ return "澶氱淮闀挎湡浠诲姟-鍖归厤绫诲瀷涓虹┖";
+ }
+
+ private void markFlagAsNoConfig(PatMedInhosp patMedInhosp,
+ int type,
+ String reason){
+ switch (type) {
+ case 1: { // 绉戝
+ patMedInhosp.setDeptcheckFlag("2");
+ patMedInhosp.setRemark(reason);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+ break;
+ }
+ case 2: { // 鐥呭尯
+ patMedInhosp.setWardcheckFlag("2");
+ patMedInhosp.setRemark(reason);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+ break;
+ }
+ case 3: { // 鐤剧梾
+ patMedInhosp.setDiagcheckFlag("2");
+ patMedInhosp.setRemark(reason);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+ break;
+ }
+ }
+
+ }
+
+ private void markAllFlagsAsError(PatMedInhosp patMedInhosp,
+ String reason){
+ patMedInhosp.setDeptcheckFlag("2");
+ patMedInhosp.setWardcheckFlag("2");
+ patMedInhosp.setDiagcheckFlag("2");
+ patMedInhosp.setRemark(reason);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+ }
+ /**
+ * 鏍规嵁缁村害绫诲瀷鏌ヨ鍖归厤鐨勯暱鏈熶换鍔� ID 鍒楄〃
+ */
+ private List<Long> findMatchingTaskIds(PatMedInhosp patMedInhosp1, int type) {
+ switch (type) {
+ case 1: { // 绉戝
+ ServiceTaskdept query = new ServiceTaskdept();
+ query.setLongtask(1L);
+ query.setDeptCode(patMedInhosp1.getLeaveldeptcode());
+ query.setDeptType("1");
+ query.setOrgid(patMedInhosp1.getOrgid());
+ return serviceTaskdeptMapper.selectServiceTaskdeptList(query)
+ .stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
+ }
+ case 2: { // 鐥呭尯
+ ServiceTaskdept query = new ServiceTaskdept();
+ query.setLongtask(1L);
+ query.setDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
+ query.setDeptType("2");
+ query.setOrgid(patMedInhosp1.getOrgid());
+ return serviceTaskdeptMapper.selectServiceTaskdeptList(query)
+ .stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
+ }
+ case 3: { // 鐤剧梾
+ if (StringUtils.isEmpty(patMedInhosp1.getLeaveicd10code())) return Collections.emptyList();
+ ServiceTaskdiag query = new ServiceTaskdiag();
+ query.setLongtask(1L);
+ query.setIcd10code(patMedInhosp1.getLeaveicd10code());
+ query.setOrgid(patMedInhosp1.getOrgid());
+ return serviceTaskdiagMapper.selectServiceTaskdiagList(query)
+ .stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
+ }
+ }
+ return Collections.emptyList();
+ }
+
//
// @Override
@@ -547,6 +740,15 @@
return calendar.getTime();
}
+ /**
+ *
+ * @param taskid 浠诲姟id
+ * @param check 鏄惁闇�瑕佹牎楠�
+ * @param patMedInhosp1 鐥呬汉鍑哄叆闄俊鎭�
+ * @param patArchive 鐥呬汉淇℃伅
+ * @param type 闅忚绫诲瀷(1-绉戝锛�2-鐥呭尯锛�3-鐤剧梾锛�
+ * @param config 閰嶇疆淇℃伅 visit.early.day
+ */
//灏嗘偅鑰呮斁鍒皊ubtask涓�
private void writeInSubTask(Long taskid, Boolean check, PatMedInhosp patMedInhosp1, PatArchive patArchive, Integer type, String config) {
String longTaskReason = patMedInhosp1.getLongTaskReason();
@@ -600,12 +802,12 @@
//鍏堝垽鏂竴涓嬶紝鏄惁闇�瑕佹牎楠�
if (check && (Objects.isNull(serviceSubtask.getTaskSituation()) || serviceSubtask.getTaskSituation() != 6)) {
//鍦ㄦ柊澧炰箣鍓嶏紝鍏堥�氳繃鎮ｈ�匢D锛宻endstate=2鏌ヨ涓�涓嬶紝鍦ㄦ墍鏈夐暱鏈熶换鍔′腑锛屾槸涓嶆槸杩樻湁璇ユ偅鑰呭緟鎵ц鐨勪换鍔★紝鏈夌殑璇�,姣旇緝涔嬪墠鐨別ndtime鏄惁灏忎簬褰撳墠鐨別ndtaime,濡傛灉涔嬪墠鐨勫皬浜庣幇鍦ㄧ殑锛屽垯鐩存帴灏嗕箣鍓嶇殑鍋滄帀锛堝師鍥犲啀鍏ラ櫌锛�
- ServiceSubtaskVO subtask = new ServiceSubtaskVO();
+ 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);
+// log.info("璇ユ偅鑰呭緟鎵ц鐨勪换鍔�:{}", CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.size() : null);
if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
@@ -749,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());
@@ -834,13 +1163,16 @@
if (!Objects.isNull(patMedInhosp1.getEndtime())) {
newDate = addDays(patMedInhosp1.getEndtime(), serviceTask.getSendDay().intValue());
} else {
+ patMedInhosp1.setDeptcheckFlag("2");
+ patMedInhosp1.setRemark(patMedInhosp1.getRemark() + "& 璇ユ偅鑰呯柧鐥呭嚭闄㈡椂闂翠负绌�,鍑洪櫌璁板綍ID涓�:" + patMedInhosp1.getInhospid());
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
//濡傛灉鍑洪櫌鏃堕棿涓虹┖锛屽垯杩斿洖涓�涓柊瀵硅薄
return new ServiceSubtask();
}
serviceSubtask.setLongSendTime(newDate);
serviceSubtask.setVisitTime(newDate);
- if (patMedInhosp1.getFudate() != null) serviceSubtask.setVisitTime(patMedInhosp1.getFudate());
+// if (patMedInhosp1.getFudate() != null && !patMedInhosp1.getOrgid().equals("47255004333112711A1001")) serviceSubtask.setVisitTime(patMedInhosp1.getFudate());
//濡傛灉鏄�氱煡鐨勮瘽锛岄渶瑕佹彁鍓嶅嚑澶╁皢閫氳繃鐭俊鍙戝嚭鍘伙紙鍏蜂綋鍑犲ぉ锛岃繖涓彲浠ラ厤缃湪sys_conf琛ㄤ腑锛�
if ("3".equals(serviceTask.getType())) {
serviceSubtask.setVisitTime(minusDay(newDate, StringUtils.isNotEmpty(config) ? Integer.parseInt(config) : 0));
@@ -857,6 +1189,71 @@
}
}
+ }
+
+ //鎮ｈ�呭彂閫佹椂闂�
+ 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;
+ }
+
+ //灏佽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));
}
//鎮ｈ�呭彂閫佹椂闂�
@@ -894,7 +1291,7 @@
for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
try {
//鑾峰彇褰撳墠鍏ラ櫌鎮ｈ�呯殑寰呮墽琛岀殑鍑洪櫌瀛愪换鍔￠殢璁夸俊鎭�
- ServiceSubtaskVO subtask = new ServiceSubtaskVO();
+ ServiceSubtaskEntity subtask = new ServiceSubtaskEntity();
subtask.setPatid(patMedInhosp1.getPatid());
subtask.setSendstate(2L);
List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
@@ -905,15 +1302,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