diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
index eb7614d..19166e5 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
@@ -1300,7 +1300,7 @@ public class BasicConfigServiceTest {
 //        weightWeek("F:\\体重与营养管理\\体重与营养管理第三版（北方）改标红“、冰淇淋”-晓萌.xls");
 //        weightMange("F:\\体重与营养管理\\体重与营养管理第三版（北方）改标红“、冰淇淋”-晓萌.xls");
 //        weightFood("F:\\体重与营养管理\\体重与营养管理第三版（北方）改标红“、冰淇淋”-晓萌.xls");
-        bloodSugar("F:\\血糖报告\\血糖报告\\血糖报告基础数据格式.xls");
+        bloodSugar("F:\\血糖报告\\血糖报告\\血糖报告基础数据格式(2).xls");
     }
 
     public static void addBaby(ApplicationContext applicationContext) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
index 73a06e3..a8c85b3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
@@ -497,6 +497,8 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga
             return true;
         }
 
+
+
         Map<String,Object> map = getFirstBloodSugarDate(pid);
         if (map.size() != 0)
         {
@@ -575,6 +577,13 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga
                     }
                 }
 
+                Patients patients = mongoTemplate.findById(one.getParentId(), Patients.class);
+                int week = DateUtil.getWeek2(patients.getLastMenses(), DateUtil.formatDate(one.getCreated()));
+                if (week < 6)
+                {
+                    return false;
+                }
+
                 one.setMonitorStatus(monitorStatus);
                 one.setReportDate(DateUtil.formatDate(one.getCreated()));
                 one.setStatus(1); //报告状态 1未查看 2查看
@@ -661,8 +670,8 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga
             if (blood.getType() != null && blood.getType() == 2)
             {
                 BloodSugarConfigModel medicineModel = mongoTemplate.findOne(Query.query(Criteria.where("type").is(3).and("week").is(String.valueOf(week))), BloodSugarConfigModel.class);
-                medicineData.put("medicineTitle",medicineModel.getTitle());
-                medicineData.put("medicineList", medicineModel.getWeekContents());
+                medicineData.put("medicineList",medicineModel.getWeekContents());
+                medicineData.put("medicineList1", medicineModel.getWeekContentsTwo());
             }
             reusltMap.put("medicineData",medicineData);
 
@@ -686,7 +695,8 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga
             BloodSugarConfigModel dietModel  = null;
             List<BloodSugarConfigModel> dietModels = getWeightConfigBykcal(kmap,ReportConfig.getNSArea(basicConfig.getName()));
 
-            if (blood.getStatus() == null || blood.getStatus() == 1)
+
+            if (CollectionUtils.isNotEmpty(dietModels) && dietModels.size() == 2)
             {
                 BloodSugarQuery query = new BloodSugarQuery();
                 query.setIsExistReportDate(true);
@@ -715,19 +725,18 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga
                 //更新状态为查看
                 blood.setStatus(2);
                 bloodSugarService.update(blood);
-            }
 
 
-            Map<String,Object> dietModelData =  new HashMap<>();
-            dietModelData.put("breakfast",dietModel.getBreakfast());
-            dietModelData.put("breakfastAdd",dietModel.getBreakfastAdd());
-            dietModelData.put("lunch",dietModel.getLunch());
-            dietModelData.put("lunchAdd",dietModel.getLunchAdd());
-            dietModelData.put("dinner",dietModel.getDinner());
-            dietModelData.put("dinnerAdd",dietModel.getDinnerAdd());
-            dietModelData.put("suggests", dietModel.getSuggests());
-            reusltMap.put("dietModelDataData",dietModelData);
-
+                Map<String,Object> dietModelData =  new HashMap<>();
+                dietModelData.put("breakfast",dietModel.getBreakfast());
+                dietModelData.put("breakfastAdd",dietModel.getBreakfastAdd());
+                dietModelData.put("lunch",dietModel.getLunch());
+                dietModelData.put("lunchAdd",dietModel.getLunchAdd());
+                dietModelData.put("dinner",dietModel.getDinner());
+                dietModelData.put("dinnerAdd",dietModel.getDinnerAdd());
+                dietModelData.put("suggests", dietModel.getSuggests());
+                reusltMap.put("dietModelDataData",dietModelData);
+            }
 
             //不同孕周的营养指南
             BloodSugarConfigModel nutritionModel = mongoTemplate.findOne(Query.query(Criteria.where("type").is(6).and("week").is(String.valueOf(week))), BloodSugarConfigModel.class);
@@ -755,13 +764,13 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga
             k1+=100;
         }
 
-        if (k1 < 1000)
+        if (k1 < 1500)
         {
-            k1 = 1000;
+            k1 = 1500;
         }
-        else if (k1 > 3300)
+        else if (k1 > 2800)
         {
-            k1 = 3300;
+            k1 = 2800;
         }
         List<BloodSugarConfigModel> bloodSugarConfigModels = mongoTemplate.find(Query.query(Criteria.where("northSouth").is(northSouth).and("kcal").is(String.valueOf(k1)).and("type").is(5)),
                 BloodSugarConfigModel.class);