Merge remote-tracking branch 'gitlab/main' into shenliang

ruoyi-admin/src/main/java/org/dromara/web/service/impl/NutritionSettingServiceImpl.java

@@ -260,16 +260,16 @@ public class NutritionSettingServiceImpl implements INutritionSettingService {
         results.put("caloriesKcalPerKgDay", map.get("kcal/kg*d"));
 
         results.put("proteinCaloriePercentage", String.format("%.2f", 0.00));//蛋白质热量占比
-        results.put("proteinGPerKgDay", "0.00");
-        results.put("proteinGPerDay", "0.00");
+        results.put("proteinGPerKgDay", "0.00");//g/kg*d
+        results.put("proteinGPerDay", "0.00");//g/d
 
-        results.put("fatCaloriePercentage", String.format("%.2f", fatCaloriePercentage));//脂肪热量占比
-        results.put("fatGPerKgDay", map.get("kJ/d"));
-        results.put("fatGPerDay", map.get("kcal/d"));
+        results.put("fatCaloriePercentage", String.format("%.2f", 0.00));//脂肪热量占比
+        results.put("fatGPerKgDay", "0.00");//g/kg*d
+        results.put("fatGPerDay", "0.00");//g/d
 
-        results.put("carbohydrateCaloriePercentage", String.format("%.2f", carbohydrateCaloriePercentage));//碳水化合物占比
-        results.put("carbohydrateGPerKgDay", map.get("kcal/d"));
-        results.put("carbohydrateGPerDay", map.get("kJ/d"));
+        results.put("carbohydrateCaloriePercentage", String.format("%.2f", 0.00));//碳水化合物占比
+        results.put("carbohydrateGPerKgDay", "0.00"); //g/kg·d
+        results.put("carbohydrateGPerDay", "0.00");//g/d
 
         results.put("calcium", NutritionDataUtil.getValueByAge("钙", null, age));
         results.put("potassium", NutritionDataUtil.getValueByAge("钾", null, age));