Merge remote-tracking branch 'origin/master'

liusheng

4 天以前 fd12c3a4d5c0a247c89ab59faba189075a302ffd

 smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java

@@ -284,6 +284,9 @@
        serviceSubtask.setUpdateTime(new Date());
        serviceSubtask.setUpdateBy(serviceTask.getUpdateBy());
        serviceSubtask.setUpdateTime(new Date());
        serviceSubtask.setVisitDeptCode(patMedOuthosp.getDeptcode());
        serviceSubtask.setVisitDeptName(patMedOuthosp.getDeptname());
        serviceSubtask.setUpdateTime(new Date());
        //设置发送时间
        if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
        Date newDate = addDays(patMedOuthosp.getAdmitdate(), serviceTask.getSendDay().intValue());