From 9c229dda9e529507135791e74f38251275cec676 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 27 Jan 2022 17:01:03 +0800 Subject: [PATCH] =?UTF-8?q?update-=E5=88=86=E5=A8=A9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98MatDeliverFacade=E7=B1=BB?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/MatDeliverFacade.java | 8 +++++--- .../platform/operate/web/worker/MaterDeliverWorker2.java | 16 +++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 2c85940..51940e5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2614,9 +2614,9 @@ public class MatDeliverFacade { } if (!childbirthManagerRequest.isExcel() && childbirthManagerRequest.getHloseBloodType() == null && StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) && childbirthManagerRequest.getWeight() == null) {//导出excel和根据出血量查询 - patientsQuery.setLimit(childbirthManagerRequest.getLimit()); - patientsQuery.setPage(childbirthManagerRequest.getPage()); - patientsQuery.setNeed("need"); +// patientsQuery.setLimit(childbirthManagerRequest.getLimit()); +// patientsQuery.setPage(childbirthManagerRequest.getPage()); +// patientsQuery.setNeed("need"); } patientsQuery.setProvinceId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId()) ? null : childbirthManagerRequest.getRegisterProvinceId()); patientsQuery.setCityId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId()) ? null : childbirthManagerRequest.getRegisterCityId()); @@ -2868,6 +2868,8 @@ public class MatDeliverFacade { }else {//否则按常规查询 matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); + // 这里就设置分页内容 + childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker2.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker2.java index 0af8669..89547b1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker2.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker2.java @@ -73,9 +73,15 @@ public class MaterDeliverWorker2 implements Callable> { initQueryMapqhdky.put("dt", StringUtils.isNotEmpty(exChuModel.getTireNumber())?1==Integer.parseInt(exChuModel.getTireNumber())?"是":"否":""); initQueryMapqhdky.put("dantai", StringUtils.isNotEmpty(exChuModel.getTireNumber())?1 map = JSON.parseObject(exChuModel.getBp(), HashMap.class); - initQueryMapqhdky.put("ssy", null!=map.get("ssy")?map.get("ssy").toString():""); - initQueryMapqhdky.put("szy", null!=map.get("szy")?map.get("szy").toString():""); + Map map = JSON.parseObject(exChuModel.getBp(), HashMap.class); + if(MapUtils.isNotEmpty(map)){ + initQueryMapqhdky.put("ssy", null!=map.get("ssy")?map.get("ssy").toString():""); + initQueryMapqhdky.put("szy", null!=map.get("szy")?map.get("szy").toString():""); + }else { + initQueryMapqhdky.put("ssy", ""); + initQueryMapqhdky.put("szy", ""); + } + }else { initQueryMapqhdky.put("ssy", ""); initQueryMapqhdky.put("szy", ""); @@ -127,11 +133,11 @@ public class MaterDeliverWorker2 implements Callable> { if(2==antExRecordModel.getType()){ //初诊 Criteria criteriaf= Criteria.where("id").is(antExRecordModel.getfId()); AntExChuModel AntExChu = mongoTemplate.findOne(Query.query(criteriaf), AntExChuModel.class); - initQueryMapqhdky.put("cweight", null!=AntExChu.getWeight()?AntExChu.getWeight().toString():""); + initQueryMapqhdky.put("cweight", null!=AntExChu?null!=AntExChu.getWeight()?AntExChu.getWeight().toString():"":""); }else { //复诊 Criteria criteriaf= Criteria.where("id").is(antExRecordModel.getfId()); AntenatalExaminationModel AntExFu = mongoTemplate.findOne(Query.query(criteriaf), AntenatalExaminationModel.class); - initQueryMapqhdky.put("cweight", null!=AntExFu.getWeight()?AntExFu.getWeight().toString():""); + initQueryMapqhdky.put("cweight", null!=AntExFu?null!=AntExFu.getWeight()?AntExFu.getWeight().toString():"":""); } }else { initQueryMapqhdky.put("cweight", ""); -- 1.8.3.1