修复病史数据

stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml

@@ -31,7 +31,7 @@
         left join sys_user su_nutritionist on su_nutritionist.user_id = srt.nutritionist_id and su_nutritionist.del_flag = 0
         left join sys_user su_nutritionist_assis on su_nutritionist_assis.user_id = srt.nutri_assis_id and su_nutritionist_assis.del_flag = 0
         where srt.del_flag = 0
-        <if test="name != null  and name != ''">and srt.name like concat('%', #{name}, '%')</if>
+        <if test="name != null  and name != ''">and srt.name like concat('%', #{name}, '%') or srt.remark like concat('%', #{name}, '%')</if>
         <if test="nutriAssisId != null ">and srt.nutri_assis_id = #{nutriAssisId}</if>
         <if test="nutritionistId != null ">and srt.nutritionist_id = #{nutritionistId}</if>
         <if test="reviewStatus != null ">and srp.review_status = #{reviewStatus}</if>

stdiet-ui/src/utils/healthyData.js

@@ -200,7 +200,7 @@ export const familyIllnessHistoryArray = [
   { name: "冠心病", value: "3" },
   { name: "外周血管病", value: "4" },
   { name: "心力衰竭", value: "5" },
-  { name: "冠心病", value: "6" },
+  { name: "糖尿病", value: "6" },
   { name: "肥胖症", value: "7" },
   { name: "慢性肾脏疾病", value: "8" },
   { name: "骨质疏松", value: "9" },
@@ -483,7 +483,9 @@ export function dealHealthy(customerHealthy) {
   customerHealthy.basicBMR += "千卡";
   customerHealthy.notSportHeat += "千卡";
   const lowRecProtein = customerHealthy.tall - 105;
-  customerHealthy.recProtein = `${lowRecProtein * 0.8} - ${lowRecProtein * 1.5}`;
+  customerHealthy.recProtein = `${(lowRecProtein * 0.8).toFixed(1)} - ${(
+    lowRecProtein * 1.5
+  ).toFixed(1)}`;
 
   needAttrName.forEach(name => {
     if (customerHealthy.hasOwnProperty(name)) {
@@ -540,6 +542,15 @@ export function dealHealthy(customerHealthy) {
     }
   });
 
+  if (customerHealthy.hasOwnProperty("physicalSignsId")) {
+    const signs = customerHealthy.otherPhysicalSigns
+      ? [customerHealthy.otherPhysicalSigns]
+      : [];
+    customerHealthy.signList.forEach(obj => {
+      signs.push(obj.name);
+    });
+    customerHealthy.physicalSigns = signs.join(",");
+  }
   if (customerHealthy.hasOwnProperty("tall")) {
     customerHealthy.tall += "cm";
   }

stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableText/index.vue

@@ -9,7 +9,7 @@
       :step="5"
       :value="value"
       @blur="handleOnBlur"
-      @keydown.enter="handleEnterClick"
+      @keydown.enter.native="handleEnterClick"
     />
   </div>
 </template>

stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue

@@ -7,11 +7,11 @@
     <div class="content">
       <!-- 筛选 -->
       <el-form :model="queryParams" ref="queryForm" :inline="true">
-        <el-form-item label="模板名称" prop="name">
+        <el-form-item label="搜索内容" prop="name">
           <el-input
             v-model="queryParams.name"
-            placeholder="请输入模板名称"
-            @keydown.enter="handleQuery"
+            placeholder="请输入模板名称或备注"
+            @keydown.enter.native="handleQuery"
           />
         </el-form-item>
         <el-form-item label="营养师" prop="nutritionistId">

stdiet-ui/src/views/custom/recipesTemplate/index.vue

@@ -6,8 +6,12 @@
       :inline="true"
       v-show="showSearch"
     >
-      <el-form-item label="模板名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入模板名称" />
+      <el-form-item label="搜索内容" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入模板名称或备注"
+          @keydown.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="营养师" prop="nutritionistId">
         <el-select