Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageLogDO.java

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

@@ -4452,14 +4452,15 @@ public class StatisticsEsService {
        String nowStartDate = DateUtil.getStringDateShort();
        String monthStartDate = DateUtil.getFristDayOfMonth();
        String monthEndDate = DateUtil.getLastDayOfMonth();
        DecimalFormat decimalFormat = new DecimalFormat("0.00");
        //今日收入总收入
        SaveModel nowPrice = elasticsearchUtil.findOneDateQuotaLevel0(nowStartDate, nowStartDate, area, level, index, SaveModel.timeLevel_ZL);
        object.put("nowPrice",nowPrice.getResult1());
        object.put("nowPrice",decimalFormat.format(nowPrice.getResult1()));
        //本月总收入
        SaveModel nowMonthPrice = elasticsearchUtil.findOneDateQuotaLevel0(monthStartDate, monthEndDate, area, level, index, SaveModel.timeLevel_ZL);
        object.put("nowMonthPrice",nowPrice.getResult1());
        object.put("nowMonthPrice",decimalFormat.format(nowPrice.getResult1()));
        SaveModel totalPrice = elasticsearchUtil.findOneDateQuotaLevel0(nowStartDate, nowStartDate, area, level, index, SaveModel.timeLevel_DDL);
        object.put("totalPrice",totalPrice.getResult1());
        object.put("totalPrice",decimalFormat.format(totalPrice.getResult1()));
        return object;
    }