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 206f113..7d50c0c 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
@@ -260,7 +260,7 @@ public class ViewFacade {
         AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4];
         AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id);
         Patients patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId());
-        if (num < 3) {
+        if (num < 4) {
             exData[num - 1] = antenatalExaminationModel;
         } else {//全部
             String patientsId = antenatalExaminationModel.getParentId();
@@ -274,7 +274,6 @@ public class ViewFacade {
             exData[1] = list.get(1);
             exData[2] = list.get(2);
             exData[3] = list.get(3);
-
         }
 
         // Map<String, Object> map = new HashMap<>();
@@ -1458,6 +1457,16 @@ public class ViewFacade {
         }
         map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG));
         map.put("gongGao", UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM));
+
+        if (StringUtils.isNotEmpty(data.getGongGaoSelect())) {
+            map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()));
+        }
+
+        if (StringUtils.isNotEmpty(data.getGongGaoType())) {
+            map.put("gongGaoType", GongJingEnums.getHengZhiNameById(data.getGongGaoType()));
+        }
+
+
         map.put("abdominalCircumference", UnitUtils.unitSplice(data.getAbdominalCircumference(), UnitConstants.CM));
         String edema = "";
         if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) {
@@ -1486,6 +1495,44 @@ public class ViewFacade {
                     tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition));
                     tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation));
                     tireMap.put("join", JoinEnums.getTitle(join));
+                    if (tire.get("xlwz")!=null) {
+                        tireMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(String.valueOf(tire.get("xlwz"))));
+                    }
+                    if (tire.get("gjwz")!=null) {
+                        tireMap.put("gjwz", GongJingEnums.getWeiZhiNameById(String.valueOf(tire.get("gjwz"))));
+                    }
+
+                    if (tire.get("gjyd")!=null) {
+                        tireMap.put("gjyd", GongJingEnums.getYinDuNameById(String.valueOf(tire.get("gjyd"))));
+                    }
+
+                    if (tire.get("tm")!=null) {
+                        tireMap.put("tm", TaiShuEnums.getTmNameById(String.valueOf(tire.get("tm"))));
+                    }
+
+                    if (tire.get("ydjc")!=null) {
+                        tireMap.put("ydjc", GongJingEnums.getYDJianCeNameById(String.valueOf(tire.get("ydjc"))));
+                    }
+
+                    if (tire.get("gjkd") != null) {
+                        tireMap.put("gjkd", UnitUtils.unitSplice(tire.get("gjkd"), UnitConstants.CM));
+                    }
+
+                    if (tire.get("gjrs") != null) {
+                        tireMap.put("gjrs", UnitUtils.unitSplice(tire.get("gjrs"), UnitConstants.BF));
+                    }
+
+                    if (tire.get("gjwzOther")!=null) {
+                        tireMap.put("gjwzOther", tire.get("gjwzOther"));
+                    }
+
+                    if (tire.get("gjydOther")!=null) {
+                        tireMap.put("gjydOther", tire.get("gjydOther"));
+                    }
+
+                    if (tire.get("yszs") != null) {
+                        tireMap.put("yszs", UnitUtils.unitSplice(tire.get("yszs"), UnitConstants.CM));
+                    }
                     tireList.add(tireMap);
                 }
             }