Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 fb9c56894fcee50e17f47253728a4ef0f16a1e0a

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

@@ -178,5 +178,43 @@
    @ApiModelProperty(value = "类别ID")
    private Long categoryid;

    /**
     * 部门code
     */
    @Excel(name = "  部门code")
    @ApiModelProperty(value = "部门code集合")
    private List<String> leaveldeptcodes;

    @ApiModelProperty("问题ID")
    @Excel(name = "问题ID集合")
    private List<Long> scriptIds;

    /**
     * 问券题目分类ID集合
     */
    @ApiModelProperty("满意度意见异常（只针对文本）")
    private String isMydException;

    /**
     * 问券题目分类ID集合
     */
    @ApiModelProperty("问题维度")
    private String dimension;

    @ApiModelProperty(value = "查询参数 joyCount-满意度统计; returnVisitCount-复诊统计")
    private String configKey;

    @ApiModelProperty(value = "查询参数对应值 joyCount-满意度统计; returnVisitCount-复诊统计")
    private String configValue;

    @ApiModelProperty(value = "是否填报 0-全部 1-已填报")
    private String isFilled;

    /**
     * 出院病区编号
     */
    @ApiModelProperty(value = "出院病区编号集合")
    private List<String> leavehospitaldistrictcodes;

    private List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions;
}