Merge branch 'master' into master-任务组

陈昶聿

9 天以前 c93b5be2de361e5625ed199dbbeb42704d5e1cb1

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

@@ -3176,6 +3176,18 @@
                serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
            }

            //首次出院随访-统计再次推送数量
            if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() > 1) {
                //再次应随访
                if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
                    serviceSubtaskStatistic.setNeedFollowUpAgain(serviceSubtaskStatistic.getNeedFollowUpAgain() + 1L);
                }
                //再次随访完成
                if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 6) {
                    serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
                }
            }

            //首次出院随访
            if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() == 1) {
                //首次应随访
@@ -4586,6 +4598,12 @@
    }

    @Override
    public List<ServiceSubtask> gethelibraryCountHyperlink(HeLibraryCountVO heLibraryCountVO){
        List<ServiceSubtask> serviceSubtasks = serviceSubtaskMapper.gethelibraryCountHyperlink(heLibraryCountVO);
        return serviceSubtasks;
    }

    @Override
    public Map<String, Object> smsSubTask(Long subid) {
        log.info("smsSubTask的入参为：{}", subid);
        Map<String, Object> resultMap = new HashMap<>();