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 c379a81..288dd60 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 @@ -74,7 +74,7 @@ public class MaterDeliverWorker2 implements Callable> { Criteria criteria= Criteria.where("parentId").is(patients.getId()); AntExChuModel exChuModel = mongoTemplate.findOne(Query.query(criteria), AntExChuModel.class); if(null!=exChuModel){ - initQueryMapqhdky.put("cc", null!=exChuModel.getProdTime()?0 map = JSON.parseObject(exChuModel.getBp(), HashMap.class); @@ -156,35 +156,35 @@ public class MaterDeliverWorker2 implements Callable> { Map map = JSON.parseObject(exChuModel.getFamilyHistory(), HashMap.class); if(MapUtils.isNotEmpty(map)){ if(null!=map.get("yesOrNo")&&"no".equals(map.get("yesOrNo").toString())){ - initQueryMapqhdky.put("fpfq", ""); - initQueryMapqhdky.put("tnbfq", ""); - initQueryMapqhdky.put("gxyfq", ""); - initQueryMapqhdky.put("fpmq", ""); - initQueryMapqhdky.put("tnbmq", ""); - initQueryMapqhdky.put("gxymq", ""); + initQueryMapqhdky.put("fpfq", "否"); + initQueryMapqhdky.put("tnbfq", "否"); + initQueryMapqhdky.put("gxyfq", "否"); + initQueryMapqhdky.put("fpmq", "否"); + initQueryMapqhdky.put("tnbmq", "否"); + initQueryMapqhdky.put("gxymq", "否"); }else { - 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")?"是":"否":""); + 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", ""); - initQueryMapqhdky.put("tnbfq", ""); - initQueryMapqhdky.put("gxyfq", ""); - initQueryMapqhdky.put("fpmq", ""); - initQueryMapqhdky.put("tnbmq", ""); - initQueryMapqhdky.put("gxymq", ""); + initQueryMapqhdky.put("fpfq", "否"); + initQueryMapqhdky.put("tnbfq", "否"); + initQueryMapqhdky.put("gxyfq", "否"); + initQueryMapqhdky.put("fpmq", "否"); + initQueryMapqhdky.put("tnbmq", "否"); + initQueryMapqhdky.put("gxymq", "否"); } }else{ - initQueryMapqhdky.put("fpfq", ""); - initQueryMapqhdky.put("tnbfq", ""); - initQueryMapqhdky.put("gxyfq", ""); - initQueryMapqhdky.put("fpmq", ""); - initQueryMapqhdky.put("tnbmq", ""); - initQueryMapqhdky.put("gxymq", ""); + initQueryMapqhdky.put("fpfq", "否"); + initQueryMapqhdky.put("tnbfq", "否"); + initQueryMapqhdky.put("gxyfq", "否"); + initQueryMapqhdky.put("fpmq", "否"); + initQueryMapqhdky.put("tnbmq", "否"); + initQueryMapqhdky.put("gxymq", "否"); } initQueryMapqhdky.put("tricer", StringUtils.isNotEmpty(exChuModel.getTricer())?exChuModel.getTricer():""); initQueryMapqhdky.put("totalChol", StringUtils.isNotEmpty(exChuModel.getTotalChol())?exChuModel.getTotalChol():""); @@ -199,12 +199,12 @@ public class MaterDeliverWorker2 implements Callable> { }else { initQueryMapqhdky.put("jw", ""); initQueryMapqhdky.put("yw", ""); - initQueryMapqhdky.put("fpfq", ""); - initQueryMapqhdky.put("tnbfq", ""); - initQueryMapqhdky.put("gxyfq", ""); - initQueryMapqhdky.put("fpmq", ""); - initQueryMapqhdky.put("tnbmq", ""); - initQueryMapqhdky.put("gxymq", ""); + initQueryMapqhdky.put("fpfq", "否"); + initQueryMapqhdky.put("tnbfq", "否"); + initQueryMapqhdky.put("gxyfq", "否"); + initQueryMapqhdky.put("fpmq", "否"); + initQueryMapqhdky.put("tnbmq", "否"); + initQueryMapqhdky.put("gxymq", "否"); initQueryMapqhdky.put("tricer", ""); initQueryMapqhdky.put("totalChol",""); initQueryMapqhdky.put("highDens",""); @@ -297,12 +297,12 @@ public class MaterDeliverWorker2 implements Callable> { initQueryMapqhdky.put("cweight", ""); initQueryMapqhdky.put("jw", ""); initQueryMapqhdky.put("yw", ""); - initQueryMapqhdky.put("fpfq", ""); - initQueryMapqhdky.put("tnbfq", ""); - initQueryMapqhdky.put("gxyfq", ""); - initQueryMapqhdky.put("fpmq", ""); - initQueryMapqhdky.put("tnbmq", ""); - initQueryMapqhdky.put("gxymq", ""); + initQueryMapqhdky.put("fpfq", "否"); + initQueryMapqhdky.put("tnbfq", "否"); + initQueryMapqhdky.put("gxyfq", "否"); + initQueryMapqhdky.put("fpmq", "否"); + initQueryMapqhdky.put("tnbmq", "否"); + initQueryMapqhdky.put("gxymq", "否"); initQueryMapqhdky.put("tricer", ""); initQueryMapqhdky.put("totalChol", ""); initQueryMapqhdky.put("highDens", "");