From d3bf339bd64d7b7efddc0afdd4beb1866b8b5a04 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 21 九月 2024 00:47:55 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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..b9522e6 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;
@@ -182,6 +183,16 @@
public int deletePatMedInhospByInhospid(Long inhospid) {
return patMedInhospMapper.deletePatMedInhospByInhospid(inhospid);
}
+ /**
+ * 鍒犻櫎鎮ｈ�呬綇闄㈣褰曚俊鎭�
+ *
+ * @param inhospno 鎮ｈ�呬綇闄㈢紪鐮�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatMedInhospByInhospno(String inhospno) {
+ return patMedInhospMapper.deletePatMedInhospByInhospno(inhospno);
+ }
@Override
@@ -195,10 +206,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,17 +306,27 @@
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.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
+ serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
//璁剧疆鍙戦�佹椂闂�
Date newDate = addDays(patMedInhosp1.getEndtime(), stt.getSendDay());
serviceSubtask.setLongSendTime(newDate);
--
Gitblit v1.9.3