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

@@ -4624,7 +4624,7 @@ public class StatisticsEsService {
                object.put("videoCount",videoCount);//视频复诊数量
                object.put("videoRate",getRange(videoCount.intValue(),total.intValue(),0));
                object.put("total",total);
            }else if (flag.equalsIgnoreCase("1")){
            }else if (flag.equalsIgnoreCase("2")){
                //快递
                SaveModel saveModel2 = null;
                saveModel2 = elasticsearchUtil.findOneDateQuotaLevel3NoSlaveKey2(startDate, endDate, area, level, index, SaveModel.timeLevel_ZL, "0");