From 8d913e5594f45ca2a4ce656ea9feb99ffe715913 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 29 十一月 2024 18:44:58 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java |  650 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 626 insertions(+), 24 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 7853b90..d4e6cfb 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -1,96 +1,698 @@
 package com.smartor.service.impl;
 
-import java.util.List;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.util.*;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
 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.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;
-import com.smartor.mapper.PatMedInhospMapper;
-import com.smartor.domain.PatMedInhosp;
 import com.smartor.service.IPatMedInhospService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 鎮h�呬綇闄㈣褰昐ervice涓氬姟灞傚鐞�
- * 
+ *
  * @author smartor
  * @date 2023-03-04
  */
+@Slf4j
 @Service
-public class PatMedInhospServiceImpl implements IPatMedInhospService 
-{
+public class PatMedInhospServiceImpl implements IPatMedInhospService {
     @Autowired
     private PatMedInhospMapper patMedInhospMapper;
 
+    @Autowired
+    private PatArchiveMapper patArchiveMapper;
+
+    @Autowired
+    private TemplateDeptMapper templateDeptMapper;
+
+    @Autowired
+    private PatArchiveImportMapper patArchiveImportMapper;
+
+    @Autowired
+    private Icd10AssociationMapper icd10AssociationMapper;
+
+    @Autowired
+    private SvyTaskTemplateMapper svyTaskTemplateMapper;
+    @Autowired
+    private IvrTaskTemplateMapper ivrTaskTemplateMappte;
+
+    @Autowired
+    private ServiceTaskMapper serviceTaskMapper;
+
+    @Autowired
+    private ServiceSubtaskMapper serviceSubtaskMapper;
+    @Autowired
+    private SysUserDeptMapper sysUserDeptMapper;
+
+    //璁板綍闀挎湡浠诲姟鍩虹淇℃伅
+    List<IvrLibaTemplate> libaTemplates = new ArrayList<>();
+    List<IvrTaskTemplate> ivrTaskTemplates = new ArrayList<>();
+    List<ServiceTask> serviceTaskList = new ArrayList<>();
+
     /**
      * 鏌ヨ鎮h�呬綇闄㈣褰�
-     * 
+     *
      * @param inhospid 鎮h�呬綇闄㈣褰曚富閿�
      * @return 鎮h�呬綇闄㈣褰�
      */
     @Override
-    public PatMedInhosp selectPatMedInhospByInhospid(Long inhospid)
-    {
+    public PatMedInhosp selectPatMedInhospByInhospid(Long inhospid) {
         return patMedInhospMapper.selectPatMedInhospByInhospid(inhospid);
     }
 
     /**
      * 鏌ヨ鎮h�呬綇闄㈣褰曞垪琛�
-     * 
+     *
      * @param patMedInhosp 鎮h�呬綇闄㈣褰�
      * @return 鎮h�呬綇闄㈣褰�
      */
     @Override
-    public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp)
-    {
+    public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp) {
         return patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
     }
 
     /**
+     * 鏌ヨ褰撳墠鐧婚檰浜鸿嚜宸憋紙鐥呭尯銆侀儴闂級鐨勬偅鑰呬綇闄㈣褰曞垪琛�
+     *
+     * @param patMedInhospVO
+     * @return
+     */
+    public List<PatMedInhosp> selectPatMedInhospListByCondition(PatMedInhospVO patMedInhospVO) {
+        return patMedInhospMapper.selectPatMedInhospListByCondition(patMedInhospVO);
+    }
+
+
+    @Override
+    public PatMedInhosp getDeptCodeByPatId(PatMedInhosp patMedInhosp) {
+        List<PatMedInhosp> patMedInhosps = selectPatMedInhospList(patMedInhosp);
+        if (!org.springframework.util.CollectionUtils.isEmpty(patMedInhosps)) {
+
+            if (patMedInhosp.getInhospstate().equals("0")) {
+                //鍏堝幓鎺夋椂闂翠负绌虹殑
+                patMedInhosps.removeIf(PatMedInhosp -> PatMedInhosp.getStarttime() == null);
+                Collections.sort(patMedInhosps, Comparator.comparing(PatMedInhosp::getStarttime).reversed());
+            } else if (patMedInhosp.getInhospstate().equals("1")) {
+                //鍏堝幓鎺夋椂闂翠负绌虹殑
+                patMedInhosps.removeIf(PatMedInhosp -> PatMedInhosp.getEndtime() == null);
+                Collections.sort(patMedInhosps, Comparator.comparing(PatMedInhosp::getEndtime).reversed());
+            }
+        }
+        if (patMedInhosps != null && patMedInhosps.size() > 0) return patMedInhosps.get(0);
+        else return null;
+    }
+
+    /**
+     * 鏌ヨ鍑哄叆闄汉娆�
+     *
+     * @param patMedReq
+     * @return
+     */
+    @Override
+    public PatMedRes selectPatMedInhospListCount(PatMedReq patMedReq) {
+        PatMedRes patMedRes = null;
+        // 鑾峰彇褰撳墠鐧婚檰浜虹殑閮ㄩ棬鏉冮檺
+        if (org.springframework.util.CollectionUtils.isEmpty(patMedReq.getDeptcodeList())) {
+            Long userId = SecurityUtils.getUserId();
+            List<SysDept> sysDepts = sysUserDeptMapper.selectDeptListByUserId(userId);
+            List<String> deptCode = new ArrayList<>();
+            for (SysDept sysDept : sysDepts) {
+                deptCode.add(sysDept.getDeptId().toString());
+            }
+            patMedReq.setDeptcodeList(deptCode);
+            patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
+        }
+        return patMedRes;
+    }
+
+    /**
      * 鏂板鎮h�呬綇闄㈣褰�
-     * 
+     *
      * @param patMedInhosp 鎮h�呬綇闄㈣褰�
      * @return 缁撴灉
      */
     @Override
-    public int insertPatMedInhosp(PatMedInhosp patMedInhosp)
-    {
+    public int insertPatMedInhosp(PatMedInhosp patMedInhosp) {
         patMedInhosp.setCreateTime(DateUtils.getNowDate());
+        patMedInhosp.setUpdateTime(DateUtils.getNowDate());
         return patMedInhospMapper.insertPatMedInhosp(patMedInhosp);
     }
 
     /**
      * 淇敼鎮h�呬綇闄㈣褰�
-     * 
+     *
      * @param patMedInhosp 鎮h�呬綇闄㈣褰�
      * @return 缁撴灉
      */
     @Override
-    public int updatePatMedInhosp(PatMedInhosp patMedInhosp)
-    {
+    public int updatePatMedInhosp(PatMedInhosp patMedInhosp) {
         patMedInhosp.setUpdateTime(DateUtils.getNowDate());
         return patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
     }
 
     /**
      * 鎵归噺鍒犻櫎鎮h�呬綇闄㈣褰�
-     * 
+     *
      * @param inhospids 闇�瑕佸垹闄ょ殑鎮h�呬綇闄㈣褰曚富閿�
      * @return 缁撴灉
      */
     @Override
-    public int deletePatMedInhospByInhospids(Long[] inhospids)
-    {
+    public int deletePatMedInhospByInhospids(Long[] inhospids) {
         return patMedInhospMapper.deletePatMedInhospByInhospids(inhospids);
     }
 
     /**
      * 鍒犻櫎鎮h�呬綇闄㈣褰曚俊鎭�
-     * 
+     *
      * @param inhospid 鎮h�呬綇闄㈣褰曚富閿�
      * @return 缁撴灉
      */
     @Override
-    public int deletePatMedInhospByInhospid(Long inhospid)
-    {
+    public int deletePatMedInhospByInhospid(Long inhospid) {
         return patMedInhospMapper.deletePatMedInhospByInhospid(inhospid);
     }
+
+    /**
+     * 鍒犻櫎鎮h�呬綇闄㈣褰曚俊鎭�
+     *
+     * @param inhospno 鎮h�呬綇闄㈢紪鐮�
+     * @return 缁撴灉
+     */
+    @Override
+    public int deletePatMedInhospByInhospno(String inhospno) {
+        return patMedInhospMapper.deletePatMedInhospByInhospno(inhospno);
+    }
+
+
+    @Override
+    public int dealOutHospInfo() {
+        PatMedInhosp patMedInhosp = new PatMedInhosp();
+        //鑾峰彇鏈鐞嗙殑鏁版嵁
+        patMedInhosp.setCheckFlag("0");
+        patMedInhosp.setInhospstate("1");
+        List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+
+        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
+            //鏍规嵁鎮h�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟妯℃澘
+            Long taskid = null;
+            //閫氳繃deptCode鑾峰彇鍏宠仈鐨勯暱鏈熶换鍔℃ā鏉�
+            TemplateDept templateDept = new TemplateDept();
+            templateDept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
+            templateDept.setLongTemp(1);
+            templateDept.setType(21L);
+            List<TemplateDept> templateDepts = templateDeptMapper.selectTemplateDeptList(templateDept);
+            //鏍规嵁鑾峰彇鐨勯暱鏈熶换鍔℃ā鏉縄D锛岃幏鍙栦换鍔℃ā鏉胯鎯�
+            List<IvrTaskTemplate> ivrTaskTemplates = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(templateDepts)) {
+                for (TemplateDept templateDept1 : templateDepts) {
+                    IvrTaskTemplate ivrTaskTemplate = ivrTaskTemplateMappte.selectIvrTaskTemplateByID(templateDept1.getTempid());
+                    if (ObjectUtils.isNotEmpty(ivrTaskTemplate)) ivrTaskTemplates.add(ivrTaskTemplate);
+                }
+            }
+            //濡傛灉閮ㄩ棬妯℃澘涓虹┖锛堟殏瀹氾紝灏嗗嚭鍏ラ櫌琛ㄧ殑check_flag璁剧疆涓�2  锛宭ong_task_reason 璁板綍鍘熷洜锛�
+            if (CollectionUtils.isEmpty(ivrTaskTemplates) || ivrTaskTemplates.size() == 0) {
+                patMedInhosp1.setCheckFlag("2");
+                patMedInhosp1.setLongTaskReason("璇ユ偅鑰呮墍鍦ㄧ瀹わ紝鏈厤缃换鍔℃ā鏉�");
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                continue;
+            }
+
+            //鑾峰彇鎮h�呬俊鎭�
+            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
+            //缁欎釜remark(鐢ㄦ潵鍋氭槸鍚﹁缁欏彂閫佹椂闂存爣璇�)
+            String remark = null;
+            //瀹氫箟涓�涓ā鏉垮彉閲忥紝鐢ㄤ笌涓存椂淇濆瓨涓�涓嬫壘鍑烘潵鐨勬ā鏉�
+            IvrTaskTemplate stt = null;
+            if (CollectionUtils.isNotEmpty(ivrTaskTemplates) && ivrTaskTemplates.size() == 1) {
+                stt = ivrTaskTemplates.get(0);
+                taskid = ivrTaskTemplates.get(0).getTaskid();
+
+            } else if (CollectionUtils.isNotEmpty(ivrTaskTemplates) && ivrTaskTemplates.size() > 1) {
+                //閫氳繃鎮h�呯殑鐤剧梾鍘绘壘妯℃澘
+                if (StringUtils.isNotEmpty(patMedInhosp1.getIcd10code())) {
+                    aa:
+                    for (IvrTaskTemplate ivrTaskTemplate1 : ivrTaskTemplates) {
+                        //閫氳繃鍩虹妯℃澘ID鑾峰彇鍏宠仈鐨勭柧鐥卌ode
+                        Icd10Association icd10Association = new Icd10Association();
+                        icd10Association.setType(5L);
+                        icd10Association.setOutid(ivrTaskTemplate1.getId());
+                        List<Icd10Association> icd10Associations = icd10AssociationMapper.selectIcd10AssociationList(icd10Association);
+                        if (CollectionUtils.isEmpty(icd10Associations)) {
+                            //濡傝兘妯℃澘鐨勭柧鐥呬负绌猴紝鍒欐槸鏈瀹ょ殑閫氱敤榛樿妯℃澘
+                            stt = ivrTaskTemplate1;
+                            taskid = stt.getTaskid();
+                            continue;
+                        } else {
+                            //濡傝兘妯℃澘鐨勭柧鐥呬笉涓虹┖锛屽垯鏄敤鍖归厤鍒扮柧鐥呯殑妯℃澘锛堝鏋滃尮閰嶅嚭鏉ュ涓ā鏉匡紝鍙敤绗竴涓級
+                            for (Icd10Association icd10Association1 : icd10Associations) {
+                                if (patMedInhosp1.getIcd10code().equals(icd10Association1.getIcd10code())) {
+                                    stt = ivrTaskTemplate1;
+                                    taskid = stt.getTaskid();
+                                    break aa;
+                                }
+                            }
+                        }
+                    }
+                    //濡傛灉寰幆瀹岋紝stt杩樻槸涓虹┖锛屽垯璇ョ瀹ゆ病鏈夐粯璁ゆā鏉�
+                    if (Objects.isNull(stt)) {
+                        //鍦ㄥ嚭鍏ラ櫌琛ㄨ褰曚竴涓嬭鎮h�呯姸鎬侊紙璇ョ瀹ゆ病鏈夋ā鏉匡紝鎵�浠ユ棤娉曞湪瀛愪换鍔¢噷鐢熸垚浠诲姟锛屾墍浠ヤ换鍔℃槸澶辫触鏄殑锛宑hect_flag=2锛�
+                        patMedInhosp1.setCheckFlag("2");
+                        patMedInhosp1.setLongTaskReason("鏃犳硶鍖归厤鍒拌绉戝妯℃澘锛岃绉戝涔熸棤榛樿妯℃澘");
+                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                        continue;
+                    }
+                } else {
+                    //涓虹┖鐨勮瘽锛岀洿鎺ョ敤绉戝鐨勯�氱敤妯℃澘鐨勪换鍔D锛岃鎮h�呯洿鎺ュ線瀛愪换鍔¤〃閲屾彃鍏ワ紝浣嗕笉瑕佹墽琛岋紝闇�瑕佷汉宸ュ共锛堝皢涓嶈兘鎵ц鐨勫師鍥犲娉ㄥソ锛�
+                    for (IvrTaskTemplate ivrTaskTemplate1 : ivrTaskTemplates) {
+                        //閫氳繃鍩虹妯℃澘ID鑾峰彇鍏宠仈鐨勭柧鐥卌ode
+                        Icd10Association icd10Association = new Icd10Association();
+                        icd10Association.setType(5L);
+                        icd10Association.setOutid(ivrTaskTemplate1.getId());
+                        //鎵惧嚭璇ョ瀹ょ殑閫氱敤妯℃澘
+                        List<Icd10Association> icd10Associations = icd10AssociationMapper.selectIcd10AssociationList(icd10Association);
+                        if (CollectionUtils.isEmpty(icd10Associations)) {
+                            stt = ivrTaskTemplate1;
+                            //涓嶉厤缃彂閫佹椂闂�
+                            remark = "鎮h�呭叆闄㈢柧鐥呬负绌�";
+                            //鍦ㄥ嚭鍏ラ櫌琛ㄨ褰曚竴涓嬭鎮h�呯姸鎬侊紙璇ョ瀹ゆ槸鏈夌柧鐥呬负绌虹殑妯℃澘锛屾墍浠ュ彲浠ュ湪瀛愪换鍔¢噷鐢熸垚浠诲姟锛屾墍浠ヤ换鍔℃槸鎴愬姛鐨勶紝chect_flag=1锛�
+                            patMedInhosp1.setCheckFlag("1");
+                            patMedInhosp1.setLongTaskReason("鎮h�呭叆闄㈢柧鐥呬负绌猴紝宸叉壘鍒扮瀹ゆā鏉�");
+                            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                            continue;
+                        }
+                    }
+                    if (Objects.isNull(stt)) {
+                        //鍦ㄥ嚭鍏ラ櫌琛ㄨ褰曚竴涓嬭鎮h�呯姸鎬侊紙璇ョ瀹ゆ病鏈夋ā鏉匡紝鎵�浠ユ棤娉曞湪瀛愪换鍔¢噷鐢熸垚浠诲姟锛屾墍浠ヤ换鍔℃槸澶辫触鏄殑锛宑hect_flag=2锛�
+                        patMedInhosp1.setCheckFlag("2");
+                        patMedInhosp1.setLongTaskReason("鎮h�呭叆闄㈢柧鐥呬负绌猴紝鏈壘鍒扮瀹ゆā鏉�");
+                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+                        continue;
+                    }
+                }
+            }
+
+            ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(taskid);
+            ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
+            serviceSubtask.setTaskid(serviceTask.getTaskid());
+            if (StringUtils.isNotEmpty(stt.getLibtemplateid()))
+                serviceSubtask.setLibtemplateid(Long.valueOf(stt.getLibtemplateid()));
+            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.getTemplateName());
+            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.setPreachform(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);
+            //鎮h�呭彂閫佹椂闂�
+            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);
+            }
+
+            //鍦ㄦ柊澧炰箣鍓嶏紝鍏堥�氳繃鎮h�匢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("鎮h�呭啀鍏ラ櫌");
+                        serviceSubtask1.setResult("error");
+                        serviceSubtask1.setFinishtime(new Date());
+                        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+                    } else {
+                        //鐩稿弽,鍒欏皢褰撴湁鐨勬暟鎹仠鎺�
+                        serviceSubtask.setResult("error");
+                        serviceSubtask.setFinishtime(new Date());
+                        serviceSubtask.setSendstate(4L);
+                        serviceSubtask.setRemark("鎮h�呭啀鍏ラ櫌");
+                    }
+                }
+            }
+
+            serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+            //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
+            PatMedInhosp patMedInhosp2 = new PatMedInhosp();
+            patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
+            patMedInhosp2.setCheckFlag("1");
+            patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
+        }
+
+        //鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭d箣鍓嶇殑鍑洪櫌鎮h�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
+        patMedInhosp.setCheckFlag("0");
+        patMedInhosp.setInhospstate("0");
+        List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+        if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) {
+            for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
+                //鑾峰彇褰撳墠鍏ラ櫌鎮h�呯殑寰呮墽琛岀殑鍑洪櫌瀛愪换鍔¢殢璁夸俊鎭�
+                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("鎮h�呭啀鍏ラ櫌");
+                            serviceSubtask1.setResult("error");
+                            serviceSubtask1.setFinishtime(new Date());
+                            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+                        }
+                    }
+                }
+                //灏嗘偅鍏ョ殑鍏ラ櫌鏁版嵁璁剧疆涓哄凡澶勭悊
+                patMedInhosp1.setCheckFlag("1");
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+            }
+        }
+
+        return 1;
+    }
+//闂嵎
+//    @Override
+//    public int dealOutHospInfo() {
+//        PatMedInhosp patMedInhosp = new PatMedInhosp();
+//        //鑾峰彇鏈鐞嗙殑鏁版嵁
+//        patMedInhosp.setCheckFlag("0");
+//        patMedInhosp.setInhospstate("1");
+//        List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+//
+//        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
+//            //鏍规嵁鎮h�呮墍鍦ㄧ瀹わ紝鑾峰彇璇ョ瀹ょ殑闀挎湡浠诲姟妯℃澘
+//            Long taskid = null;
+//            //閫氳繃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");
+//                patMedInhosp1.setLongTaskReason("璇ユ偅鑰呮墍鍦ㄧ瀹わ紝鏈厤缃换鍔℃ā鏉�");
+//                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+//                continue;
+//            }
+//
+//            //鑾峰彇鎮h�呬俊鎭�
+//            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
+//            //缁欎釜remark(鐢ㄦ潵鍋氭槸鍚﹁缁欏彂閫佹椂闂存爣璇�)
+//            String remark = null;
+//            //瀹氫箟涓�涓ā鏉垮彉閲忥紝鐢ㄤ笌涓存椂淇濆瓨涓�涓嬫壘鍑烘潵鐨勬ā鏉�
+//            SvyTaskTemplate stt = null;
+//            if (CollectionUtils.isNotEmpty(svyTaskTemplates) && svyTaskTemplates.size() == 1) {
+//                stt = svyTaskTemplates.get(0);
+//                taskid = svyTaskTemplates.get(0).getTaskid();
+//
+//            } else if (CollectionUtils.isNotEmpty(svyTaskTemplates) && svyTaskTemplates.size() > 1) {
+//                //閫氳繃鎮h�呯殑鐤剧梾鍘绘壘妯℃澘
+//                if (StringUtils.isNotEmpty(patMedInhosp1.getIcd10code())) {
+//                    aa:
+//                    for (SvyTaskTemplate svyTaskTemplate1 : svyTaskTemplates) {
+//                        //閫氳繃鍩虹妯℃澘ID鑾峰彇鍏宠仈鐨勭柧鐥卌ode
+//                        Icd10Association icd10Association = new Icd10Association();
+//                        icd10Association.setType(5L);
+//                        icd10Association.setOutid(svyTaskTemplate1.getTemplateid());
+//                        List<Icd10Association> icd10Associations = icd10AssociationMapper.selectIcd10AssociationList(icd10Association);
+//                        if (CollectionUtils.isEmpty(icd10Associations)) {
+//                            //濡傝兘妯℃澘鐨勭柧鐥呬负绌猴紝鍒欐槸鏈瀹ょ殑閫氱敤榛樿妯℃澘
+//                            stt = svyTaskTemplate1;
+//                            taskid = stt.getTaskid();
+//                            continue;
+//                        } else {
+//                            //濡傝兘妯℃澘鐨勭柧鐥呬笉涓虹┖锛屽垯鏄敤鍖归厤鍒扮柧鐥呯殑妯℃澘锛堝鏋滃尮閰嶅嚭鏉ュ涓ā鏉匡紝鍙敤绗竴涓級
+//                            for (Icd10Association icd10Association1 : icd10Associations) {
+//                                if (patMedInhosp1.getIcd10code().equals(icd10Association1.getIcd10code())) {
+//                                    stt = svyTaskTemplate1;
+//                                    taskid = stt.getTaskid();
+//                                    break aa;
+//                                }
+//                            }
+//                        }
+//                    }
+//                    //濡傛灉寰幆瀹岋紝stt杩樻槸涓虹┖锛屽垯璇ョ瀹ゆ病鏈夐粯璁ゆā鏉�
+//                    if (Objects.isNull(stt)) {
+//                        //鍦ㄥ嚭鍏ラ櫌琛ㄨ褰曚竴涓嬭鎮h�呯姸鎬侊紙璇ョ瀹ゆ病鏈夋ā鏉匡紝鎵�浠ユ棤娉曞湪瀛愪换鍔¢噷鐢熸垚浠诲姟锛屾墍浠ヤ换鍔℃槸澶辫触鏄殑锛宑hect_flag=2锛�
+//                        patMedInhosp1.setCheckFlag("2");
+//                        patMedInhosp1.setLongTaskReason("鏃犳硶鍖归厤鍒拌绉戝妯℃澘锛岃绉戝涔熸棤榛樿妯℃澘");
+//                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+//                        continue;
+//                    }
+//                } else {
+//                    //涓虹┖鐨勮瘽锛岀洿鎺ョ敤绉戝鐨勯�氱敤妯℃澘鐨勪换鍔D锛岃鎮h�呯洿鎺ュ線瀛愪换鍔¤〃閲屾彃鍏ワ紝浣嗕笉瑕佹墽琛岋紝闇�瑕佷汉宸ュ共锛堝皢涓嶈兘鎵ц鐨勫師鍥犲娉ㄥソ锛�
+//                    for (SvyTaskTemplate svyTaskTemplate1 : svyTaskTemplates) {
+//                        //閫氳繃鍩虹妯℃澘ID鑾峰彇鍏宠仈鐨勭柧鐥卌ode
+//                        Icd10Association icd10Association = new Icd10Association();
+//                        icd10Association.setType(5L);
+//                        icd10Association.setOutid(svyTaskTemplate1.getTemplateid());
+//                        //鎵惧嚭璇ョ瀹ょ殑閫氱敤妯℃澘
+//                        List<Icd10Association> icd10Associations = icd10AssociationMapper.selectIcd10AssociationList(icd10Association);
+//                        if (CollectionUtils.isEmpty(icd10Associations)) {
+//                            stt = svyTaskTemplate1;
+//                            //涓嶉厤缃彂閫佹椂闂�
+//                            remark = "鎮h�呭叆闄㈢柧鐥呬负绌�";
+//                            //鍦ㄥ嚭鍏ラ櫌琛ㄨ褰曚竴涓嬭鎮h�呯姸鎬侊紙璇ョ瀹ゆ槸鏈夌柧鐥呬负绌虹殑妯℃澘锛屾墍浠ュ彲浠ュ湪瀛愪换鍔¢噷鐢熸垚浠诲姟锛屾墍浠ヤ换鍔℃槸鎴愬姛鐨勶紝chect_flag=1锛�
+//                            patMedInhosp1.setCheckFlag("1");
+//                            patMedInhosp1.setLongTaskReason("鎮h�呭叆闄㈢柧鐥呬负绌猴紝宸叉壘鍒扮瀹ゆā鏉�");
+//                            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+//                            continue;
+//                        }
+//                    }
+//                    if (Objects.isNull(stt)) {
+//                        //鍦ㄥ嚭鍏ラ櫌琛ㄨ褰曚竴涓嬭鎮h�呯姸鎬侊紙璇ョ瀹ゆ病鏈夋ā鏉匡紝鎵�浠ユ棤娉曞湪瀛愪换鍔¢噷鐢熸垚浠诲姟锛屾墍浠ヤ换鍔℃槸澶辫触鏄殑锛宑hect_flag=2锛�
+//                        patMedInhosp1.setCheckFlag("2");
+//                        patMedInhosp1.setLongTaskReason("鎮h�呭叆闄㈢柧鐥呬负绌猴紝鏈壘鍒扮瀹ゆā鏉�");
+//                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+//                        continue;
+//                    }
+//                }
+//            }
+//
+//            ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(taskid);
+//            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.setPreachform(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);
+//            //鎮h�呭彂閫佹椂闂�
+//            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);
+//            }
+//
+//            //鍦ㄦ柊澧炰箣鍓嶏紝鍏堥�氳繃鎮h�匢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("鎮h�呭啀鍏ラ櫌");
+//                        serviceSubtask1.setResult("error");
+//                        serviceSubtask1.setFinishtime(new Date());
+//                        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+//                    } else {
+//                        //鐩稿弽,鍒欏皢褰撴湁鐨勬暟鎹仠鎺�
+//                        serviceSubtask.setResult("error");
+//                        serviceSubtask.setFinishtime(new Date());
+//                        serviceSubtask.setSendstate(4L);
+//                        serviceSubtask.setRemark("鎮h�呭啀鍏ラ櫌");
+//                    }
+//                }
+//            }
+//
+//            serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+//            //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
+//            PatMedInhosp patMedInhosp2 = new PatMedInhosp();
+//            patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
+//            patMedInhosp2.setCheckFlag("1");
+//            patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
+//        }
+//
+//        //鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭d箣鍓嶇殑鍑洪櫌鎮h�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
+//        patMedInhosp.setCheckFlag("0");
+//        patMedInhosp.setInhospstate("0");
+//        List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+//        if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) {
+//            for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
+//                //鑾峰彇褰撳墠鍏ラ櫌鎮h�呯殑寰呮墽琛岀殑鍑洪櫌瀛愪换鍔¢殢璁夸俊鎭�
+//                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("鎮h�呭啀鍏ラ櫌");
+//                            serviceSubtask1.setResult("error");
+//                            serviceSubtask1.setFinishtime(new Date());
+//                            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+//                        }
+//                    }
+//                }
+//                //灏嗘偅鍏ョ殑鍏ラ櫌鏁版嵁璁剧疆涓哄凡澶勭悊
+//                patMedInhosp1.setCheckFlag("1");
+//                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+//            }
+//        }
+//
+//        return 1;
+//    }
+
+    /**
+     * 鑾峰彇鍑洪櫌锛屼綇闄紝闂ㄨ瘖鏈嶅姟浜烘
+     *
+     * @param patMedReq
+     * @return
+     */
+    @Override
+    public List<PatMedRes> getDeptRanking(PatMedReq patMedReq) {
+
+        return patMedInhospMapper.getDeptRanking(patMedReq);
+    }
+
+    @Override
+    public List<PatMedInhosp> getDocAndPat(PatMedInhosp patMedInhosp) {
+        List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+        if (StringUtils.isNotEmpty(patMedInhosp.getPatname()) || StringUtils.isNotEmpty(patMedInhosp.getNurseName()) || StringUtils.isNotEmpty(patMedInhosp.getDrname())) {
+            //鑾峰彇澶栭儴瀵煎叆淇℃伅,骞跺皢澶栭儴鎮h�呮斁鍒皃atMedInhospList涓�
+            PatArchiveImport patArchiveImport = new PatArchiveImport();
+            if (StringUtils.isNotEmpty(patMedInhosp.getPatname())) {
+                patArchiveImport.setName(patMedInhosp.getPatname());
+            }
+            if (StringUtils.isNotEmpty(patMedInhosp.getNurseName()))
+                patArchiveImport.setCreateBy(patMedInhosp.getNurseName());
+            if (StringUtils.isNotEmpty(patMedInhosp.getDrname()))
+                patArchiveImport.setCreateBy(patMedInhosp.getDrname());
+            List<PatArchiveImport> patArchiveImports = patArchiveImportMapper.selectPatArchiveImportList(patArchiveImport);
+            if (CollectionUtils.isNotEmpty(patArchiveImports)) {
+                for (PatArchiveImport patArchiveImport1 : patArchiveImports) {
+                    PatMedInhosp patMedInhosp1 = new PatMedInhosp();
+                    patMedInhosp1.setPatname(patArchiveImport1.getName());
+                    patMedInhosp1.setSex(patArchiveImport1.getSex());
+                    patMedInhosp1.setNurseName(patArchiveImport1.getCreateBy());
+                    patMedInhosp1.setOutImport(1);
+                    patMedInhosp1.setTelcode(patArchiveImport1.getTelcode());
+                    patMedInhospList.add(patMedInhosp1);
+                }
+            }
+        }
+
+        return patMedInhospList;
+    }
+
+    private Date addDays(Date date, Integer days) {
+        if (days == null) {
+            days = 1;
+        }
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DAY_OF_MONTH, days);
+        return calendar.getTime();
+    }
+
 }

--
Gitblit v1.9.3