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

@@ -735,8 +735,8 @@ public class StatisticsEsService {
            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();
                    double a = o1.getDouble("total");
                    double b = o2.getDouble("total");
                    if (a > b) {
                        return -1;
                    } else if(a == b) {