From 49cbe6ea95f884b35109da32f05daa824c0053f8 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 27 Jan 2022 15:58:56 +0800 Subject: [PATCH] update --- .../operate/web/facade/MatDeliverFacade.java | 2 +- .../operate/web/worker/MaterDeliverWorker2.java | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 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 745e4b1..ea15b59 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 @@ -3862,7 +3862,7 @@ public class MatDeliverFacade { public void childbirthManagerExcel2(ChildbirthManagerRequest childbirthManagerRequest, HttpServletResponse httpServletResponse)throws Exception { try { - Map query = childbirthManagerRequest.getInitQueryMapqhdky(); + Map query = childbirthManagerRequest.getNormalQueryMap(); String queryStr = ""; for (String key : query.keySet()) { queryStr += key + ","; 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 949f590..0af8669 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,9 @@ 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", map.get("ssy")); - initQueryMapqhdky.put("szy", map.get("szy")); + Map 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():""); }else { initQueryMapqhdky.put("ssy", ""); initQueryMapqhdky.put("szy", ""); @@ -143,9 +143,9 @@ public class MaterDeliverWorker2 implements Callable> { initQueryMapqhdky.put("jw", StringUtils.isNotEmpty(exChuModel.getJw())?exChuModel.getJw():""); initQueryMapqhdky.put("yw", StringUtils.isNotEmpty(exChuModel.getYw())?exChuModel.getYw():""); if(StringUtils.isNotEmpty(exChuModel.getFamilyHistory())){ - Map map = JSON.parseObject(exChuModel.getFamilyHistory(), HashMap.class); + Map map = JSON.parseObject(exChuModel.getFamilyHistory(), HashMap.class); if(MapUtils.isNotEmpty(map)){ - if("no".equals(map.get("yesOrNo"))){ + if(null!=map.get("yesOrNo")&&"no".equals(map.get("yesOrNo").toString())){ initQueryMapqhdky.put("fpfq", ""); initQueryMapqhdky.put("tnbfq", ""); initQueryMapqhdky.put("gxyfq", ""); @@ -153,12 +153,12 @@ public class MaterDeliverWorker2 implements Callable> { initQueryMapqhdky.put("tnbmq", ""); initQueryMapqhdky.put("gxymq", ""); }else { - initQueryMapqhdky.put("fpfq", StringUtils.isNotEmpty(map.get("fpfq"))?"true".equals(map.get("fpfq"))?"是":"否":""); - initQueryMapqhdky.put("tnbfq", StringUtils.isNotEmpty(map.get("tnbfq"))?"true".equals(map.get("tnbfq"))?"是":"否":""); - initQueryMapqhdky.put("gxyfq", StringUtils.isNotEmpty(map.get("gxyfq"))?"true".equals(map.get("gxyfq"))?"是":"否":""); - initQueryMapqhdky.put("fpmq", StringUtils.isNotEmpty(map.get("fpmq"))?"true".equals(map.get("fpmq"))?"是":"否":""); - initQueryMapqhdky.put("tnbmq", StringUtils.isNotEmpty(map.get("tnbmq"))?"true".equals(map.get("tnbmq"))?"是":"否":""); - initQueryMapqhdky.put("gxymq", StringUtils.isNotEmpty(map.get("gxymq"))?"true".equals(map.get("gxymq"))?"是":"否":""); + initQueryMapqhdky.put("fpfq", null!=map.get("fpfq")?(boolean)map.get("fpfq")?"是":"否":""); + initQueryMapqhdky.put("tnbfq", null!=map.get("tnbfq")?(boolean)map.get("tnbfq")?"是":"否":""); + initQueryMapqhdky.put("gxyfq", null!=map.get("gxyfq")?(boolean)map.get("gxyfq")?"是":"否":""); + initQueryMapqhdky.put("fpmq", null!=map.get("fpmq")?(boolean)map.get("fpmq")?"是":"否":""); + initQueryMapqhdky.put("tnbmq", null!=map.get("tnbmq")?(boolean)map.get("tnbmq")?"是":"否":""); + initQueryMapqhdky.put("gxymq", null!=map.get("gxymq")?(boolean)map.get("gxymq")?"是":"否":""); } }else { initQueryMapqhdky.put("fpfq", ""); -- 1.8.3.1