Commit 24e5e18e7dee621e74dd7e3629f32e32402b1ece
1 parent
cc9cf1be92
Exists in
master
and in
6 other branches
当天儿童检查列表
Showing 2 changed files with 19 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
24e5e18
| ... | ... | @@ -1760,8 +1760,8 @@ |
| 1760 | 1760 | BabyModelQuery babyQuery = new BabyModelQuery(); |
| 1761 | 1761 | babyQuery.setYn(YnEnums.YES.getId()); |
| 1762 | 1762 | |
| 1763 | -// List<BabyCheckModel> babyCheckList = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.DESC); | |
| 1764 | 1763 | List<BabyCheckModel> babyCheckList = babyCheckService.queryBabyCheckRecord(query); |
| 1764 | + List<String> ids = new ArrayList<>(); | |
| 1765 | 1765 | List<BabyModel> babyModels = new ArrayList<>(); |
| 1766 | 1766 | if (CollectionUtils.isNotEmpty(babyCheckList)) |
| 1767 | 1767 | { |
| 1768 | 1768 | |
| ... | ... | @@ -1770,12 +1770,16 @@ |
| 1770 | 1770 | String buildId = babyCheck.getBuildId(); |
| 1771 | 1771 | if (StringUtils.isNotEmpty(buildId)) |
| 1772 | 1772 | { |
| 1773 | - babyQuery.setId(buildId); | |
| 1774 | - List<BabyModel> babyResult = babyBookbuildingService.queryBabyBuildByCond(babyQuery); | |
| 1775 | - babyModels.addAll(babyResult); | |
| 1773 | + if (!ids.contains(buildId)) | |
| 1774 | + { | |
| 1775 | + babyQuery.setId(buildId); | |
| 1776 | + List<BabyModel> babyResult = babyBookbuildingService.queryBabyBuildByCond(babyQuery); | |
| 1777 | + babyModels.addAll(babyResult); | |
| 1778 | + } | |
| 1776 | 1779 | } |
| 1777 | 1780 | } |
| 1778 | 1781 | } |
| 1782 | + ids.clear(); | |
| 1779 | 1783 | List<BabyManageListResult> list = new ArrayList<>(); |
| 1780 | 1784 | if (CollectionUtils.isNotEmpty(babyModels)) |
| 1781 | 1785 | { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
View file @
24e5e18
| ... | ... | @@ -407,6 +407,10 @@ |
| 407 | 407 | else if("2100001605".equals(model.getHospitalId())){ |
| 408 | 408 | model.setVcCardNo(cardNo); |
| 409 | 409 | } |
| 410 | +// //昌邑市妇幼保健院 lis检查表中存的是病历号 需要用身份证号码转换成病历好查询 | |
| 411 | +// else if("2100001605".equals(model.getHospitalId())){ | |
| 412 | +// model.setVcCardNo(cardNo); //TODO | |
| 413 | +// } | |
| 410 | 414 | else { |
| 411 | 415 | model.setVcCardNo(vcCardNo); |
| 412 | 416 | } |
| ... | ... | @@ -554,7 +558,13 @@ |
| 554 | 558 | else if("2100001605".equals(pat.getHospitalId())) |
| 555 | 559 | { |
| 556 | 560 | vcCardNos.add(pat.getCardNo()); |
| 557 | - }else { | |
| 561 | + } | |
| 562 | +// //昌邑市妇幼保健院 lis检查表中存的是病历号 需要用身份证号码转换成病历好查询 | |
| 563 | +// else if("2100001605".equals(pat.getHospitalId())){ | |
| 564 | +// vcCardNos.add(pat.getCardNo()); //TODO | |
| 565 | +// } | |
| 566 | + else | |
| 567 | + { | |
| 558 | 568 | vcCardNos.add(pat.getVcCardNo()); |
| 559 | 569 | } |
| 560 | 570 |