jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9c229dda9e529507135791e74f38251275cec676

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

update-分娩管理分页问题MatDeliverFacade类改

Showing 2 changed files with 16 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 9c229dd
... ... @@ -2614,9 +2614,9 @@
2614 2614 }
2615 2615 if (!childbirthManagerRequest.isExcel() && childbirthManagerRequest.getHloseBloodType() == null
2616 2616 && StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) && childbirthManagerRequest.getWeight() == null) {//导出excel和根据出血量查询
2617   - patientsQuery.setLimit(childbirthManagerRequest.getLimit());
2618   - patientsQuery.setPage(childbirthManagerRequest.getPage());
2619   - patientsQuery.setNeed("need");
  2617 +// patientsQuery.setLimit(childbirthManagerRequest.getLimit());
  2618 +// patientsQuery.setPage(childbirthManagerRequest.getPage());
  2619 +// patientsQuery.setNeed("need");
2620 2620 }
2621 2621 patientsQuery.setProvinceId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId()) ? null : childbirthManagerRequest.getRegisterProvinceId());
2622 2622 patientsQuery.setCityId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId()) ? null : childbirthManagerRequest.getRegisterCityId());
... ... @@ -2868,6 +2868,8 @@
2868 2868 }else {//否则按常规查询
2869 2869 matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
2870 2870 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
  2871 + // 这里就设置分页内容
  2872 + childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
2871 2873 }
2872 2874 }
2873 2875  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker2.java View file @ 9c229dd
... ... @@ -73,9 +73,15 @@
73 73 initQueryMapqhdky.put("dt", StringUtils.isNotEmpty(exChuModel.getTireNumber())?1==Integer.parseInt(exChuModel.getTireNumber())?"是":"否":"");
74 74 initQueryMapqhdky.put("dantai", StringUtils.isNotEmpty(exChuModel.getTireNumber())?1<Integer.parseInt(exChuModel.getTireNumber())?"是":"否":"");
75 75 if(StringUtils.isNotEmpty(exChuModel.getBp())){
76   - Map<String, Integer> map = JSON.parseObject(exChuModel.getBp(), HashMap.class);
77   - initQueryMapqhdky.put("ssy", null!=map.get("ssy")?map.get("ssy").toString():"");
78   - initQueryMapqhdky.put("szy", null!=map.get("szy")?map.get("szy").toString():"");
  76 + Map<String, Object> map = JSON.parseObject(exChuModel.getBp(), HashMap.class);
  77 + if(MapUtils.isNotEmpty(map)){
  78 + initQueryMapqhdky.put("ssy", null!=map.get("ssy")?map.get("ssy").toString():"");
  79 + initQueryMapqhdky.put("szy", null!=map.get("szy")?map.get("szy").toString():"");
  80 + }else {
  81 + initQueryMapqhdky.put("ssy", "");
  82 + initQueryMapqhdky.put("szy", "");
  83 + }
  84 +
79 85 }else {
80 86 initQueryMapqhdky.put("ssy", "");
81 87 initQueryMapqhdky.put("szy", "");
82 88  
... ... @@ -127,11 +133,11 @@
127 133 if(2==antExRecordModel.getType()){ //初诊
128 134 Criteria criteriaf= Criteria.where("id").is(antExRecordModel.getfId());
129 135 AntExChuModel AntExChu = mongoTemplate.findOne(Query.query(criteriaf), AntExChuModel.class);
130   - initQueryMapqhdky.put("cweight", null!=AntExChu.getWeight()?AntExChu.getWeight().toString():"");
  136 + initQueryMapqhdky.put("cweight", null!=AntExChu?null!=AntExChu.getWeight()?AntExChu.getWeight().toString():"":"");
131 137 }else { //复诊
132 138 Criteria criteriaf= Criteria.where("id").is(antExRecordModel.getfId());
133 139 AntenatalExaminationModel AntExFu = mongoTemplate.findOne(Query.query(criteriaf), AntenatalExaminationModel.class);
134   - initQueryMapqhdky.put("cweight", null!=AntExFu.getWeight()?AntExFu.getWeight().toString():"");
  140 + initQueryMapqhdky.put("cweight", null!=AntExFu?null!=AntExFu.getWeight()?AntExFu.getWeight().toString():"":"");
135 141 }
136 142 }else {
137 143 initQueryMapqhdky.put("cweight", "");