liquanyu / regional-platform

Download as
Browse Code »

Commit c12df6c48c8e5871a122f69378882b6c6db21383

Authored by liquanyu
1 parent c5bee43b37
Exists in master and in 1 other branch dev

update

Showing 2 changed files with 46 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ c12df6c
... ... @@ -1447,7 +1447,6 @@
1447 1447  
1448 1448 if (CollectionUtils.isNotEmpty(hisPatient))
1449 1449 {
1450   - System.out.println("hisPatient size = " + hisPatient.size());
1451 1450 Map<String,Object> babyHis = hisPatient.get(0);
1452 1451 if (babyHis != null && babyHis.get("phone") != null && StringUtils.isNotEmpty(babyHis.get("phone").toString()))
1453 1452 {
1454 1453  
1455 1454  
... ... @@ -1459,12 +1458,13 @@
1459 1458 List list = new ArrayList();
1460 1459 list.add("1");
1461 1460 list.add("2");
1462   - babyQuery.setEnableListNot(list);
  1461 + babyModelQuery.setEnableListNot(list);
1463 1462 }
1464 1463  
1465   - babyQuery.setHospitalIdList(groupsFacade.findGroupHospital(userId, false));
  1464 + List<String> hospitals = groupsFacade.findGroupHospital(userId, false);
  1465 + babyModelQuery.setHospitalIdList(hospitals);
1466 1466 //
1467   - List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  1467 + List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
1468 1468 System.out.println("models = " + models.size());
1469 1469 if (CollectionUtils.isNotEmpty(models)) {
1470 1470 BabyModel model = models.get(0);
... ... @@ -1486,7 +1486,7 @@
1486 1486 BabyModelQuery babyBuildQuery = new BabyModelQuery();
1487 1487 babyBuildQuery.setYn(YnEnums.YES.getId());
1488 1488 babyBuildQuery.setPid(model.getPid());
1489   - List<BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "buildDate", Sort.Direction.DESC);
  1489 + List<BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyBuildQuery, "buildDate", Sort.Direction.DESC);
1490 1490  
1491 1491 List<Map<String, String>> list = new ArrayList<>();
1492 1492 if (CollectionUtils.isNotEmpty(builds)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ c12df6c
... ... @@ -381,6 +381,13 @@
381 381 return result;
382 382 }
383 383  
  384 + /**
  385 + * 历史检验检查的查看页面
  386 + * @param vcCardNo
  387 + * @param phone
  388 + * @param model
  389 + * @return
  390 + */
384 391 private List<LisReportModel> queryLisData(String vcCardNo, String phone,LisReportQuery model) {
385 392  
386 393  
387 394  
... ... @@ -434,7 +441,40 @@
434 441  
435 442 }
436 443  
  444 +
437 445 /**
  446 + * lis辅助检查的查询
  447 + * @param vcCardNo
  448 + * @param phone
  449 + * @param model
  450 + * @return
  451 + */
  452 + private List<LisReportModel> queryCheckLis(String vcCardNo, String phone,LisReportQuery model) {
  453 +
  454 +
  455 + List<LisReportModel> reportModelList = new ArrayList<>();
  456 + //通过就诊卡号和医院id查询到医院下面的lis记录
  457 + if (StringUtils.isNotEmpty(vcCardNo))
  458 + {
  459 + model.setVcCardNo(vcCardNo);
  460 + List<LisReportModel> lises = lisService.queryLisDataByModel(model);
  461 + reportModelList.addAll(lises);
  462 + }
  463 + else if (StringUtils.isNotEmpty(phone))
  464 + {
  465 + model.setVcCardNo(null);
  466 + model.setPhone(phone);
  467 + List<LisReportModel> lises = lisService.queryLisDataByModel(model);
  468 + reportModelList.addAll(lises);
  469 +
  470 + }
  471 + return reportModelList;
  472 +
  473 + }
  474 +
  475 +
  476 +
  477 + /**
438 478 * 返回小程序查询个人的lis报告
439 479 * 该接口由app服务器端调用
440 480 * @param patientIds 院内系统孕妇建档id
... ... @@ -695,7 +735,7 @@
695 735 query.setTitles(titles);
696 736 query.setHospitalId(hospitalId);
697 737 query.setCheckTime(DateUtil.parseYMD(checkTime));
698   - List<LisReportModel> lises = queryLisData(vcCardNo,phone,query);
  738 + List<LisReportModel> lises = queryCheckLis(vcCardNo,phone,query);
699 739  
700 740 if (CollectionUtils.isNotEmpty(lises))
701 741 {