From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 716 ----------------------------------------------------------
1 files changed, 11 insertions(+), 705 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 e299c66..6c08431 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -5,13 +5,10 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.service.IConfigService;
import com.ruoyi.common.core.service.dto.PatMedReq;
import com.ruoyi.common.core.service.dto.PatMedRes;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.ruoyi.inhospvisit.domain.PatMedInhospDTO;
@@ -24,12 +21,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
-import java.io.IOException;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.*;
-import java.util.stream.Collectors;
-
import com.ruoyi.othervisit.domain.PatMedOperationItem;
import com.ruoyi.inhospvisit.domain.PatMedInhospVO;
import com.ruoyi.inhospvisit.domain.PatMedInhosp;
@@ -39,7 +33,6 @@
import com.ruoyi.task.domain.ServiceTask;
import com.ruoyi.task.domain.ServiceTaskdept;
import com.ruoyi.task.domain.ServiceTaskdiag;
-import com.ruoyi.task.domain.ServiceTaskmedical;
import com.ruoyi.task.domain.ServiceTaskoper;
import com.ruoyi.task.domain.ServiceTaskRule;
import com.ruoyi.task.domain.ServiceTaskSchedule;
@@ -48,13 +41,16 @@
import com.ruoyi.task.mapper.ServiceTaskdeptMapper;
import com.ruoyi.task.mapper.ServiceTaskdiagMapper;
import com.ruoyi.task.mapper.ServiceTaskMapper;
-import com.ruoyi.task.mapper.ServiceTaskmedicalMapper;
import com.ruoyi.task.mapper.ServiceTaskoperMapper;
import com.ruoyi.task.mapper.ServiceTaskRuleMapper;
import com.ruoyi.task.mapper.ServiceTaskScheduleDetailMapper;
import com.ruoyi.task.mapper.ServiceTaskScheduleMapper;
import com.ruoyi.task.domain.ServiceSubtaskPreachform;
import com.ruoyi.task.common.ScheduleSubtaskBuilder;
+import com.ruoyi.task.mapper.ServiceSubtaskPreachformMapper;
+import com.ruoyi.patarchive.domain.PatArchiveImport;
+import com.ruoyi.patarchive.mapper.PatArchiveImportMapper;
+import com.ruoyi.patarchive.mapper.PatArchiveMapper;
/**
* 鎮ｈ�呬綇闄㈣褰昐ervice涓氬姟灞傚鐞�
*
@@ -64,6 +60,7 @@
@Slf4j
@Service
public class PatMedInhospServiceImpl implements IPatMedInhospService {
+
@Autowired
private InhospVisitFacade inhospVisitFacade;
@@ -89,14 +86,10 @@
@Autowired
private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
@Autowired
- private ServiceTaskmedicalMapper serviceTaskmedicalMapper;
- @Autowired
private ServiceTaskRuleMapper serviceTaskRuleMapper;
@Value("${spring.profiles.active}")
private String active;
- @Autowired
- private IConfigService iSysConfigService;
@Autowired
private ServiceTaskScheduleMapper serviceTaskScheduleMapper;
@@ -104,18 +97,6 @@
private ScheduleSubtaskBuilder scheduleSubtaskBuilder;
@Autowired
private ServiceTaskScheduleDetailMapper serviceTaskScheduleDetailMapper;
-
-
- /**
- * 鏌ヨ鎮ｈ�呬綇闄㈣褰�
- *
- * @param inhospid 鎮ｈ�呬綇闄㈣褰曚富閿�
- * @return 鎮ｈ�呬綇闄㈣褰�
- */
- @Override
- public PatMedInhosp selectPatMedInhospByInhospid(Long inhospid) {
- return inhospVisitFacade.selectPatMedInhospByInhospid(inhospid);
- }
@Override
public List<PatMedInhosp> selectPatMedInhosp(PatMedInhosp patMedInhosp) {
@@ -267,20 +248,6 @@
}
/**
- * 鏌ヨ鍑哄叆闄汉娆�
- *
- * @param patMedReq
- * @return
- */
- @Override
- public PatMedRes selectPatMedInhospListCount(PatMedReq patMedReq) {
- PatMedRes patMedRes = null;
- // 鑾峰彇褰撳墠鐧婚檰浜虹殑閮ㄩ棬鏉冮檺
- patMedRes = inhospVisitFacade.selectPatMedInhospCount(patMedReq);
- return patMedRes;
- }
-
- /**
* 鏂板鎮ｈ�呬綇闄㈣褰�
*
* @param patMedInhosp 鎮ｈ�呬綇闄㈣褰�
@@ -304,333 +271,6 @@
patMedInhosp.setUpdateTime(DateUtils.getNowDate());
return inhospVisitFacade.updatePatMedInhosp(patMedInhosp);
}
-
- /**
- * 鎵归噺鍒犻櫎鎮ｈ�呬綇闄㈣褰�
- *
- * @param inhospids 闇�瑕佸垹闄ょ殑鎮ｈ�呬綇闄㈣褰曚富閿�
- * @return 缁撴灉
- */
- @Override
- public int deletePatMedInhospByInhospids(Long[] inhospids) {
- return inhospVisitFacade.deletePatMedInhospByInhospids(inhospids);
- }
-
- /**
- * 鍒犻櫎鎮ｈ�呬綇闄㈣褰曚俊鎭�
- *
- * @param inhospid 鎮ｈ�呬綇闄㈣褰曚富閿�
- * @return 缁撴灉
- */
- @Override
- public int deletePatMedInhospByInhospid(Long inhospid) {
- return inhospVisitFacade.deletePatMedInhospByInhospid(inhospid);
- }
-
- /**
- * 鍒犻櫎鎮ｈ�呬綇闄㈣褰曚俊鎭�
- *
- * @param inhospno 鎮ｈ�呬綇闄㈢紪鐮�
- * @return 缁撴灉
- */
- @Override
- public int deletePatMedInhospByInhospno(String inhospno) {
- return inhospVisitFacade.deletePatMedInhospByInhospno(inhospno);
- }
-
- @Override
- public int dealOutHospInfo(String config) {
- PatMedInhosp pmks = new PatMedInhosp();
- pmks.setDeptcheckFlag("0");
- pmks.setInhospstate("1");
- pmks.setFuflag("1");
- List<PatMedInhosp> patMedInhosps = inhospVisitFacade.selectPatMedInhospList(pmks);
-
- //1.鍏ラ櫌瀹ｆ暀
- String helibrarySwitch = iSysConfigService.selectConfigByKey("in.helibrary.switch");
- if (StringUtils.isNotEmpty(helibrarySwitch) && "2".equals(helibrarySwitch)) {
-
- //1.1 绉戝
- for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
- //鑾峰彇鎮ｈ�呬俊鎭�
- PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
- if (Objects.isNull(patArchive)) {
- patMedInhosp1.setInDeptcheckFlag("2");
- patMedInhosp1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
- inhospVisitFacade.updatePatMedInhosp(patMedInhosp1);
- continue;
- }
- try {
- //鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑鍏ラ櫌闀挎湡瀹ｆ暀浠诲姟
- ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
- serviceTaskdept.setLongtask(1L);
- serviceTaskdept.setDeptCode(patMedInhosp1.getDeptcode());
- serviceTaskdept.setDeptType("1");
- serviceTaskdept.setServiceType("17");
- serviceTaskdept.setOrgid(patMedInhosp1.getOrgid());
- List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
- //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
- if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
- PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
- patMedInhosp1.setInDeptcheckFlag("2");
- patMedInhosp1.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆鍏ラ櫌闀挎湡瀹ｆ暀浠诲姟;" : "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆鍏ラ櫌闀挎湡瀹ｆ暀浠诲姟;");
- inhospVisitFacade.updatePatMedInhosp(patMedInhosp1);
- } else {
- for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
- writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 4, config);
- }
- }
-
- } catch (Exception e) {
- log.error("浜哄憳鍏ラ櫌绉戝澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
- patMedInhosp1.setInDeptcheckFlag("2");
- patMedInhosp1.setLongTaskReason("浜哄憳鍏ラ櫌绉戝澶勭悊鍑哄紓甯镐簡");
- inhospVisitFacade.updatePatMedInhosp(patMedInhosp1);
- }
- }
-
-
- //1.2 鐥呭尯
- pmks.setInDeptcheckFlag(null);
- pmks.setInWardcheckFlag("0");
- pmks.setDeptcheckFlag(null);
- List<PatMedInhosp> inPatMedInhospsWard = inhospVisitFacade.selectPatMedInhospList(pmks);
- for (PatMedInhosp patMedInhosp1 : inPatMedInhospsWard) {
- //鑾峰彇鎮ｈ�呬俊鎭�
- PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
- if (Objects.isNull(patArchive)) {
- patMedInhosp1.setInDeptcheckFlag("2");
- patMedInhosp1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
- inhospVisitFacade.updatePatMedInhosp(patMedInhosp1);
- continue;
- }
- //鏍规嵁鎮ｈ�呮墍鍦ㄧ梾鍖猴紝鑾峰彇璇ョ梾鍖虹殑鍏ラ櫌闀挎湡瀹ｆ暀浠诲姟锛堜細鍑虹幇涓�涓棶棰橈紝绉戝鍜岀梾鍖哄彂鐨勫悓涓�涓ā鏉匡級
- ServiceTaskdept serviceTaskWard = new ServiceTaskdept();
- serviceTaskWard.setLongtask(1L);
- serviceTaskWard.setDeptCode(patMedInhosp1.getHospitaldistrictcode());
- serviceTaskWard.setDeptType("2");
- serviceTaskWard.setServiceType("17");
- serviceTaskWard.setOrgid(patMedInhosp1.getOrgid());
- List<ServiceTaskdept> serviceTaskWardList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskWard);
- //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
- if (CollectionUtils.isEmpty(serviceTaskWardList) || serviceTaskWardList.size() == 0) {
- PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
- patMedInhosp1.setInDeptcheckFlag("2");
- patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ梾鍖烘湭閰嶇疆鍏ラ櫌闀挎湡瀹ｆ暀浠诲姟;");
- inhospVisitFacade.updatePatMedInhosp(patMedInhosp1);
- } else {
- for (ServiceTaskdept serviceTaskdept1 : serviceTaskWardList) {
- writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 5, config);
- }
- }
- }
- }
-
- //2.鑽搧瀹ｆ暀(鐪佺珛鍚屽痉鐨勯渶姹傦紝鍏跺畠鍦版柟娌℃彁)
- if (active.equals("sltd")) {
- for (PatMedInhosp patMedInhosp : patMedInhosps) {
- String medicalCode = patMedInhosp.getMedicalCode();
- if (StringUtils.isNotEmpty(medicalCode)) {
- String[] split = medicalCode.split(",");
- // 闃插尽鎬х紪绋嬶細纭繚 medicalCompany 鍜� medicalName 涓嶄负 null
- String medicalCompanyStr = patMedInhosp.getMedicalCompany() != null ? patMedInhosp.getMedicalCompany() : "";
- String medicalNameStr = patMedInhosp.getMedicalName() != null ? patMedInhosp.getMedicalName() : "";
- String[] medicalCompanyArray = medicalCompanyStr.split(",");
- String[] medicalNameArray = medicalNameStr.split(",");
-
- for (int i = 0; i < split.length; i++) {
- ServiceTaskmedical serviceTaskmedical = new ServiceTaskmedical();
- //鎷胯嵂鍝佺紪鐮佸拰鍏徃鍘绘煡
- serviceTaskmedical.setMedicalCode(split[i]);
- // 闃叉涓嬫爣瓒婄晫锛氬鏋滄暟缁勯暱搴︿笉涓�鑷达紝鍙栨渶灏忛暱搴�
- if (i < medicalCompanyArray.length) {
- serviceTaskmedical.setMedicalCompany(medicalCompanyArray[i]);
- } else {
- log.warn("銆愯嵂鍝佸鏁欍�戣嵂鍝佺紪鐮亄}瀵瑰簲鐨勫叕鍙镐俊鎭笅鏍囪秺鐣岋紝medicalCompany 鏁扮粍闀垮害={}, 褰撳墠绱㈠紩={}", split[i], medicalCompanyArray.length, i);
- serviceTaskmedical.setMedicalName(""); // 瓒婄晫鏃惰缃负绌�
- }
- List<ServiceTaskmedical> serviceTaskmedicals = serviceTaskmedicalMapper.selectServiceTaskmedicalList(serviceTaskmedical);
- if (CollectionUtils.isNotEmpty(serviceTaskmedicals)) {
- PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp.getPatid());
- // check=true锛岃 writeInSubTask 鍐呴儴鍋氬幓閲嶆牎楠�
- writeInSubTask(serviceTaskmedicals.get(0).getTaskId(), true, patMedInhosp, patArchive, 0, config);
- }
- //鏌ヤ笉鍒扮殑鑽搧灏辨槸涓嶉渶瑕佸鏁欑殑锛屽氨涓嶇浜�
- }
- }
- }
- }
- //3.鍑洪櫌闅忚 - 鍩轰簬瑙勫垯鐨勪换鍔＄敓鎴�
- // 鑾峰彇鎵�鏈夐渶瑕佸鐞嗙殑鍑洪櫌鎮ｈ�咃紙绉戝缁村害鏈鐞嗭級
-
- addSubTaskByRule(config, patMedInhosps);
- if (!active.equals("xh")) {
- addOperationSubTask(config);
- }
-
-
- //鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭ｄ箣鍓嶇殑鍑洪櫌鎮ｈ�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
- PatMedInhosp patMedInhosp = new PatMedInhosp();
- patMedInhosp.setDeptcheckFlag("0");
- patMedInhosp.setInhospstate("0");
- List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp);
- if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) {
- dealInHospInfo(patMedInhospList);
- }
- return 1;
- }
-
- /**
- * 浠诲姟缁勯殢璁�
- *
- * @param config
- * @return
- */
- public int dealOutHospInfoBySchedule(String config) {
-
- ServiceTask serviceTaskVo = new ServiceTask();
- serviceTaskVo.setLongTask(1);
- serviceTaskVo.setAppltype("5");
- List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(serviceTaskVo);
-
- if (CollectionUtils.isNotEmpty(serviceTasks)) {
- for (ServiceTask serviceTask : serviceTasks) {
- if (!ObjectUtils.isEmpty(serviceTask.getTaskid())) {
- ServiceTaskSchedule serviceTaskSchedule = new ServiceTaskSchedule();
- ServiceTaskSchedule taskSchedule = new ServiceTaskSchedule();
- taskSchedule.setTaskid(serviceTask.getTaskid());
- List<ServiceTaskSchedule> serviceTaskSchedules = serviceTaskScheduleMapper.selectServiceTaskScheduleList(taskSchedule);
- if (CollectionUtils.isNotEmpty(serviceTaskSchedules)) {
- serviceTaskSchedule = serviceTaskSchedules.get(0);
- String deptCodes = serviceTaskSchedule.getDeptCodes();
- String wardCodes = serviceTaskSchedule.getWardCodes();
- String icd10Codes = serviceTaskSchedule.getIcd10Codes();
- String opLevelCodes = serviceTaskSchedule.getOplevelCodes();
-
- List<String> icd10CodeList = new ArrayList<>();
- List<String> opLevelCodeList = new ArrayList<>();
- List<String> deptCodeList = new ArrayList<>();
- List<String> wardCodeList = new ArrayList<>();
-
- /**
- * 闅忚绫诲瀷(1-绉戝锛�2-鐥呭尯锛�3-鐤剧梾 4-鍏ラ櫌绉戝 5-鍏ラ櫌鐥呭尯 6-鎵嬫湳)
- */
- Integer type = 1;
- if (StringUtils.isNotEmpty(deptCodes)) {
- type = 1;
- deptCodeList = new ArrayList<>(Arrays.asList(deptCodes.split(",")));
- }
- if (StringUtils.isNotEmpty(wardCodes)) {
- type = 2;
- wardCodeList = new ArrayList<>(Arrays.asList(wardCodes.split(",")));
- }
- if (StringUtils.isNotEmpty(icd10Codes)) {
- type = 3;
- icd10CodeList = new ArrayList<>(Arrays.asList(icd10Codes.split(",")));
- }
- if (StringUtils.isNotEmpty(opLevelCodes)) {
- type = 6;
- opLevelCodeList = new ArrayList<>(Arrays.asList(opLevelCodes.split(",")));
- }
- //闈炴墜鏈鐞嗘柟寮�
- if (type != 6) {
- PatMedInhosp patMedInhospVo = new PatMedInhosp();
- patMedInhospVo.setScheduleCheckFlag("0");
- patMedInhospVo.setInhospstate("1");
- patMedInhospVo.setFuflag("1");
-// patMedInhospVo.setDeptcodeList(deptCodeList);
- patMedInhospVo.setLeaveldeptcodes(deptCodeList);
- patMedInhospVo.setLeavehospitaldistrictcodes(wardCodeList);
- patMedInhospVo.setIcd10codeList(icd10CodeList);
- List<PatMedInhosp> patList = inhospVisitFacade.selectPatMedInhospList(patMedInhospVo);
- log.info("dealOutHospInfoBySchedule 浠诲姟缁勯殢璁�, taskid = {}, 鎵弿鎮ｈ�呬汉鏁� {}", serviceTask.getTaskid(), patList.size());
-
- for (PatMedInhosp patMedInhosp : patList) {
- ServiceTaskScheduleDetail scheduleDetailVo = new ServiceTaskScheduleDetail();
- scheduleDetailVo.setTaskid(serviceTask.getTaskid());
- scheduleDetailVo.setScheduleid(serviceTaskSchedule.getId());
- List<ServiceTaskScheduleDetail> serviceTaskScheduleDetails = serviceTaskScheduleDetailMapper.selectServiceTaskScheduleDetailList(scheduleDetailVo);
-
- PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp.getPatid());
- if (Objects.isNull(patArchive)) {
- continue;
- }
- //灏佽serviceSubtask
-
- ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp, patArchive, config, type);
- List<Map<String, Object>> preachformList = new ArrayList<>();
- if (StringUtils.isNotEmpty(serviceTask.getPreachformDesc())) {
- try {
- ObjectMapper objectMapper = new ObjectMapper();
- preachformList = objectMapper.readValue(serviceTask.getPreachformDesc(), List.class);
- } catch (Exception e) {
- log.error("浠诲姟缁刾reachformDesc瑙ｆ瀽澶辫触,taskid={},inhospid={}", serviceTask.getTaskid(), patMedInhosp.getInhospid());
- }
- }
- scheduleSubtaskBuilder.buildSubtasksForPatient(serviceTask, serviceTaskSchedule, serviceTaskScheduleDetails, serviceSubtask, preachformList);
- //缃杞撼鍏ユ爣璁帮紝閬垮厤涓嬫鎵弿閲嶅鐢熸垚锛堝悗缁疆娆＄敱 rollTaskGroupCycle 璐熻矗锛�
- PatMedInhosp flagUpd = new PatMedInhosp();
- flagUpd.setInhospid(patMedInhosp.getInhospid());
- flagUpd.setScheduleCheckFlag("1");
- inhospVisitFacade.updatePatMedInhosp(flagUpd);
- }
- } else {
- //浠诲姟缁� - 鎵嬫湳闅忚
- if (CollectionUtils.isNotEmpty(opLevelCodeList)) {
- PatMedOperationItem pmoi = new PatMedOperationItem();
- //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
- pmoi.setOpercheckFlag("0");
- pmoi.setMainFlag("1");
- pmoi.setDeptCodes(deptCodeList);
- pmoi.setWardCodes(wardCodeList);
- pmoi.setOpLevelCodes(opLevelCodeList);
-
- //姣忔鏌ヨ鍙煡鏈�澶х殑鎵嬫湳绛夌骇璁板綍
- List<PatMedOperationItem> patMedOperationItems = otherVisitFacade.selectOperationItemListMaxLevel(pmoi);
- for (PatMedOperationItem patMedOperationItem : patMedOperationItems) {
- PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOperationItem.getPatid());
- if (Objects.isNull(patArchive)) {
- continue;
- }
- PatMedInhosp patMedInhospVo = new PatMedInhosp();
- patMedInhospVo.setPatid((patMedOperationItem.getPatid()));
- patMedInhospVo.setScheduleCheckFlag("0");
- patMedInhospVo.setInhospstate("1");
- patMedInhospVo.setFuflag("1");
- List<PatMedInhosp> patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhospVo);
- if (CollectionUtils.isNotEmpty(patMedInhospList)) {
- ServiceTaskScheduleDetail scheduleDetailVo = new ServiceTaskScheduleDetail();
- scheduleDetailVo.setTaskid(serviceTask.getTaskid());
- scheduleDetailVo.setScheduleid(serviceTaskSchedule.getId());
- List<ServiceTaskScheduleDetail> serviceTaskScheduleDetails = serviceTaskScheduleDetailMapper.selectServiceTaskScheduleDetailList(scheduleDetailVo);
- //灏佽serviceSubtask
- ServiceSubtask serviceSubtask = boxedServiceSubtaskForOp(serviceTask, patMedInhospList.get(0), patMedOperationItem, patArchive, config);
- List<Map<String, Object>> preachformList = new ArrayList<>();
- if (StringUtils.isNotEmpty(serviceTask.getPreachformDesc())) {
- try {
- ObjectMapper objectMapper = new ObjectMapper();
- preachformList = objectMapper.readValue(serviceTask.getPreachformDesc(), List.class);
- } catch (Exception e) {
- log.error("浠诲姟缁�(鎵嬫湳)preachformDesc瑙ｆ瀽澶辫触,taskid={}", serviceTask.getTaskid());
- }
- }
- scheduleSubtaskBuilder.buildSubtasksForPatient(serviceTask, serviceTaskSchedule, serviceTaskScheduleDetails, serviceSubtask, preachformList);
- //缃杞撼鍏ユ爣璁帮紝閬垮厤閲嶅鐢熸垚
- PatMedInhosp flagUpd = new PatMedInhosp();
- flagUpd.setInhospid(patMedInhospList.get(0).getInhospid());
- flagUpd.setScheduleCheckFlag("1");
- inhospVisitFacade.updatePatMedInhosp(flagUpd);
- }
- }
- }
- }
- }
- }
- }
- }
- return 1;
- }
-
/**
* 鑾峰彇鍑洪櫌锛屼綇闄紝闂ㄨ瘖鏈嶅姟浜烘
@@ -1139,14 +779,14 @@
serviceSubtask.setInhospid(patMedInhosp1.getInhospid());
serviceSubtask.setDrcode(patMedInhosp1.getDrcode());
serviceSubtask.setDrname(patMedInhosp1.getDrname());
- serviceSubtask.setDeptcode(patMedInhosp1.getLeaveldeptcode());
- serviceSubtask.setDeptname(patMedInhosp1.getLeaveldeptname());
+ serviceSubtask.setLeaveldeptcode(patMedInhosp1.getLeaveldeptcode());
+ serviceSubtask.setLeaveldeptname(patMedInhosp1.getLeaveldeptname());
serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
if (type == 4 || type == 5) {
//璁剧疆鍏ラ櫌鐨�
- serviceSubtask.setDeptcode(patMedInhosp1.getDeptcode());
- serviceSubtask.setDeptname(patMedInhosp1.getDeptname());
+ serviceSubtask.setLeaveldeptcode(patMedInhosp1.getDeptcode());
+ serviceSubtask.setLeaveldeptname(patMedInhosp1.getDeptname());
serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getHospitaldistrictcode());
serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getHospitaldistrictname());
}
@@ -1252,8 +892,8 @@
serviceSubtask.setInhospid(patMedInhosp1.getInhospid());
serviceSubtask.setDrcode(patMedInhosp1.getDrcode());
serviceSubtask.setDrname(patMedInhosp1.getDrname());
- serviceSubtask.setDeptcode(patMedInhosp1.getLeaveldeptcode());
- serviceSubtask.setDeptname(patMedInhosp1.getLeaveldeptname());
+ serviceSubtask.setLeaveldeptcode(patMedInhosp1.getLeaveldeptcode());
+ serviceSubtask.setLeaveldeptname(patMedInhosp1.getLeaveldeptname());
serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
@@ -1372,297 +1012,6 @@
}
} catch (Exception e) {
log.error("鍏ラ櫌鏁版嵁淇℃伅鍑哄紓甯镐簡锛歿},{}", patMedInhosp1, e.getMessage());
- }
- }
- }
-
- @Override
- public void addOperationSubTask(String config) {
- // 鎵嬫湳闅忚
- PatMedOperationItem pmoi = new PatMedOperationItem();
- //鑾峰彇闇�瑕佸嚭闄㈡墜鏈殢璁匡紝鏈鐞嗙殑鏁版嵁
- if(!active.equals("hzszlyy")){
- pmoi.setInhospstate("1");
- }
- pmoi.setOpercheckFlag("0");
- pmoi.setMainFlag("1");
-
- //姣忔鏌ヨ鍙煡鏈�澶х殑鎵嬫湳绛夌骇璁板綍
- List<PatMedOperationItem> patMedOperationItems = otherVisitFacade.selectOperationItemListMaxLevel(pmoi);
- log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鎵嬫湳鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedOperationItems) ? patMedOperationItems.size() : null);
-
- for (PatMedOperationItem opItem : patMedOperationItems) {
-
- try {
- if (StringUtils.isEmpty(opItem.getOplevelcode())) {
- continue;
- }
- // 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
- List<ServiceTaskoper> serviceTaskopersDept = new ArrayList<>();
- if(StringUtils.isNotEmpty(opItem.getLeaveldeptcode())){
- ServiceTaskoper serviceTaskoper1 = new ServiceTaskoper();
- serviceTaskoper1.setLongtask(1L);
- serviceTaskoper1.setOrgid(opItem.getOrgid());
- serviceTaskoper1.setOplevelcode(opItem.getOplevelcode());
- serviceTaskoper1.setDeptCode(opItem.getLeaveldeptcode());
- serviceTaskopersDept = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper1);
- }
-
-
- List<ServiceTaskoper> serviceTaskopersWard = new ArrayList<>();
- if(StringUtils.isNotEmpty(opItem.getLeavehospitaldistrictcode())){
- ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
- serviceTaskoper2.setLongtask(1L);
- serviceTaskoper2.setOrgid(opItem.getOrgid());
- serviceTaskoper2.setOplevelcode(opItem.getOplevelcode());
- serviceTaskoper2.setWardCode(opItem.getLeavehospitaldistrictcode());
- serviceTaskopersWard = serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper2);
- }
-
-
- List<ServiceTaskoper> serviceTaskopers = new ArrayList<>();
- serviceTaskopers.addAll(serviceTaskopersDept);
- serviceTaskopers.addAll(serviceTaskopersWard);
- //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
- if (CollectionUtils.isEmpty(serviceTaskopers) || serviceTaskopers.size() == 0) {
- PatMedOperationItem patMedOperationItem = otherVisitFacade.selectOperationItemById(opItem.getId());
- patMedOperationItem.setOpercheckFlag("2");
- patMedOperationItem.setLongTaskReason("鎵�鎮ｇ殑鎵嬫湳鏈厤缃暱鏈熶换鍔�;");
- patMedOperationItem.setUpdateTime(new Date());
- otherVisitFacade.updateOperationItem(patMedOperationItem);
- } else {
- for (ServiceTaskoper serviceTaskoper : serviceTaskopers) {
- writeInSubTaskForOp(serviceTaskoper.getTaskId(), true, opItem, config);
- }
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- log.error("浜哄憳鎵嬫湳澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
- opItem.setUpdateTime(new Date());
- opItem.setOpercheckFlag("2");
- opItem.setLongTaskReason("浜哄憳鎵嬫湳澶勭悊寮傚父");
- otherVisitFacade.updateOperationItem(opItem);
- }
- }
- }
-
- private void addIcd10SubTask(String config) {
- PatMedInhosp pmjb = new PatMedInhosp();
- //鑾峰彇闇�瑕佸嚭闄㈢柧鐥呴殢璁匡紝鏈鐞嗙殑鏁版嵁
- pmjb.setDiagcheckFlag("0");
- pmjb.setInhospstate("1");
- pmjb.setFuflag("1");
- List<PatMedInhosp> patMedInhospJBs = inhospVisitFacade.selectPatMedInhospList(pmjb);
- log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鐤剧梾鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhospJBs) ? patMedInhospJBs.size() : null);
- for (PatMedInhosp patMedInhosp1 : patMedInhospJBs) {
- String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid());
- patMedInhosp1.setTagname(tagname);
- }
-
- for (PatMedInhosp pmiJB : patMedInhospJBs) {
- //鑾峰彇鎮ｈ�呬俊鎭�
- PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(pmiJB.getPatid());
- if (Objects.isNull(patArchive)) {
- pmiJB.setDiagcheckFlag("2");
- pmiJB.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
- inhospVisitFacade.updatePatMedInhosp(pmiJB);
- continue;
- }
- try {
- String errorIcd = null;
- if (StringUtils.isEmpty(pmiJB.getLeaveicd10code())) {
- continue;
- }
- // 鏍规嵁鎮ｈ�呯殑鐤剧梾锛岃幏鍙栬鐤剧梾鐨勯暱鏈熶换鍔�
- ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
- serviceTaskdiag.setLongtask(1L);
-// serviceTaskdiag.setServiceType("2");
- if (active.equals("nhfy")) {
- //鍗楀崕闄勪竴鐨刬cd10code鏈夐噸澶嶏紝鎵�浠ョ敤涓昏瘖鏂悕绉板幓鏌ヨ
- serviceTaskdiag.setIcd10name(pmiJB.getLeavediagname());
- if (StringUtils.isEmpty(pmiJB.getLeavediagname())) {
- errorIcd = "璇ユ偅鑰呬富璇婃柇鍚嶇О涓虹┖;";
- }
- } else {
- serviceTaskdiag.setIcd10code(pmiJB.getLeaveicd10code());
- if (StringUtils.isEmpty(pmiJB.getLeaveicd10code())) {
- errorIcd = "璇ユ偅鑰呬富璇婃柇ICD10鐮佷负绌�;";
- }
- }
- serviceTaskdiag.setOrgid(pmiJB.getOrgid());
- List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagListByIcdName(serviceTaskdiag);
-
- //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
- if (StringUtils.isNotEmpty(errorIcd)) {
- PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(pmiJB.getInhospid());
- pmiJB.setDiagcheckFlag("2");
- pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd);
- inhospVisitFacade.updatePatMedInhosp(pmiJB);
- } else if (CollectionUtils.isEmpty(serviceTaskdiags)) {
- errorIcd = "璇ユ偅鑰呮墍鎮ｇ柧鐥呮湭閰嶇疆闀挎湡浠诲姟;";
- PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(pmiJB.getInhospid());
- pmiJB.setDiagcheckFlag("2");
- pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd);
- inhospVisitFacade.updatePatMedInhosp(pmiJB);
- } else {
- int flag = 0;
- for (ServiceTaskdiag serviceTaskdept1 : serviceTaskdiags) {
- //蹇呴』绉戝鎴栫梾鍖鸿兘鍖归厤涓�,鎵嶅彲浠ョ敤杩欎釜鐤剧梾鍒涘缓瀛愪换鍔★紙涓昏澶勭悊涓�涓柧鐥呭湪澶氫釜鐥呭尯鎴栫瀹ゅ嚭鐜帮級
- if (StringUtils.isNotEmpty(serviceTaskdept1.getDeptCode()) && serviceTaskdept1.getDeptCode().equals(pmiJB.getLeaveldeptcode())) {
- writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiJB, patArchive, 3, config);
- flag = 1;
- } else if (StringUtils.isNotEmpty(serviceTaskdept1.getWardCode()) && serviceTaskdept1.getWardCode().equals(pmiJB.getLeavehospitaldistrictcode())) {
- writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiJB, patArchive, 3, config);
- flag = 1;
- }
- }
- if (flag == 0) {
- log.error("璇ョ瀹ゆ垨鐥呭尯瀵逛簬鎮ｈ�呮墍鎮ｇ柧鐥呮湭閰嶇疆闀挎湡浠诲姟,鎮ｈ�咃細{}", pmiJB.getInhospid());
- errorIcd = "璇ョ瀹ゆ垨鐥呭尯瀵逛簬鎮ｈ�呮墍鎮ｇ柧鐥呮湭閰嶇疆闀挎湡浠诲姟;";
- PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(pmiJB.getInhospid());
- pmiJB.setDiagcheckFlag("2");
- pmiJB.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorIcd : errorIcd);
- inhospVisitFacade.updatePatMedInhosp(pmiJB);
- }
-
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- log.error("浜哄憳鐤剧梾澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
- pmiJB.setDiagcheckFlag("2");
- pmiJB.setLongTaskReason("浜哄憳鐤剧梾澶勭悊寮傚父");
- inhospVisitFacade.updatePatMedInhosp(pmiJB);
- }
- }
- }
-
- private void addWardSubTask(String config) {
- PatMedInhosp pmbq = new PatMedInhosp();
- //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
- pmbq.setWardcheckFlag("0");
- pmbq.setInhospstate("1");
- pmbq.setFuflag("1");
- List<PatMedInhosp> patMedInhospBQs = inhospVisitFacade.selectPatMedInhospList(pmbq);
- log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌鐥呭尯鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhospBQs) ? patMedInhospBQs.size() : null);
- for (PatMedInhosp patMedInhosp1 : patMedInhospBQs) {
- String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid());
- patMedInhosp1.setTagname(tagname);
- }
-
- //鐥呭尯鏁版嵁澶勭悊
- for (PatMedInhosp pmiBQ1 : patMedInhospBQs) {
- if ("1".equals(pmiBQ1.getLeavehospitaldistrictcode()) && pmiBQ1.getDiagcheckFlag().equals("1")) {
- pmiBQ1.setWardcheckFlag("2");
- pmiBQ1.setLongTaskReason("鏍规嵁浜ゅ弶鐢熸垚闅忚浠诲姟瑙勫垯锛岀梾鍖轰换鍔″彲浠ヤ笉鐢ㄧ敓鎴�");
- inhospVisitFacade.updatePatMedInhosp(pmiBQ1);
- continue;
- }
-
- //鑾峰彇鎮ｈ�呬俊鎭�
- PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(pmiBQ1.getPatid());
- if (Objects.isNull(patArchive)) {
- pmiBQ1.setWardcheckFlag("2");
- pmiBQ1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
- inhospVisitFacade.updatePatMedInhosp(pmiBQ1);
- continue;
- }
- try {
- String errorreason = null;
- List<ServiceTaskdept> serviceTaskdeptList = null;
- if (!StringUtils.isEmpty(pmiBQ1.getLeavehospitaldistrictcode())) {
- ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
- serviceTaskdept.setLongtask(1L);
- serviceTaskdept.setDeptCode(pmiBQ1.getLeavehospitaldistrictcode());
- serviceTaskdept.setDeptType("2");
- serviceTaskdept.setServiceType("2");
- serviceTaskdept.setOrgid(pmiBQ1.getOrgid());
- serviceTaskdeptList = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
- if (CollectionUtils.isEmpty(serviceTaskdeptList)) {
- errorreason = "璇ユ偅鑰呮墍鍦ㄧ梾鍖烘湭閰嶇疆闀挎湡浠诲姟;";
- }
- } else {
- errorreason = "绂婚櫌鐥呭尯涓虹┖;";
- }
- //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
- if (StringUtils.isNotEmpty(errorreason)) {
- PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(pmiBQ1.getInhospid());
- pmiBQ1.setWardcheckFlag("2");
- pmiBQ1.setLongTaskReason(StringUtils.isNotEmpty(patMedInhosp.getLongTaskReason()) ? patMedInhosp.getLongTaskReason() + errorreason : errorreason);
- inhospVisitFacade.updatePatMedInhosp(pmiBQ1);
- } else {
- for (ServiceTaskdept serviceTaskdept1 : serviceTaskdeptList) {
- writeInSubTask(serviceTaskdept1.getTaskId(), true, pmiBQ1, patArchive, 2, config);
- }
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- log.error("浜哄憳鐥呭尯澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
- pmiBQ1.setWardcheckFlag("2");
- pmiBQ1.setLongTaskReason("浜哄憳鐥呭尯澶勭悊寮傚父");
- inhospVisitFacade.updatePatMedInhosp(pmiBQ1);
- }
- }
- }
-
- private void addDeptSubTask(String config) {
- //鑾峰彇闇�瑕佸嚭闄㈤儴闂ㄩ殢璁匡紝鏈鐞嗙殑鏁版嵁
- PatMedInhosp pmks = new PatMedInhosp();
- pmks.setDeptcheckFlag("0");
- pmks.setInhospstate("1");
- pmks.setFuflag("1");
- List<PatMedInhosp> patMedInhosps = inhospVisitFacade.selectPatMedInhospList(pmks);
- log.info("dealOutHospInfo闇�瑕佸鐞嗙殑鍑洪櫌閮ㄩ棬鎮ｈ�呬俊鎭細{}", CollectionUtils.isNotEmpty(patMedInhosps) ? patMedInhosps.size() : null);
- for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
- String tagname = inhospVisitFacade.getTagnameBypatid(patMedInhosp1.getPatid());
- patMedInhosp1.setTagname(tagname);
- }
-
- //绉戝
- for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
- if ("1".equals(patMedInhosp1.getLeavehospitaldistrictcode()) && patMedInhosp1.getDiagcheckFlag().equals("1")) {
- patMedInhosp1.setDeptcheckFlag("2");
- patMedInhosp1.setLongTaskReason("鏍规嵁浜ゅ弶鐢熸垚闅忚浠诲姟瑙勫垯锛岄儴闂ㄤ换鍔″彲浠ヤ笉鐢ㄧ敓鎴�");
- inhospVisitFacade.updatePatMedInhosp(patMedInhosp1);
- continue;
- }
- //鑾峰彇鎮ｈ�呬俊鎭�
- PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
- if (Objects.isNull(patArchive)) {
- patMedInhosp1.setDeptcheckFlag("2");
- patMedInhosp1.setLongTaskReason("鎮ｈ�呭熀鏈俊鎭负绌�");
- inhospVisitFacade.updatePatMedInhosp(patMedInhosp1);
- continue;
- }
- try {
- //鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟
- ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
- serviceTaskdept.setLongtask(1L);
- serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
- serviceTaskdept.setDeptType("1");
- serviceTaskdept.setServiceType("2");
- serviceTaskdept.setOrgid(patMedInhosp1.getOrgid());
- List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
- //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堝皢deptIsNull璁剧疆涓簍rue锛�
- if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
- PatMedInhosp patMedInhosp = inhospVisitFacade.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
- patMedInhosp1.setDeptcheckFlag("2");
- patMedInhosp1.setLongTaskReason(patMedInhosp.getLongTaskReason() + "璇ユ偅鑰呮墍鍦ㄧ瀹ゆ湭閰嶇疆绂婚櫌闀挎湡浠诲姟;");
- inhospVisitFacade.updatePatMedInhosp(patMedInhosp1);
- } else {
- for (ServiceTaskdept serviceTaskdept1 : serviceTaskdepts) {
- writeInSubTask(serviceTaskdept1.getTaskId(), true, patMedInhosp1, patArchive, 1, config);
- }
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- log.error("浜哄憳绉戝澶勭悊鍑哄紓甯镐簡锛歿}", e.getMessage());
- patMedInhosp1.setDeptcheckFlag("2");
- patMedInhosp1.setLongTaskReason("浜哄憳绉戝澶勭悊寮傚父");
- inhospVisitFacade.updatePatMedInhosp(patMedInhosp1);
}
}
}
@@ -2016,49 +1365,6 @@
inhospVisitFacade.updatePatMedInhosp(patMedInhosp1);
}
return generatedCount;
- }
-
- // ==========================================================================
- // 鍑哄叆闄㈤殢璁挎ā鍧楀寲锛堢涓�鎵癸級鈥斺�� 3 涓繃娓℃湡鍏ュ彛锛堢函杞彂锛岄浂涓氬姟閫昏緫锛�
- //
- // 鈿狅笍 杩� 3 涓柟娉曟槸鍒绘剰鏂板鐨勶紝涓嶆槸璇姞锛�
- // 瑙� IPatMedInhospService 閲屽悓鍚嶇殑鎺ュ彛澹版槑娉ㄩ噴锛屼互鍙�
- // sql/_probe/verify_step16_service_restore.py 鐨� expected_added 鏂█銆�
- // ==========================================================================
-
- /**
- * 銆愯繃娓℃湡鐢ㄣ�戞墜鏈殢璁挎壂鎻� 鈥斺�� 涓� {@link #addOperationSubTask(String)} 瀹屽叏绛変环銆�
- * <p>
- * 鈿狅笍 {@code addOperationSubTask} 鍘熷疄鐜拌繑鍥� {@code void}锛屾墍浠ヨ繖閲屾寜"澶勭悊浜� 1 杞�"杩斿洖 1锛�
- * 浠呯敤浜庢棩蹇楋紱<b>璋冪敤鏂逛笉寰椾緷璧栬杩斿洖鍊肩殑涓氬姟鍚箟</b>銆�
- */
- @Override
- public int runOperationVisit(String config) {
- addOperationSubTask(config);
- return 1;
- }
-
- /**
- * 銆愯繃娓℃湡鐢ㄣ�戠瀹ょ淮搴︽湭澶勭悊鐨勫湪闄㈡偅鑰呫��
- * <p>
- * 鏉′欢涓庡師 {@code dealOutHospInfo} 绗竴娈垫煡璇㈤�愬瓧涓�鑷达細
- * {@code deptcheckFlag="0"} + {@code inhospstate="1"} + {@code fuflag="1"}銆�
- */
- @Override
- public List<PatMedInhosp> selectPendingDeptPatientsForVisit() {
- PatMedInhosp pmks = new PatMedInhosp();
- pmks.setDeptcheckFlag("0");
- pmks.setInhospstate("1");
- pmks.setFuflag("1");
- return inhospVisitFacade.selectPatMedInhospList(pmks);
- }
-
- /**
- * 銆愯繃娓℃湡鐢ㄣ�戞妸涓�鏉″凡缁勮濂界殑瀛愪换鍔¤惤搴擄紙鍘� {@code serviceSubtaskMapper.insertServiceSubtask}锛夈��
- */
- @Override
- public boolean persistSubtask(ServiceSubtask serviceSubtask) {
- return serviceSubtaskMapper.insertServiceSubtask(serviceSubtask) == 1;
}
}
--
Gitblit v1.9.3