Commit d8035d3a1be0e31374a528295748e02ebe4c8d15
1 parent
aa92118d13
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 3 additions and 5 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BoneService.java
View file @
d8035d3
| ... | ... | @@ -29,10 +29,7 @@ |
| 29 | 29 | boneQuery.mysqlBuild(boneDao.queryBoneListCount(query)); |
| 30 | 30 | query.start(boneQuery.getOffset()).end(boneQuery.getLimit()); |
| 31 | 31 | } |
| 32 | - query.addOrder(Sort.Direction.DESC, StringUtils.isNotEmpty(boneQuery.getSort()) ? boneQuery.getSort() : "created"); | |
| 33 | - | |
| 34 | - | |
| 35 | - return boneDao.queryBoneList(query); | |
| 32 | + return boneDao.queryBoneList(query.addOrder(Sort.Direction.DESC, "created")); | |
| 36 | 33 | } |
| 37 | 34 | |
| 38 | 35 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java
View file @
d8035d3
| ... | ... | @@ -97,6 +97,7 @@ |
| 97 | 97 | |
| 98 | 98 | query.setLimit(limit); |
| 99 | 99 | query.setPage(page); |
| 100 | + query.setNeed("true"); | |
| 100 | 101 | query.setHospitalId(hospitalId); |
| 101 | 102 | query.setPatientIds(patientIds); |
| 102 | 103 | query.setType(0); |
| ... | ... | @@ -171,6 +172,7 @@ |
| 171 | 172 | query.setHospitalId(hospitalId); |
| 172 | 173 | query.setPatientIds(babayIds); |
| 173 | 174 | query.setType(1); |
| 175 | + query.setNeed("true"); | |
| 174 | 176 | query.setSort(" created "); |
| 175 | 177 | |
| 176 | 178 | if (start != null && end != null) |
| ... | ... | @@ -180,7 +182,6 @@ |
| 180 | 182 | query.setBirthEnd(start1); |
| 181 | 183 | Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate, -end - 1), 1); |
| 182 | 184 | query.setBirthStart(end1); |
| 183 | - System.out.println(query.convertToQuery().convertToMongoQuery().toString()); | |
| 184 | 185 | } |
| 185 | 186 | |
| 186 | 187 | List<BoneModel> models = BoneService.queryBoneList(query); |