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

@@ -730,8 +730,23 @@ public class StatisticsEsService {
                jsonObject.put("total",decimalFormat.format(total));//总和
                array.add(jsonObject);
            }
            object.put("excelData",array);
            List<JSONObject> bindArrayResult = JSONArray.parseArray(array.toJSONString(), JSONObject.class);
            System.out.println("排序前："+bindArrayResult);
            Collections.sort(bindArrayResult, new Comparator<JSONObject>() {
                @Override
                public int compare(JSONObject o1, JSONObject o2) {
                    int a = o1.getString("total").length();
                    int b = o2.getString("total").length();
                    if (a > b) {
                        return -1;
                    } else if(a == b) {
                        return 0;
                    } else
                        return 1;
                }
            });
            JSONArray jsonArray = JSONArray.parseArray(bindArrayResult.toString());
            object.put("excelData",jsonArray);
        }
        return object;
    }
@@ -4520,7 +4535,7 @@ public class StatisticsEsService {
        SaveModel synergyTotal = elasticsearchUtil.findOneDateQuotaLevel1(startDate, endDate, area, level, index, SaveModel.timeLevel_ZL,"2");
        object.put("synergyTotal",decimalFormat.format(synergyTotal.getResult1()));
        //总收入
        SaveModel totalPrice = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, area, level, index, SaveModel.timeLevel_DDL);
        SaveModel totalPrice = elasticsearchUtil.findOneDateQuotaLevel0(startDate, endDate, area, level, index, SaveModel.timeLevel_ZL);
        object.put("totalPrice",decimalFormat.format(totalPrice.getResult1()));
        return object;
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/statistics/EsStatisticsEndpoint.java

@@ -943,7 +943,7 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
    }
    /**
     * app收入统计-头部
     * app中间饼状图-中部
     * @param startDate
     * @param endDate
     * @param area
@@ -952,7 +952,7 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
     * @return
     */
    @GetMapping(value = BaseHospitalRequestMapping.Statistics.appCenterCircular)
    @ApiOperation(value = "app处方统计-头部")
    @ApiOperation(value = "app中间饼状图-中部")
    public ObjEnvelop appCenter(
            @RequestParam(required = true) String startDate,
            @RequestParam(required = true) String endDate,