From 722fa40345f1fc650eaeae4a721c3ae4106d92a8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 19:03:56 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |   21 ++++++++++++++++-----
 1 files changed, 16 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..41db978 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;
@@ -195,10 +196,20 @@
         for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
             //鏍规嵁鎮h�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟妯℃澘
             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");

--
Gitblit v1.9.3