From f88a16ba57a4f6982e2e6fe3cbdc08aad7db0277 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 2 Mar 2017 18:01:54 +0800 Subject: [PATCH] update code --- .../src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java | 6 ++++-- .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java index 6037af5..7df5512 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java @@ -229,7 +229,6 @@ public class QhdfyFmService { fmfs = FmTypeEnums.O.getId(); } deliveryMode.put("fmfs",fmfs); - deliveryMode.put("scfs", ""); deliverAddRequest.setDeliveryMode(deliveryMode); //胎盘信息 List extPlacentas = new ArrayList<>(); @@ -458,7 +457,6 @@ public class QhdfyFmService { fmfs = FmTypeEnums.O.getId(); } deliveryMode.put("fmfs",fmfs); - deliveryMode.put("scfs", ""); deliverAddRequest.setDeliveryMode(deliveryMode); MaternalDeliverModel.ExtPlacenta extPlacenta = new MaternalDeliverModel.ExtPlacenta(); @@ -469,6 +467,10 @@ public class QhdfyFmService { tpmcType = TpmcTypeEnums.O.getId(); } extPlacenta.setTpmcType(tpmcType); + +// Map map = new HashMap(); +// extPlacenta.setTpSize(map); + extPlacentas.add(extPlacenta); deliverAddRequest.setExtPlacentas(extPlacentas); 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 a8ccd74..38003cf 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 @@ -912,8 +912,8 @@ public class ViewFacade { if (fmfs!=null){ if (fmfs.equals("1")){ String fmName = FmTypeEnums.getFmNameById(fmfs); - sb.append(fmName).append(","); if(null!=m.get("scfs")){ + sb.append(fmName).append(","); String scfs =m.get("scfs") .toString(); sb.append(FmTypeEnums.getFmScNameById(scfs)); } @@ -1035,7 +1035,10 @@ public class ViewFacade { extMap.put("mcType", FunvCommonUtil.checkMianChuFS(temp.getMcType())); String tpSize = ""; - tpSize += temp.getTpSize().get("c") + UnitConstants.CM + "*" + temp.getTpSize().get("k") + UnitConstants.CM + "*" + temp.getTpSize().get("g") + UnitConstants.CM; + if (temp.getTpSize() != null && temp.getTpSize().size() > 0) + { + tpSize += temp.getTpSize().get("c") + UnitConstants.CM + "*" + temp.getTpSize().get("k") + UnitConstants.CM + "*" + temp.getTpSize().get("g") + UnitConstants.CM; + } extMap.put("tpSize",tpSize); extMap.put("tpWeight",UnitUtils.unitSplice(temp.getTpWeight(),UnitConstants.G)); extMap.put("umbilicalCordLength",UnitUtils.unitSplice(temp.getUmbilicalCordLength(),UnitConstants.CM)); -- 1.8.3.1