From 723d38375c45d24737bfef6f33a9686254abf99b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 17 十月 2024 13:42:27 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 13 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 38616f5..9a3ea25 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -15,6 +15,7 @@
import com.smartor.mapper.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -37,7 +38,7 @@
private PatArchiveMapper patArchiveMapper;
@Autowired
- private IvrLibaTemplateMapper ivrLibaTemplateMapper;
+ private TemplateDeptMapper templateDeptMapper;
@Autowired
private IvrTaskTemplateMapper ivrTaskTemplateMapper;
@@ -183,6 +184,17 @@
return patMedInhospMapper.deletePatMedInhospByInhospid(inhospid);
}
+ /**
+ * 鍒犻櫎鎮ｈ�呬綇闄㈣褰曚俊鎭�
+ *
+ * @param inhospno 鎮ｈ�呬綇闄㈢紪鐮�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatMedInhospByInhospno(String inhospno) {
+ return patMedInhospMapper.deletePatMedInhospByInhospno(inhospno);
+ }
+
@Override
public int dealOutHospInfo() {
@@ -195,10 +207,20 @@
for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
//鏍规嵁鎮ｈ�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟妯℃澘
Long taskid = null;
- SvyTaskTemplate svyTaskTemplate = new SvyTaskTemplate();
- svyTaskTemplate.setDeptCode(patMedInhosp1.getLeaveldeptcode());
- svyTaskTemplate.setLongTemp(1);
- List<SvyTaskTemplate> svyTaskTemplates = svyTaskTemplateMapper.selectSvyTaskTemplateList(svyTaskTemplate);
+ //閫氳繃deptCode鑾峰彇鍏宠仈鐨勯暱鏈熶换鍔℃ā鏉�
+ TemplateDept templateDept = new TemplateDept();
+ templateDept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
+ templateDept.setLongTemp(1);
+ templateDept.setType(11L);
+ List<TemplateDept> templateDepts = templateDeptMapper.selectTemplateDeptList(templateDept);
+ //鏍规嵁鑾峰彇鐨勯暱鏈熶换鍔℃ā鏉縄D锛岃幏鍙栦换鍔℃ā鏉胯鎯�
+ List<SvyTaskTemplate> svyTaskTemplates = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(templateDepts)) {
+ for (TemplateDept templateDept1 : templateDepts) {
+ SvyTaskTemplate svyTaskTemplate = svyTaskTemplateMapper.selectSvyTaskTemplateBySvyid(templateDept1.getTempid());
+ if (ObjectUtils.isNotEmpty(svyTaskTemplate)) svyTaskTemplates.add(svyTaskTemplate);
+ }
+ }
//濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堟殏瀹氾紝灏嗗嚭鍏ラ櫌琛ㄧ殑check_flag璁剧疆涓�2 锛宭ong_task_reason 璁板綍鍘熷洜锛�
if (CollectionUtils.isEmpty(svyTaskTemplates) || svyTaskTemplates.size() == 0) {
patMedInhosp1.setCheckFlag("2");
@@ -285,35 +307,72 @@
ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
serviceSubtask.setTaskid(serviceTask.getTaskid());
serviceSubtask.setLibtemplateid(stt.getTemplateid());
+ serviceSubtask.setNurseId(patMedInhosp1.getNurseId());
+ serviceSubtask.setNurseName(patMedInhosp1.getNurseName());
+ serviceSubtask.setDrcode(patMedInhosp1.getDrcode());
+ serviceSubtask.setDrname(patMedInhosp1.getDrname());
+ serviceSubtask.setDeptname(patMedInhosp1.getLeaveldeptname());
serviceSubtask.setTemplateid(stt.getId());
serviceSubtask.setTemplatename(stt.getSvyname());
serviceSubtask.setPatid(patArchive.getId());
serviceSubtask.setSendname(patArchive.getName());
+ serviceSubtask.setSfzh(patArchive.getIdcardno());
serviceSubtask.setPhone(patArchive.getTelcode());
serviceSubtask.setSex(patArchive.getSex());
serviceSubtask.setAge(patArchive.getAge());
serviceSubtask.setSendstate(2L);
+ serviceSubtask.setStarttime(patMedInhosp1.getStarttime());
+ serviceSubtask.setEndtime(patMedInhosp1.getEndtime());
serviceSubtask.setServiceType("2");
serviceSubtask.setServiceform(serviceTask.getPreachform());
serviceSubtask.setHospType("2");
+ serviceSubtask.setCreateTime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ serviceSubtask.setCreateBy(patMedInhosp1.getNurseName());
+ serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
+ serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
//璁剧疆鍙戦�佹椂闂�
Date newDate = addDays(patMedInhosp1.getEndtime(), stt.getSendDay());
serviceSubtask.setLongSendTime(newDate);
//鎮ｈ�呭彂閫佹椂闂�
- if (StringUtils.isNotEmpty(remark)) {
- serviceSubtask.setSendstate(4L);
+ if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
+ remark = patArchive.getNotrequiredreason();
serviceSubtask.setRemark(remark);
serviceSubtask.setResult("error");
serviceSubtask.setFinishtime(new Date());
//涓嶆墽琛�
serviceSubtask.setSendstate(4L);
- } else if (patArchive.getNotrequiredFlag().equals("4")) {
- //浜轰笉鍦ㄤ簡锛屾垨鑰呭叾瀹冨師鍥狅紝涔熶笉鑳介殢璁�
- serviceSubtask.setSendstate(4L);
- serviceSubtask.setRemark(patArchive.getNotrequiredreason());
- serviceSubtask.setResult("error");
- serviceSubtask.setFinishtime(new Date());
}
+
+ //鍦ㄦ柊澧炰箣鍓嶏紝鍏堥�氳繃鎮ｈ�匢D锛宻endstate=2鏌ヨ涓�涓嬶紝鍦ㄦ墍鏈夐暱鏈熶换鍔′腑锛屾槸涓嶆槸杩樻湁璇ユ偅鑰呭緟鎵ц鐨勪换鍔★紝鏈夌殑璇�,姣旇緝涔嬪墠鐨別ndtime鏄惁灏忎簬褰撳墠鐨別ndtaime,濡傛灉涔嬪墠鐨勫皬浜庣幇鍦ㄧ殑锛屽垯鐩存帴灏嗕箣鍓嶇殑鍋滄帀锛堝師鍥犲啀鍏ラ櫌锛�
+ ServiceSubtaskVO subtask = new ServiceSubtaskVO();
+ subtask.setPatid(patArchive.getId());
+ subtask.setSendstate(2L);
+ List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
+ log.error("璇ユ偅鑰呭緟鎵ц鐨勪换鍔�:{}", selectServiceSubtaskList);
+ if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
+ for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
+ if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
+ //涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
+ continue;
+ }
+ if (serviceSubtask1.getEndtime().before(serviceSubtask.getEndtime())) {
+ //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
+ serviceSubtask1.setSendstate(4L);
+ serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
+ serviceSubtask1.setResult("error");
+ serviceSubtask1.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ } else {
+ //鐩稿弽,鍒欏皢褰撴湁鐨勬暟鎹仠鎺�
+ serviceSubtask.setResult("error");
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setSendstate(4L);
+ serviceSubtask.setRemark("鎮ｈ�呭啀鍏ラ櫌");
+ }
+ }
+ }
+
serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
//灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
PatMedInhosp patMedInhosp2 = new PatMedInhosp();
@@ -321,6 +380,41 @@
patMedInhosp2.setCheckFlag("1");
patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
}
+
+ //鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭ｄ箣鍓嶇殑鍑洪櫌鎮ｈ�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
+ patMedInhosp.setCheckFlag("0");
+ patMedInhosp.setInhospstate("0");
+ List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+ if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) {
+ for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
+ //鑾峰彇褰撳墠鍏ラ櫌鎮ｈ�呯殑寰呮墽琛岀殑鍑洪櫌瀛愪换鍔￠殢璁夸俊鎭�
+ ServiceSubtaskVO subtask = new ServiceSubtaskVO();
+ subtask.setPatid(patMedInhosp1.getPatid());
+ subtask.setSendstate(2L);
+ List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
+ log.error("鍏ラ櫌鐨勬偅鑰呭緟鎵ц鐨勪换鍔�:{}", selectServiceSubtaskList);
+ if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
+ for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
+ if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
+ //涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
+ continue;
+ }
+ if (serviceSubtask1.getEndtime().before(patMedInhosp1.getStarttime())) {
+ //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
+ serviceSubtask1.setSendstate(4L);
+ serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
+ serviceSubtask1.setResult("error");
+ serviceSubtask1.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ }
+ }
+ }
+ //灏嗘偅鍏ョ殑鍏ラ櫌鏁版嵁璁剧疆涓哄凡澶勭悊
+ patMedInhosp1.setCheckFlag("1");
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+ }
+ }
+
return 1;
}
--
Gitblit v1.9.3