smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java

@@ -648,13 +648,13 @@
    private String patfrom;

    /**
     * 患者来源
     * 经管医生编码
     */
    @ApiModelProperty(value = "经管医生编码")
    private String managementDoctorCode;

    /**
     * 患者来源
     * 经管医生
     */
    @ApiModelProperty(value = "经管医生")
    private String managementDoctor;

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

@@ -582,7 +582,8 @@
        if (ObjectUtils.isNotEmpty(scriptInfoByCondition) && ObjectUtils.isNotEmpty(scriptInfoByCondition.get("script"))) {
//            log.error("-----------scriptInfoByCondition的值为：{}", scriptInfoByCondition);
            if (scriptInfoByCondition.get("type").equals("1")) {
                List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
                List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOS = (List<IvrTaskTemplateScriptVO>) scriptInfoByCondition.get("script");
                List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = DtoConversionUtils.sourceToTarget(ivrTaskTemplateScriptVOS, IvrLibaTemplateScriptVO.class);
                for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {
                    Map<String, String> scriptResult = getScriptResult(subid, patid, ivrLibaTemplateScriptVO.getId());
                    if (ObjectUtils.isNotEmpty(scriptResult)) {

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

@@ -621,7 +621,7 @@
                            ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
                            serviceSubtaskPreachform.setSort(ObjectUtils.isEmpty(map.get("sort")) ? 0 : Long.valueOf(map.get("sort").toString()));
                            serviceSubtaskPreachform.setPreachform(ObjectUtils.isEmpty(map.get("preachform")) ? "" : map.get("preachform").toString());
                            serviceSubtaskPreachform.setCompensateTime(ObjectUtils.isEmpty(map.get("compensateTime")) ? "" : map.get("preachcompensateTimeform").toString());
                            serviceSubtaskPreachform.setCompensateTime(ObjectUtils.isEmpty(map.get("compensateTime")) ? "" : map.get("compensateTime").toString());
                            serviceSubtaskPreachform.setTaskid(serviceTask.getTaskid());
                            serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
                            //这个sendstate需要在数据库设置一个默认值为“1”