diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index 9b975f0..893b361 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -574,52 +574,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         boolean tzFlag = CollectionUtils.isEmpty(antExChuModels) || StringUtils.isEmpty(antExChuModels.get(antExChuModels.size() - 1).getYqWeight()) || StringUtils.isEmpty(antExChuModels.get(antExChuModels.size() - 1).getHeight()) ? false : true;
 
 
-        for (AntenatalExaminationModel antexModel : antexModels) {
-            Map<String, Object> temp = new HashMap<>();
-            Integer week = DateUtil.getWeek2(p.get(0).getLastMenses(), antexModel.getCheckDate());
-            temp.put("checkTime", DateUtil.getyyyy_MM_dd(antexModel.getCheckDate()));
-            temp.put("week", DateUtil.getWeekDesc(p.get(0).getLastMenses(), antexModel.getCheckDate()));
-            temp.put("weight", antexModel.getWeight());
-            temp.put("bp", parseNull(JSONObject.parseObject(antexModel.getBp()).getString("ssy"), "--") + "/" + parseNull(JSONObject.parseObject(antexModel.getBp()).getString("szy"), "--"));
-            temp.put("gonggao", StringUtils.isEmpty(antexModel.getGongGao()) ? GongJingEnums.GongGao.getName(antexModel.getGongGaoSelect()) + "/" + GongJingEnums.HengZhi.getName(antexModel.getGongGaoType()) : antexModel.getGongGao());
-            if(temp.get("gonggao").toString().equals("--/--")) {
-                temp.put("gonggao", "--");
-            }
-            temp.put("abdominalCircumference", antexModel.getAbdominalCircumference());// 腹围
-
-            List<Map> tireData = antexModel.getTireData();
-            StringBuffer fetalPosition2 = new StringBuffer(); // 胎位
-            StringBuffer heartRate2  = new StringBuffer();  // 胎心
-            StringBuffer fetalPresentation2  = new StringBuffer(); // 先露
-            if(CollectionUtils.isNotEmpty(tireData)) {
-                for (Map tireDatum : tireData) {
-                    if(fetalPosition2.length() > 0) fetalPosition2.append("/");
-                    if(heartRate2.length() > 0) heartRate2.append("/");
-                    if(fetalPresentation2.length() > 0) fetalPresentation2.append("/");
-                    fetalPosition2.append(tireDatum.containsKey("fetalPosition") ? FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : "--");
-                    heartRate2.append(tireDatum.containsKey("heartRate") ? tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : "--");
-                    fetalPresentation2.append(tireDatum.containsKey("fetalPresentation") ? FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : "--");
-                }
-            } else {
-                fetalPosition2.append("--");
-                heartRate2.append("--");
-                fetalPresentation2.append("--");
-            }
-            temp.put("fetalPosition", fetalPosition2.toString()); // 胎位
-            temp.put("heartRate", heartRate2.toString()); // 胎心
-            temp.put("fetalPresentation", fetalPresentation2.toString()); // 先露
-            temp.put("edema",FuZhongEnums.getName(antexModel.getEdema())); // 水肿
-            temp.put("urineProtein", antexModel.getUrineProtein()); // 尿蛋白
-            temp.put("hemoglobin", antexModel.getHemoglobin()); // 血红素
-
-            ssy.set(week, parseNull(JSONObject.parseObject(antexModel.getBp()).getString("ssy"), 0));
-            szy.set(week, parseNull(JSONObject.parseObject(antexModel.getBp()).getString("szy"), 0));
-            if(tzFlag && antexModel.getWeight() != null) {
-                weights.put(DateUtil.getWeek2(p.get(0).getLastMenses(), antexModel.getCheckDate()), antexModel.getWeight() + "");
-            }
-
-            restList.add(temp);
-        }
 
         // 添加初诊list
 
@@ -678,6 +632,54 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
 
             }
 
+        for (AntenatalExaminationModel antexModel : antexModels) {
+            Map<String, Object> temp = new HashMap<>();
+            Integer week = DateUtil.getWeek2(p.get(0).getLastMenses(), antexModel.getCheckDate());
+            temp.put("checkTime", DateUtil.getyyyy_MM_dd(antexModel.getCheckDate()));
+            temp.put("week", DateUtil.getWeekDesc(p.get(0).getLastMenses(), antexModel.getCheckDate()));
+            temp.put("weight", antexModel.getWeight());
+            temp.put("bp", parseNull(JSONObject.parseObject(antexModel.getBp()).getString("ssy"), "--") + "/" + parseNull(JSONObject.parseObject(antexModel.getBp()).getString("szy"), "--"));
+            temp.put("gonggao", StringUtils.isEmpty(antexModel.getGongGao()) ? GongJingEnums.GongGao.getName(antexModel.getGongGaoSelect()) + "/" + GongJingEnums.HengZhi.getName(antexModel.getGongGaoType()) : antexModel.getGongGao());
+            if(temp.get("gonggao").toString().equals("--/--")) {
+                temp.put("gonggao", "--");
+            }
+            temp.put("abdominalCircumference", antexModel.getAbdominalCircumference());// 腹围
+
+            List<Map> tireData = antexModel.getTireData();
+            StringBuffer fetalPosition2 = new StringBuffer(); // 胎位
+            StringBuffer heartRate2  = new StringBuffer();  // 胎心
+            StringBuffer fetalPresentation2  = new StringBuffer(); // 先露
+            if(CollectionUtils.isNotEmpty(tireData)) {
+                for (Map tireDatum : tireData) {
+                    if(fetalPosition2.length() > 0) fetalPosition2.append("/");
+                    if(heartRate2.length() > 0) heartRate2.append("/");
+                    if(fetalPresentation2.length() > 0) fetalPresentation2.append("/");
+                    fetalPosition2.append(tireDatum.containsKey("fetalPosition") ? FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : "--");
+                    heartRate2.append(tireDatum.containsKey("heartRate") ? tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : "--");
+                    fetalPresentation2.append(tireDatum.containsKey("fetalPresentation") ? FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : "--");
+                }
+            } else {
+                fetalPosition2.append("--");
+                heartRate2.append("--");
+                fetalPresentation2.append("--");
+            }
+            temp.put("fetalPosition", fetalPosition2.toString()); // 胎位
+            temp.put("heartRate", heartRate2.toString()); // 胎心
+            temp.put("fetalPresentation", fetalPresentation2.toString()); // 先露
+            temp.put("edema",FuZhongEnums.getName(antexModel.getEdema())); // 水肿
+            temp.put("urineProtein", antexModel.getUrineProtein()); // 尿蛋白
+            temp.put("hemoglobin", antexModel.getHemoglobin()); // 血红素
+
+            ssy.set(week, parseNull(JSONObject.parseObject(antexModel.getBp()).getString("ssy"), 0));
+            szy.set(week, parseNull(JSONObject.parseObject(antexModel.getBp()).getString("szy"), 0));
+            if(tzFlag && antexModel.getWeight() != null) {
+                weights.put(DateUtil.getWeek2(p.get(0).getLastMenses(), antexModel.getCheckDate()), antexModel.getWeight() + "");
+            }
+
+            restList.add(temp);
+        }
+
+
         if(tzFlag) {
             for (AntExChuModel antExChuModel : antExChuModels) {
                 if(hospitalId.equals(antExChuModel.getHospitalId()) && StringUtils.isNotEmpty(antExChuModel.getYqWeight()) && StringUtils.isNotEmpty(antExChuModel.getHeight())) {