周统计修改

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -161,7 +161,7 @@ public class StatisticsEsService {
        if (interval==1){
            JSONArray array = dateTotalStatistics2(startDate,endDate,area,level,index,null,SaveModel.timeLevel_ZL,null);
            object.put("data",array);
            JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,"5",null,SaveModel.timeLevel_ZL,null);
            JSONArray array1 = dateTotalStatistics2(startDate,endDate,area,level,"5","1",SaveModel.timeLevel_ZL,null);
            object.put("specialistData",array1);
            JSONArray array2 = dateTotalStatistics2(startDate,endDate,area,level,"12",null,SaveModel.timeLevel_ZL,null);
            object.put("topicData",array2);
@@ -173,7 +173,7 @@ public class StatisticsEsService {
            JSONArray array = weekTotalStatistics7(startDate,endDate,area,level,index,null,SaveModel.timeLevel_ZL);
            object.put("data",array);
            JSONArray array1 = weekTotalStatistics7(startDate,endDate,area,level,"5",null,SaveModel.timeLevel_ZL);
            JSONArray array1 = weekTotalStatistics7(startDate,endDate,area,level,"5","1",SaveModel.timeLevel_ZL);
            object.put("specialistData",array1);
            JSONArray array2 = weekTotalStatistics7(startDate,endDate,area,level,"12",null,SaveModel.timeLevel_ZL);
            object.put("topicData",array2);
@@ -184,7 +184,7 @@ public class StatisticsEsService {
        }else if (interval==3){
            JSONArray array = monthTotalStatistics2(startDate,endDate,area,level,index,null,SaveModel.timeLevel_ZL,null);
            object.put("data",array);
            JSONArray array1 = monthTotalStatistics2(startDate,endDate,area,level,"5",null,SaveModel.timeLevel_ZL,null);
            JSONArray array1 = monthTotalStatistics2(startDate,endDate,area,level,"5","1",SaveModel.timeLevel_ZL,null);
            object.put("specialistData",array1);
            JSONArray array2 = monthTotalStatistics2(startDate,endDate,area,level,"12",null,SaveModel.timeLevel_ZL,null);
            object.put("topicData",array2);
@@ -450,7 +450,7 @@ public class StatisticsEsService {
        }else if (interval==2){
            JSONArray array = weekTotalStatistics7(startDate,endDate,area,level,index,null,SaveModel.timeLevel_ZL);
            object.put("data",array);
            JSONArray array1 = weekTotalStatistics8(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL,null);
            JSONArray array1 = weekTotalStatistics8(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL,"1");
            object.put("specialistData",array1);
            JSONArray array2 = weekTotalStatistics8(startDate,endDate,area,level,index,"1",SaveModel.timeLevel_ZL,"1");
            object.put("topicData",array2);
@@ -461,7 +461,7 @@ public class StatisticsEsService {
        }else if (interval==3){
            JSONArray array = monthTotalStatistics3(startDate,endDate,area,level,index,null,SaveModel.timeLevel_ZL,null);
            object.put("data",array);
            JSONArray array1 = monthTotalStatistics3(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL,null);
            JSONArray array1 = monthTotalStatistics3(startDate,endDate,area,level,index,"3",SaveModel.timeLevel_ZL,"1");
            object.put("specialistData",array1);
            JSONArray array2 = monthTotalStatistics3(startDate,endDate,area,level,index,"1",SaveModel.timeLevel_ZL,"1");
            object.put("topicData",array2);

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/dict/WlyyChargeDictDO.java

@@ -22,26 +22,7 @@ public class WlyyChargeDictDO extends UuidIdentityEntity {
    private Date createTime;
    /**6总部7金榜8夏禾*/
    private String deptTypeCode;
    /**专家咨询费*/
    private double zjFee;
    /**协同费*/
    private double xtFee;
    public double getZjFee() {
        return zjFee;
    }
    public void setZjFee(double zjFee) {
        this.zjFee = zjFee;
    }
    public double getXtFee() {
        return xtFee;
    }
    public void setXtFee(double xtFee) {
        this.xtFee = xtFee;
    }
    public String getChargeType() {
        return chargeType;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyChargeDictVO.java

@@ -26,28 +26,7 @@ public class WlyyChargeDictVO {
    /**6总部7金榜8夏禾*/
    @ApiModelProperty(value = "6总部7金榜8夏禾", example = "模块1")
    private String deptTypeCode;
    /**专家咨询费*/
    @ApiModelProperty(value = "专家咨询费", example = "模块1")
    private double zjFee;
    /**协同费*/
    @ApiModelProperty(value = "协同费", example = "模块1")
    private double xtFee;
    public double getXtFee() {
        return xtFee;
    }
    public void setXtFee(double xtFee) {
        this.xtFee = xtFee;
    }
    public double getZjFee() {
        return zjFee;
    }
    public void setZjFee(double zjFee) {
        this.zjFee = zjFee;
    }
    public String getChargeType() {
        return chargeType;