Merge remote-tracking branch 'origin/master'

liusheng

19 小时以前 127bfa0f3d118df3c4754e8f260d667d1c7903b7

Merge remote-tracking branch 'origin/master'

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

@@ -44,4 +44,7 @@

    @ApiModelProperty(value = "科室病区")
    private Integer statisticaltype;

    private String visitDeptCode;
    private String visitDeptName;
}

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

@@ -142,4 +142,8 @@
    private Long weChatAgain = 0L;
    @ApiModelProperty(value = "结果异常")
    private Long abnormalAgain = 0L;


    @ApiModelProperty(value = "科室病区")
    private Integer statisticaltype;
}