Commit 504cfae2f66aadbaaf0b53e6916bdffa1552e14a
1 parent
e82d5a2bb9
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 3 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
504cfae
| ... | ... | @@ -6684,13 +6684,8 @@ |
| 6684 | 6684 | |
| 6685 | 6685 | public BaseObjectResponse getBabyScreeningInfo(String blNo) { |
| 6686 | 6686 | |
| 6687 | - //String cardNo = qhdfyHisService.queryPatientCardNoByBlNo(blNo); | |
| 6687 | + String cardNo = qhdfyHisService.queryPatientCardNoByBlNo(blNo); | |
| 6688 | 6688 | |
| 6689 | - String cardNo = ""; | |
| 6690 | - if (blNo.equals("123")) | |
| 6691 | - { | |
| 6692 | - cardNo = "513436199011104246"; | |
| 6693 | - } | |
| 6694 | 6689 | System.out.println("query qhd cardno " + cardNo); |
| 6695 | 6690 | if (StringUtils.isEmpty(cardNo)) |
| 6696 | 6691 | { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
504cfae
| ... | ... | @@ -457,7 +457,7 @@ |
| 457 | 457 | if (positive) { |
| 458 | 458 | |
| 459 | 459 | Query query = new Query(criteria); |
| 460 | - query.with(new Sort(Sort.Direction.DESC, "checkTime")); | |
| 460 | + query.with(new Sort(Sort.Direction.DESC, "created")); | |
| 461 | 461 | query.addCriteria(new Criteria().orOperator(Criteria.where("apparatus").is("2"), Criteria.where("doctorJudgement").is("2"))); |
| 462 | 462 | System.out.println(query.toString()); |
| 463 | 463 | |
| ... | ... | @@ -482,7 +482,7 @@ |
| 482 | 482 | List<Map<String, Object>> maps = setDatas(babyEyeChecks); |
| 483 | 483 | return RespBuilder.buildSuccess(new PageResult(count, page, limit, maps)); |
| 484 | 484 | } |
| 485 | - PageResult pageResult = findMongoPage(BabyEyeCheck.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit); | |
| 485 | + PageResult pageResult = findMongoPage(BabyEyeCheck.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); | |
| 486 | 486 | List<BabyEyeCheck> babyEyeChecks = (List<BabyEyeCheck>) pageResult.getGrid(); |
| 487 | 487 | pageResult.setGrid(setDatas(babyEyeChecks)); |
| 488 | 488 | return RespBuilder.buildSuccess(pageResult); |