diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BoneService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BoneService.java index 374ba54..c4cc326 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BoneService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BoneService.java @@ -29,10 +29,7 @@ public class BoneService { boneQuery.mysqlBuild(boneDao.queryBoneListCount(query)); query.start(boneQuery.getOffset()).end(boneQuery.getLimit()); } - query.addOrder(Sort.Direction.DESC, StringUtils.isNotEmpty(boneQuery.getSort()) ? boneQuery.getSort() : "created"); - - - return boneDao.queryBoneList(query); + return boneDao.queryBoneList(query.addOrder(Sort.Direction.DESC, "created")); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java index e908ce3..825a9d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java @@ -97,6 +97,7 @@ public class BoneFacade { query.setLimit(limit); query.setPage(page); + query.setNeed("true"); query.setHospitalId(hospitalId); query.setPatientIds(patientIds); query.setType(0); @@ -171,6 +172,7 @@ public class BoneFacade { query.setHospitalId(hospitalId); query.setPatientIds(babayIds); query.setType(1); + query.setNeed("true"); query.setSort(" created "); if (start != null && end != null) @@ -180,7 +182,6 @@ public class BoneFacade { query.setBirthEnd(start1); Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate, -end - 1), 1); query.setBirthStart(end1); - System.out.println(query.convertToQuery().convertToMongoQuery().toString()); } List models = BoneService.queryBoneList(query);