Commit 2b60faf2c667676655a2681c8d8ae3248f612692

Authored by liquanyu
1 parent dcc6b9a809

update

Showing 2 changed files with 28 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostkfController.java View file @ 2b60faf
... ... @@ -66,14 +66,14 @@
66 66 /**
67 67 * 查询儿童评估表
68 68 * @param request
69   - * @param mid
  69 + * @param babyId
70 70 * @return
71 71 */
72 72 @TokenRequired
73 73 @ResponseBody
74 74 @RequestMapping(value = "/getBabyAssess", method = RequestMethod.GET)
75   - public BaseResponse getBabyAssess(HttpServletRequest request,@RequestParam(required = true) String mid) {
76   - return postkfFaccade.getBabyAssess(mid, getUserId(request));
  75 + public BaseResponse getBabyAssess(HttpServletRequest request,@RequestParam(required = true) String babyId) {
  76 + return postkfFaccade.getBabyAssess(babyId, getUserId(request));
77 77 }
78 78 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 2b60faf
... ... @@ -2571,11 +2571,7 @@
2571 2571 // 分娩方式去另外一张表查
2572 2572 patientsQuery.setDesc("fmDate");
2573 2573 patientsQuery.setSort("fmDate");
2574   -
2575   -
2576   - //System.out.println("分娩档案查询" + patientsQuery.convertToQuery().convertToMongoQuery().toString());
2577 2574 List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
2578   - System.out.println("分娩档案查询结束" + patientsQuery.convertToQuery().convertToMongoQuery().toString());
2579 2575  
2580 2576 // 这里就设置分页内容
2581 2577 childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo());
2582 2578  
2583 2579  
... ... @@ -2756,14 +2752,38 @@
2756 2752 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
2757 2753 } else {
2758 2754 //秦皇岛要是有初诊医院查询,支持分页正确加的,以前逻辑不知道所以保留了
2759   - if(StringUtils.isNotEmpty(childbirthManagerRequest.getCzHospitalId())){
  2755 + if(StringUtils.isNotEmpty(childbirthManagerRequest.getCzHospitalId())) {
2760 2756 matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
2761 2757 matDeliverQuery.setPage(childbirthManagerRequest.getPage());
2762 2758 matDeliverQuery.setNeed("need");
2763 2759 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
2764 2760 // 这里就设置分页内容
2765 2761 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
  2762 + }
  2763 + else if (childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null)
  2764 + {
  2765 + if (StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()))
  2766 + {
  2767 + matDeliverQuery.setParentIdList(null);
  2768 + }
2766 2769  
  2770 + if (StringUtils.isNotEmpty(childbirthManagerRequest.getBirthDate())) {
  2771 + try {
  2772 + matDeliverQuery.setCreatedStart(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[0]);
  2773 + matDeliverQuery.setEndStart(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[1]);
  2774 + } catch (Exception e) {
  2775 + // 什么都不做,这里是数据传入错误了
  2776 + }
  2777 + }
  2778 +
  2779 + matDeliverQuery.setFmHospital(hid);
  2780 + matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
  2781 + matDeliverQuery.setPage(childbirthManagerRequest.getPage());
  2782 + matDeliverQuery.setNeed("need");
  2783 + System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
  2784 + maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
  2785 + // 这里就设置分页内容
  2786 + childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
2767 2787 }else {//否则按常规查询
2768 2788 maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
2769 2789 }