From a4cdaccd0daf2335d371f39b264f05e23a93d13c Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Mon, 27 Aug 2018 14:47:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=86=A0=E6=96=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/hospitalapi/qhdfy/QhdJbgwInterface.java | 187 ++++++++++++++------- .../operate/web/controller/QhdJbgwController.java | 10 ++ 2 files changed, 135 insertions(+), 62 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java index a512e2f..17a0860 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java @@ -1409,37 +1409,58 @@ public class QhdJbgwInterface { map.put("SKINABNORMVALUE",null); }else if("yes".equals(mapskin.get("yesOrNo"))){ map.put("SKINABNORMCODE","2"); - String skinZw = null; - if(true==mapskin.get("sz")){ - skinZw+="湿疹"; + String skinZw = new String(); + if(mapskin.get("sz") != null){ + if(true==mapskin.get("sz")){ + skinZw+="湿疹"; + } } - if(true==mapskin.get("hr")){ - skinZw+=",黄染"; + if(mapskin.get("hr") != null){ + if(true==mapskin.get("hr")){ + skinZw+=",黄染"; + } } - if(true==mapskin.get("fg")){ - skinZw+=",发绀"; + if(mapskin.get("fg") != null){ + if(true==mapskin.get("fg")){ + skinZw+=",发绀"; + } } - if(true==mapskin.get("qb")){ - skinZw+=",苍白"; + if(mapskin.get("qb") != null){ + if(true==mapskin.get("qb")){ + skinZw+=",苍白"; + } } - if("true".equals(mapskin.get("mxxgl"))){ - skinZw+=",毛细血管瘤"; + if(mapskin.get("mxxgl") != null){ + if("true".equals(mapskin.get("mxxgl"))){ + skinZw+=",毛细血管瘤"; + } } - if(true==mapskin.get("bk")){ - skinZw+=",包块"; + if(mapskin.get("bk") != null){ + if(true==mapskin.get("bk")){ + skinZw+=",包块"; + } } - if(true==mapskin.get("yz")){ - skinZw+=",硬肿"; + if(mapskin.get("yz") != null){ + if(true==mapskin.get("yz")){ + skinZw+=",硬肿"; + } } - if(true==mapskin.get("hz")){ - skinZw+=",红肿"; + if(mapskin.get("hz") != null){ + if(true==mapskin.get("hz")){ + skinZw+=",红肿"; + } } - if(true==mapskin.get("ch")){ - skinZw+=",潮红"; + if(mapskin.get("ch") != null){ + if(true==mapskin.get("ch")){ + skinZw+=",潮红"; + } } - if(true==mapskin.get("ml")){ - skinZw+=",糜烂"; + if(mapskin.get("ml") != null){ + if(true==mapskin.get("ml")){ + skinZw+=",糜烂"; + } } + map.put("SKINABNORMVALUE",skinZw); } } @@ -1529,20 +1550,23 @@ public class QhdJbgwInterface { } Map mapnavel = babyCheckModel.getNavel(); - if("1".equals(mapnavel.get("select"))){ - map.put("UMBCORDFALLCODE","1"); - map.put("UMBCORDFALLVALUE","未脱"); - }else if("2".equals(mapnavel.get("select"))){ - map.put("UMBCORDFALLCODE","2"); - map.put("UMBCORDFALLVALUE","已脱"); - }else if("3".equals(mapnavel.get("select"))){ - map.put("UMBCORDFALLCODE","3"); - map.put("UMBCORDFALLVALUE","脐部有渗出"); - }else if("4".equals(mapnavel.get("select"))){ - map.put("UMBCORDFALLCODE","4"); - map.put("UMBCORDFALLVALUE","其他"); + if(MapUtils.isNotEmpty(mapnavel)){ + if("1".equals(mapnavel.get("select"))){ + map.put("UMBCORDFALLCODE","1"); + map.put("UMBCORDFALLVALUE","未脱"); + }else if("2".equals(mapnavel.get("select"))){ + map.put("UMBCORDFALLCODE","2"); + map.put("UMBCORDFALLVALUE","已脱"); + }else if("3".equals(mapnavel.get("select"))){ + map.put("UMBCORDFALLCODE","3"); + map.put("UMBCORDFALLVALUE","脐部有渗出"); + }else if("4".equals(mapnavel.get("select"))){ + map.put("UMBCORDFALLCODE","4"); + map.put("UMBCORDFALLVALUE","其他"); + } } + if(babyCheckModel.getSpineFours() != null){ if("未见异常".equals(babyCheckModel.getSpineFours())){ map.put("LIMBSABNORMCODE","1"); @@ -1567,20 +1591,38 @@ public class QhdJbgwInterface { map.put("ANUSABNORMCODE","1"); }else if("yes".equals(mappor.get("yesOrNo"))){ map.put("ANUSABNORMCODE","2"); - String porzw = null; - if(true==mappor.get("ynsz")){ - porzw+=",阴囊水肿"; - }if(true==mappor.get("xmjy")){ - porzw+=",鞘膜积液"; - }if(true==mappor.get("ndxy")){ - porzw+=",尿道下裂"; - }if(true==mappor.get("fggs")){ - porzw+=",腹股沟疝"; - }if(true==mappor.get("yg")){ - porzw+=",隐睾"; - }if(true==mappor.get("ycnx")){ - porzw+=",阴唇粘连"; + String porzw = new String(); + if(mappor.get("ynsz") != null){ + if(true==mappor.get("ynsz")){ + porzw+=",阴囊水肿"; + } + } + if(mappor.get("xmjy") != null){ + if(true==mappor.get("xmjy")){ + porzw+=",鞘膜积液"; + } + } + if(mappor.get("ndxy") != null){ + if(true==mappor.get("ndxy")){ + porzw+=",尿道下裂"; + } } + if(mappor.get("fggs") != null){ + if(true==mappor.get("fggs")){ + porzw+=",腹股沟疝"; + } + } + if(mappor.get("yg") != null){ + if(true==mappor.get("yg")){ + porzw+=",隐睾"; + } + } + if(mappor.get("ycnx") != null){ + if(true==mappor.get("ycnx")){ + porzw+=",阴唇粘连"; + } + } + map.put("ANUSABNORMVALUE",porzw); } @@ -1612,14 +1654,23 @@ public class QhdJbgwInterface { if("no".equals(mapsto.get("yesOrNo"))){ map.put("RICKETSSYMPTOMS","1"); }else{ - String zhi = null; - if(true==mapsto.get("yj")){ - zhi+="2"; - }if(true==mapsto.get("dh")){ - zhi+=",3"; - }if(true==mapsto.get("fz")){ - zhi+=",4"; + String zhi = new String(); + if(mapsto.get("yj") != null){ + if(true==mapsto.get("yj")){ + zhi+="2"; + } + } + if(mapsto.get("dh") != null){ + if(true==mapsto.get("dh")){ + zhi+=",3"; + } } + if(mapsto.get("fz") !=null){ + if(true==mapsto.get("fz")){ + zhi+=",4"; + } + } + map.put("RICKETSSYMPTOMS",zhi); } } @@ -1629,16 +1680,28 @@ public class QhdJbgwInterface { if("no".equals(mapsign.get("yesOrNo"))){ map.put("RICKETSSIGN68","1"); }else{ - String zhi=null; - if(true==mapsign.get("lcz")){ - zhi+="2"; - }if(true==mapsign.get("lrgg")){ - zhi+=",3"; - }if(true==mapsign.get("jx")){ - zhi+=",4"; - }if(true==mapsign.get("szz")){ - zhi+=",5"; + String zhi=new String(); + if(mapsign.get("lcz") != null){ + if(true==mapsign.get("lcz")){ + zhi+="2"; + } } + if(mapsign.get("lrgg") != null){ + if(true==mapsign.get("lrgg")){ + zhi+=",3"; + } + } + if(mapsign.get("jx") != null){ + if(true==mapsign.get("jx")){ + zhi+=",4"; + } + } + if(mapsign.get("szz") != null){ + if(true==mapsign.get("szz")){ + zhi+=",5"; + } + } + map.put("RICKETSSIGN68",zhi); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java index 1c1f308..8234ef2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java @@ -144,4 +144,14 @@ public class QhdJbgwController { } + @RequestMapping(value = "/qhd/xsetj") + @ResponseBody + public List> qhdxinshengerTiJian(String startDate,String endDate){ + if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){ + return qhdJbgwInterface.getEb(startDate, endDate); + } + return null; + } + + } -- 1.8.3.1