Merge remote-tracking branch 'origin/master'

liusheng

6 天以前 36c95e19d39eb855c7a3ae23b4468d5cd3cb88ed

 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;
@@ -729,6 +729,9 @@
    @ApiModelProperty(value = "随访部门名称")
    private String visitDeptName;

    @ApiModelProperty(value = "异常预警：0绿色；1红色；2黄色")
    private Integer isabnormal;

    @ApiModelProperty(value = "随访部门编码集合")
    private List<String> visitDeptCodes;
}