jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3f99d09a09f6b6628cc937246f863c2483f4f1a2

Authored by liquanyu
1 parent 7d3ac3f730
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿童检查

Showing 1 changed file with 30 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 3f99d09
... ... @@ -8683,17 +8683,39 @@
8683 8683  
8684 8684 public BaseObjectResponse getCheckList(String id) {
8685 8685 BaseObjectResponse br = new BaseObjectResponse();
8686   - BabyCheckModelQuery babyCheckModel = new BabyCheckModelQuery();
8687   - babyCheckModel.setBuildId(id);
8688   - babyCheckModel.setYn(YnEnums.YES.getId());
8689   - babyCheckModel.setSort("created asc");
  8686 +
8690 8687 List <BabyCheckListResult> checkListResults = new LinkedList<>();
8691   - List <BabyCheckModel> babyCheckList = babyCheckService.queryBabyCheckListRecord(babyCheckModel);
8692   - if (CollectionUtils.isNotEmpty(babyCheckList)) {
8693   - for (BabyCheckModel babyCheck : babyCheckList) {
8694   - checkListResults.add(getBabyCheckListResult(babyCheck));
  8688 +
  8689 + BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(id);
  8690 +
  8691 + BabyModelQuery babyModelQuery = new BabyModelQuery();
  8692 + babyModelQuery.setMcertNo(babyModel.getMcertNo());
  8693 + List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
  8694 + List<String> buildIds = new ArrayList<>();
  8695 + if (CollectionUtils.isNotEmpty(babyModels))
  8696 + {
  8697 + for (BabyModel model : babyModels)
  8698 + {
  8699 + buildIds.add(model.getId());
  8700 + }
  8701 + }
  8702 +
  8703 + if (CollectionUtils.isNotEmpty(buildIds))
  8704 + {
  8705 + BabyCheckModelQuery babyCheckModel = new BabyCheckModelQuery();
  8706 + String[] strings = new String[buildIds.size()];
  8707 + babyCheckModel.setBuildIds(buildIds.toArray(strings));
  8708 + babyCheckModel.setYn(YnEnums.YES.getId());
  8709 + babyCheckModel.setSort("created asc");
  8710 +
  8711 + List <BabyCheckModel> babyCheckList = babyCheckService.queryBabyCheckListRecord(babyCheckModel);
  8712 + if (CollectionUtils.isNotEmpty(babyCheckList)) {
  8713 + for (BabyCheckModel babyCheck : babyCheckList) {
  8714 + checkListResults.add(getBabyCheckListResult(babyCheck));
  8715 + }
8695 8716 }
8696 8717 }
  8718 +
8697 8719 br.setData(checkListResults);
8698 8720 br.setErrorcode(ErrorCodeConstants.SUCCESS);
8699 8721 br.setErrormsg("成功");