From 860b10b9e8be731e60d59e1fffa229c3d1557470 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Wed, 31 Oct 2018 12:16:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=88=E5=8F=8C=E5=87=BB=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E6=83=85=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/operate/web/facade/ViewFacade.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 8aaed6b..7ecb1cd 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
@@ -2643,8 +2643,12 @@ public class ViewFacade {
         //胎盘信息
         List<Map<String, Object>> ExtPlacentaList = new ArrayList<>();
 
+        //存放胎盘大小集合，便于前端打印计算使用
+        List<Map<String,Object>> tpSizeList = new ArrayList<>();
+
         if (CollectionUtils.isNotEmpty(data.getExtPlacentas())) {
             for (MaternalDeliverModel.ExtPlacenta temp : data.getExtPlacentas()) {
+                Map<String, Object> sizeMap = new HashMap<>();
                 Map<String, Object> extMap = new HashMap<>();
                 String tpmcType = "";
                 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(temp.getTpmcType())) {
@@ -2663,6 +2667,9 @@ public class ViewFacade {
                     tpSize += temp.getTpSize().get("c") + UnitConstants.CM + "*" + temp.getTpSize().get("k") + UnitConstants.CM + "*" + temp.getTpSize().get("g") + UnitConstants.CM;
                 }
                 extMap.put("tpSize", tpSize);
+                sizeMap.put("c",temp.getTpSize().get("c"));
+                sizeMap.put("k",temp.getTpSize().get("k"));
+                sizeMap.put("g",temp.getTpSize().get("g"));
                 extMap.put("tpWeight", UnitUtils.unitSplice(temp.getTpWeight(), UnitConstants.G));
                 extMap.put("umbilicalCordLength", UnitUtils.unitSplice(temp.getUmbilicalCordLength(), UnitConstants.CM));
 
@@ -2697,10 +2704,13 @@ public class ViewFacade {
                 /****************************/
 
                 ExtPlacentaList.add(extMap);
+                tpSizeList.add(sizeMap);
             }
         }
         map.put("extPlacentas", ExtPlacentaList);
 
+        map.put("tpSizeList",tpSizeList);
+
         //新生儿信息
 
         List<Map<String, Object>> babyList = new ArrayList<>();
-- 
1.8.3.1