Merge branch 'dev' of yeshijie/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/BaseController.java

@@ -630,7 +630,7 @@ public class BaseController {
            // 总条数
            map.put("totalCount", total);
            // 总页数
            map.put("totalPage", 1);
            map.put("totalPage", Math.ceil((double)total/(rows)));
            // 结果集
            map.put("detailModelList", list);
            return mapper.writeValueAsString(map);

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/DeviceHealthIndexService.java

@@ -140,7 +140,7 @@ public class DeviceHealthIndexService extends BaseDeviceJpaService<DeviceHealthI
//        }
        String f = filter.toString();
//        System.out.println("sql:"+sql+f+" order by i.czrq desc "+" limit "+(page-1)+","+pageSize);
        List<Map<String, Object>> resultList = jdbcTemplate.queryForList(sql+f+" order by i.czrq desc "+" limit "+(page-1)+","+pageSize);
        List<Map<String, Object>> resultList = jdbcTemplate.queryForList(sql+f+" order by i.czrq desc "+" limit "+(page-1)*pageSize+","+pageSize);
        if(resultList.size()<=0){
            return new PageImpl<DeviceHealthIndexVO>(new ArrayList<>(), pageRequest, 0);
        }
@@ -279,7 +279,7 @@ public class DeviceHealthIndexService extends BaseDeviceJpaService<DeviceHealthI
//        }
        String f = filter.toString();
//        System.out.println("sql:"+sql+f+" order by i.czrq desc "+" limit "+(page-1)+","+pageSize);
        List<Map<String, Object>> resultList = jdbcTemplate.queryForList(sql+f+" order by i.czrq desc "+" limit "+(page-1)+","+pageSize);
        List<Map<String, Object>> resultList = jdbcTemplate.queryForList(sql+f+" order by i.czrq desc "+" limit "+(page-1)*pageSize+","+pageSize);
        if(resultList.size()<=0){
            return new PageImpl<DeviceHealthIndexVO>(new ArrayList<>(), pageRequest, 0);
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prenatalInspector/PrenatalInspectorPreCardService.java

@@ -470,7 +470,26 @@ public class PrenatalInspectorPreCardService extends BaseService {
                data = json.getJSONObject("data").getJSONArray("DATA");
            }
            if (data != null && data.size() > 0) {
                return data;
                //排序 智业接口返回的记录没有按检查时间排序
                List<JSONObject> list = new ArrayList<JSONObject>(data.size());
                for (int i=0;i<data.size();i++){
                    list.add(data.getJSONObject(i));
                }
                Collections.sort(list, new Comparator<JSONObject>() {
                    @Override
                    public int compare(JSONObject o1, JSONObject o2) {
                        String time1 = o1.getString("EXAM_TIME");//检查时间
                        String time2 = o2.getString("EXAM_TIME");
                        return time2.compareTo(time1);
                    }
                });
                JSONArray ja = new JSONArray();
                list.forEach(one->{
                    ja.add(one);
                });
                return ja;
            }
            return re;
        } catch (Exception e) {