diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java
index 151838d..ca08d80 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/Fm.java
@@ -19,6 +19,7 @@ public class Fm {
     private Integer FETUS_NUM;//胎数
     private Integer PLACENTA_NUM;//胎盘数
     private String DELIVERY_MODE;//分娩方式
+    private String DELIVERY_TYPE;//分娩方式
     private String OPERATION_CAUSE;//手术原因
     private Integer PROD_PROCESS_ONE;//第一产程
     private Integer PROD_PROCESS_TWO;//第二产程
@@ -89,6 +90,14 @@ public class Fm {
 
     private String Vision;  //用来判断区域环境分娩调用选择
 
+    public String getDELIVERY_TYPE() {
+        return DELIVERY_TYPE;
+    }
+
+    public void setDELIVERY_TYPE(String DELIVERY_TYPE) {
+        this.DELIVERY_TYPE = DELIVERY_TYPE;
+    }
+
     public String getVision() {
         return Vision;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java
index ec8174f..070ba54 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java
@@ -150,6 +150,8 @@ public class HsfyFmService {
 //                "     PROD_PROCESS_TWO  as PROD_PROCESS_TWO," +
 //                "     PROD_PROCESS_THREE  as PROD_PROCESS_THREE, " +
 //                "     TOTAL_PROCESS as TOTAL_PROCESS, " +
+                "     OH_LOSE_BLOOD as OH_LOSE_BLOOD, " +
+                "     TH_LOSE_BLOOD as TH_LOSE_BLOOD, " +
                 "     PLACENTA_NUM  as PLACENTA_NUM, " +
                 "     DELIVER_HOSPITAL as DELIVER_HOSPITAL, " +
                 "     DELIVER_DOCTOR  as DELIVER_DOCTOR ";
@@ -282,6 +284,13 @@ public class HsfyFmService {
                                     int mProcess = Integer.parseInt(allFm.getTOTAL_PROCESS())%60;//总产程分钟数
                                     totalMap.put("m",String.valueOf(mProcess));
                                 }
+//                                // 一小时失血量
+//                                private Double oHloseBloodL;
+//                                //二小时失血量
+//                                private Double tHloseBloodL;
+
+                            deliverAddRequest.setoHloseBloodL(allFm.getOH_LOSE_BLOOD() == null ? (double)allFm.getOH_LOSE_BLOOD() : null);
+                            deliverAddRequest.settHloseBloodL(allFm.getTH_LOSE_BLOOD() == null ? (double)allFm.getTH_LOSE_BLOOD() : null);
 
                                 deliverAddRequest.setProdprocess(map);
                                 deliverAddRequest.setTotalprocess(totalMap);
@@ -296,17 +305,16 @@ public class HsfyFmService {
                                     week = allFm.getDUE_WEEK() + "周";
                                     if (StringUtils.isNotEmpty(allFm.getDUE_WEEK()) && StringUtils.isNotEmpty(allFm.getDUE_DAY()))
                                     {
-                                        week += allFm.getDUE_DAY() + "天";
+                                        week += "+"+allFm.getDUE_DAY() + "天";
                                     }
 
                                     deliverAddRequest.setDueWeek(week);
                                 }
 
                                 deliverAddRequest.setTireNumber(allFm.getFETUS_NUM());// 胎数(之前赋值为死值1)
-//                                Integer placenta_Num = allFm.getPLACENTA_NUM();
-//                                if(placenta_Num!=null){
-//                                    deliverAddRequest.setPlacenta(allFm.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1)
-//                                }
+                                if(allFm.getFETUS_NUM() != null){
+                                    deliverAddRequest.setPlacenta(allFm.getFETUS_NUM()+"");// 胎盘(之前赋值为死值1)
+                                }
                                 if ("完整".equals(allFm.getPERINEAL_CONDITION()) || "".equals(allFm.getPERINEAL_CONDITION())) {
                                     deliverAddRequest.setPerinealCondition("full");
                                 } else if ("切开".equals(allFm.getPERINEAL_CONDITION()) || "侧切".equals(allFm.getPERINEAL_CONDITION())) {
@@ -388,6 +396,7 @@ public class HsfyFmService {
                                 }
 
                                 baby.setDeformity((allFm.getBABY_DEFORMITY()==null?0:1)); //畸形 0非畸形 1畸形
+                                baby.setBabyHealthy("良好");
 
                                 //String baby_Pregnancy_Out = allFm.getBABY_PREGNANCY_OUT();
 //                                if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
index f031da9..1dd8e7e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
@@ -3127,7 +3127,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient
     private Map getWeekInfo(Integer kcal,Map map,List<String> risks)
     {
         List<HightWeightWeekModel> weightReport = null;
-        if (risks.contains("5aab6d3d422b03d4ad2bf83e") && (risks.contains("5aab6d3e422b03d4ad2bf83f")
+        if (risks.contains("5aab6d3d422b03d4ad2bf83e") || (risks.contains("5aab6d3e422b03d4ad2bf83f")
                 //需药物治疗的糖尿病
                 || risks.contains("de7468e6-1bb5-4fab-ae84-78857868409a")))
         {