diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/FetalPositionEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/FetalPositionEnums.java
index f69253f..0cf9c47 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/FetalPositionEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/FetalPositionEnums.java
@@ -45,6 +45,17 @@ public enum FetalPositionEnums {
         return null;
     }
 
+    public static String getTitle2(String id){
+        if (StringUtils.isNotEmpty(id)){
+            for (FetalPositionEnums fetalPositionEnums:FetalPositionEnums.values()){
+                if (fetalPositionEnums.getId().equals(id)){
+                    return fetalPositionEnums.getName();
+                }
+            }
+        }
+        return "--";
+    }
+
 
     private FetalPositionEnums(String name,String id){
         this.name=name;
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 3e5c788..3255d72 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
@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.lyms.hospitalapi.pojo.ReportModel;
 import com.lyms.platform.biz.service.CommonService;
-import com.lyms.platform.common.enums.CouponEnums;
-import com.lyms.platform.common.enums.FetalEnums;
-import com.lyms.platform.common.enums.FuZhongEnums;
-import com.lyms.platform.common.enums.YnEnums;
+import com.lyms.platform.common.enums.*;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.PageResult;
 import com.lyms.platform.common.result.RespBuilder;
@@ -609,8 +606,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         if(p == null) {
             return RespBuilder.buildSuccess();
         }
-        AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1).and("checkTime").gte(p.getLastMenses())).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class);
-        List<AntenatalExaminationModel> antexModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1).and("checkDate").gte(p.getLastMenses())).with(new Sort(Sort.Direction.DESC, "checkDate")), AntenatalExaminationModel.class);
+        AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").is(1).and("checkTime").gte(p.getLastMenses())).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class);
+        List<AntenatalExaminationModel> antexModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").is(1).and("checkDate").gte(p.getLastMenses())).with(new Sort(Sort.Direction.DESC, "checkDate")), AntenatalExaminationModel.class);
 
         Map<String, Object> xyMap = new HashMap<>();
         List<Integer> szyMin = new ArrayList<>();
@@ -652,9 +649,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             String fetalPresentation = ""; // 先露
             if(CollectionUtils.isNotEmpty(tireData)) {
                 for (Map tireDatum : tireData) {
-                    fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + tireDatum.get("fetalPosition") : tireDatum.get("fetalPosition") + "";
-                    heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate") : tireDatum.get("heartRate") + "";
-                    fetalPresentation = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPosition"));
+                    fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition"));
+                    heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : tireDatum.get("heartRate").toString().replaceAll("\\.0", "");
+                    fetalPresentation = !tireDatum.containsKey("fetalPresentation") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation"));
                 }
             } else {
                 fetalPosition = "--";
@@ -693,11 +690,17 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             String heartRate = "";
             String fetalPresentation = "";
             if(CollectionUtils.isNotEmpty(tireData)) {
-                for (Map tireDatum : tireData) {
-                    fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + tireDatum.get("fetalPosition") : tireDatum.get("fetalPosition") + "";
-                    heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate") : tireDatum.get("heartRate") + "";
-                    fetalPresentation = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPosition"));
-                }
+               try { // 有些数据前端传的有问题 存的class
+                   for (Map tireDatum : tireData) {
+                       fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition"));
+                       heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : tireDatum.get("heartRate").toString().replaceAll("\\.0", "");
+                       fetalPresentation = !tireDatum.containsKey("fetalPresentation") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation"));
+                   }
+               } catch (Exception e) {
+                   fetalPosition = "--";
+                   heartRate = "--";
+                   fetalPresentation = "--";
+               }
             } else {
                 fetalPosition = "--";
                 heartRate = "--";