From 504cfae2f66aadbaaf0b53e6916bdffa1552e14a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 22 Apr 2020 12:03:27 +0800 Subject: [PATCH] update --- .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 7 +------ .../platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index c3962c3..bb983a6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -6684,13 +6684,8 @@ public class ViewFacade { public BaseObjectResponse getBabyScreeningInfo(String blNo) { - //String cardNo = qhdfyHisService.queryPatientCardNoByBlNo(blNo); + String cardNo = qhdfyHisService.queryPatientCardNoByBlNo(blNo); - String cardNo = ""; - if (blNo.equals("123")) - { - cardNo = "513436199011104246"; - } System.out.println("query qhd cardno " + cardNo); if (StringUtils.isEmpty(cardNo)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 3f5e922..f081e68 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -457,7 +457,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (positive) { Query query = new Query(criteria); - query.with(new Sort(Sort.Direction.DESC, "checkTime")); + query.with(new Sort(Sort.Direction.DESC, "created")); query.addCriteria(new Criteria().orOperator(Criteria.where("apparatus").is("2"), Criteria.where("doctorJudgement").is("2"))); System.out.println(query.toString()); @@ -482,7 +482,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC List> maps = setDatas(babyEyeChecks); return RespBuilder.buildSuccess(new PageResult(count, page, limit, maps)); } - PageResult pageResult = findMongoPage(BabyEyeCheck.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit); + PageResult pageResult = findMongoPage(BabyEyeCheck.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List babyEyeChecks = (List) pageResult.getGrid(); pageResult.setGrid(setDatas(babyEyeChecks)); return RespBuilder.buildSuccess(pageResult); -- 1.8.3.1