From f434484811e26b019dc915a6937e2f26e0a358dc Mon Sep 17 00:00:00 2001 From: yangfei Date: Sat, 22 Jul 2017 18:00:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=9F=8E=E5=A6=87=E5=B9=BC=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ViewFacade.java | 42 ++++++++++++++-------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 250a94d..be7c55f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1315,7 +1315,7 @@ public class ViewFacade { if (StringUtils.isNotEmpty(data.getVulvaSele())) { if ("2".equals(data.getVulvaSele())) { - map.put("vulvaSele", "未见异常"); + map.put("vulva", "未见异常"); } else if ("1".equals(data.getVulvaSele())) { map.put("vulva", data.getVulva()); } @@ -1324,7 +1324,7 @@ public class ViewFacade { } if (StringUtils.isNotEmpty(data.getVaginaSele())) { if ("2".equals(data.getVaginaSele())) { - map.put("vaginaSele", "未见异常"); + map.put("vagina", "未见异常"); } else if ("1".equals(data.getVaginaSele())) { map.put("vagina", data.getVagina()); } @@ -1333,7 +1333,7 @@ public class ViewFacade { } if (StringUtils.isNotEmpty(data.getCervicalSele())) { if ("2".equals(data.getCervicalSele())) { - map.put("cervicalSele", "未见异常"); + map.put("cervical", "未见异常"); } else if ("1".equals(data.getCervicalSele())) { map.put("cervical", data.getCervical()); } @@ -1342,7 +1342,7 @@ public class ViewFacade { } if (StringUtils.isNotEmpty(data.getUterusSele())) { if ("2".equals(data.getUterusSele())) { - map.put("uterusSele", "未见异常"); + map.put("uterus", "未见异常"); } else if ("1".equals(data.getUterusSele())) { map.put("uterus", data.getUterus()); } @@ -1353,7 +1353,7 @@ public class ViewFacade { if ("1".equals(data.getFujianSele())) { map.put("fujian", data.getFujian()); } else if ("2".equals(data.getFujianSele())) { - map.put("fujianSele", "未见异常"); + map.put("fujian", "未见异常"); } } else {//空 map.put("fujian", data.getFujian()); @@ -1389,13 +1389,17 @@ public class ViewFacade { } mapData.put("gestaDate", antExcAddOther.getGestaDate()); if(antExcAddOther.getFmType()!=null){ - mapData.put("fmType", CZFmTypeEnums.getTitle(antExcAddOther.getFmType())); + mapData.put("fmType", CZFmTypeEnums.getTitle(antExcAddOther.getFmType())+"，"+antExcAddOther.getFmTypeRemark()==null?"":antExcAddOther.getFmTypeRemark()); + }else{ + mapData.put("fmTypeRemark", antExcAddOther.getFmTypeRemark()); } - mapData.put("fmTypeRemark", antExcAddOther.getFmTypeRemark()); + if(antExcAddOther.getFitness()!=null){ - mapData.put("fitness", FitnessEnums.getTitle(antExcAddOther.getFitness())); + mapData.put("fitness", FitnessEnums.getTitle(antExcAddOther.getFitness())+"，"+antExcAddOther.getFitnessRemark()==null?"":antExcAddOther.getFitnessRemark()); + }else{ + mapData.put("fitness", antExcAddOther.getFitnessRemark()); } - mapData.put("fitnessRemark", antExcAddOther.getFitnessRemark()); + mapData.put("newborWeight", antExcAddOther.getNewborWeight()); antExcAddOthersList.add(mapData); } @@ -1414,15 +1418,22 @@ public class ViewFacade { } if (otherMap.containsKey("fmType")) { String fmType = CZFmTypeEnums.getTitle(Integer.parseInt(otherMap.get("fmType").toString())); - mapData.put("fmType", fmType); + if(otherMap.get("fmTypeRemark")!=null){ + mapData.put("fmType", fmType+"，"+otherMap.get("fmTypeRemark")); + }else{ + mapData.put("fmType", fmType); + } + }else{ + mapData.put("fmType", otherMap.get("fmTypeRemark")); } - mapData.put("fmTypeRemark", otherMap.get("fmTypeRemark")); if (otherMap.containsKey("fitness")) { String fitness = FitnessEnums.getTitle(Integer.parseInt(otherMap.get("fitness").toString())); + if(otherMap.get("fitnessRemark")!=null){ + mapData.put("fitness", fitness+"，"+otherMap.get("fitnessRemark")); + } mapData.put("fitness", fitness); - } - if (otherMap.get("fitnessRemark") != null) { - mapData.put("fitnessRemark", otherMap.get("fitnessRemark")); + }else{ + mapData.put("fitness", otherMap.get("fitnessRemark")); } if (otherMap.get("newborWeight") != null) { mapData.put("newborWeight", UnitUtils.unitSplice(otherMap.get("newborWeight"),UnitConstants.G)); @@ -1746,6 +1757,9 @@ public class ViewFacade { map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查"); map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查"); + + map.put("zdjcxm","早孕期病毒检测："+map.get("zyqbdjc")+"， NT检查："+map.get("ntjc")+"， 产前筛查："+map.get("cjsc")+"， 胎儿系统排畸B超："+map.get("textpjbc")+"， 75gOGTT："+map.get("s75gdgtt")+"， 甲状腺功能："+map.get("jzxgn")+"\n"); + //早孕期病毒检测 // private String zyqbdjc; //nt检查 -- 1.8.3.1