Merge branch 'dev' of zengmengkang/wlyy2.0 into dev

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

@@ -107,7 +107,7 @@ public class StatisticsEsService {
        object.put("priceTotal",saveModel2.getResult1().longValue());//总收入
        object.put("priceDayRate",baseEvaluateScoreService.judgeScore(saveModel2.getResult1().doubleValue(),saveModel3.getResult1().doubleValue()));
        object.put("priceWeekRate",baseEvaluateScoreService.judgeScore(saveModel2.getResult1().doubleValue(),saveModel4.getResult1().doubleValue()));
        String prescriptionRate = baseEvaluateScoreService.getPercentage(saveModel1.getResult2().floatValue(), saveModel.getResult2().floatValue());
        String prescriptionRate = getRange(saveModel1.getResult2().intValue(), saveModel.getResult2().intValue(),0);
        object.put("prescriptionRate",prescriptionRate);//开方率
        String startTime = DateUtil.getStringDateShort()+" 00:00:00";
        String endTime = DateUtil.getStringDateShort() +" 23:59:59";