代码提交

liusheng

3 天以前 c462811cd33e81a80bc089e3677975c069d9cda5

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

@@ -521,6 +521,23 @@
        return serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
    }

    @Override
    public Boolean updateTemplate(ServiceSubtaskTemplateVO serviceSubtaskTemplateVO) {
        ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(serviceSubtaskTemplateVO.getSubId());
        if (serviceSubtask == null || serviceSubtask.getSendstate() != 2L)
            throw new BaseException("该任务已发送给患者，不能再进行修改模板");

        Integer taskTempid = svyTaskTemplateService.saveOrUpdateTemplate(serviceSubtaskTemplateVO.getSvyTaskTemplateVO());
        if (taskTempid == null) return false;

        String tempName = svyTaskTemplateService.selectSvyTaskTemplateBySvyid(Long.valueOf(taskTempid)).getSvyname();
        serviceSubtask.setTemplateid(taskTempid.longValue());
        serviceSubtask.setTemplatename(tempName);
        serviceSubtask.setUpdateBy(serviceSubtaskTemplateVO.getUpdateBy());
        serviceSubtask.setLibtemplateid(serviceSubtaskTemplateVO.getSvyTaskTemplateVO().getTemplateid());
        return updateServiceSubtask(serviceSubtask);
    }

    /**
     * 批量删除单一任务（随访）
     *
@@ -657,12 +674,6 @@
                    serviceTaskoper.setOrgid(serviceTask.getOrgid());
                    serviceTaskoper.setCreateTime(new Date());
                    if (StringUtils.isNotEmpty(serviceTaskVO.getOplevelcode())) {
//                        String[] opcodes = serviceTaskVO.getOpcode().split(",");
//                        for (String opcode : opcodes) {
//                            serviceTaskoper.setOpcode(opcode);
//                            log.info("----serviceTaskoper的值为：{}", serviceTaskoper);
//                            serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
//                        }
                        log.info("----serviceTaskoper的值为：{}", serviceTaskoper);
                        serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
                    }
@@ -771,8 +782,7 @@
                }
            }

        }
        else if (serviceTaskVO.getIsoperation() != null && serviceTaskVO.getIsoperation() == 2) {
        } else if (serviceTaskVO.getIsoperation() != null && serviceTaskVO.getIsoperation() == 2) {
            //任务修改
            if (ObjectUtils.isNotEmpty(serviceTaskVO.getSendTimeslot()))
                serviceTask.setSendTimeSlot(JSON.toJSONString(serviceTaskVO.getSendTimeslot()));
@@ -870,13 +880,19 @@
                    serviceTaskdiag.setUpdateTime(new Date());
                    if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
                        String[] icd10codes = serviceTaskVO.getIcd10code().split(",");
                        for (String icdcode : icd10codes) {
                        String[] icd10names = serviceTaskVO.getIcd10name().split(",");
                        if (icd10codes.length != icd10names.length) {
                            throw new BaseException("疾病编码和疾病名称数量不一致");
                        }
                        for (int i = 0; i < icd10codes.length; i++) {
                            //先查询一下是否存在
                            ServiceTaskdiag serviceTaskdiag2 = new ServiceTaskdiag();
                            serviceTaskdiag2.setTaskId(serviceTaskVO.getTaskid());
                            serviceTaskdiag2.setIcd10code(icdcode);
                            serviceTaskdiag2.setIcd10code(icd10codes[i]);
                            serviceTaskdiag2.setIcd10name(icd10names[i]);
                            List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag2);
                            serviceTaskdiag.setIcd10code(icdcode);
                            serviceTaskdiag.setIcd10code(icd10codes[i]);
                            serviceTaskdiag.setIcd10name(icd10names[i]);
                            log.info("----serviceTaskdiag更新的值为：{}", serviceTaskdiag);
                            if (CollectionUtils.isNotEmpty(serviceTaskdiags)) {
                                serviceTaskdiag.setId(serviceTaskdiags.get(0).getId());