Browse Source

清空时清掉分词

liucf 6 years ago
parent
commit
d64cbf085f

+ 6 - 4
src/components/ScaleTable/index.jsx

@@ -40,6 +40,8 @@ class ScaleTable extends React.Component{
                         return <td className={style['block']}>
                           <label>
                             <input type="radio" name={v.name} value={it.score} onChange={this.handleChange}/>{it.detailName}
+                            {/*<span style={{display:+it.state==1?'inline':'none',color:'#3B9ED0'}}>(智能推荐)</span>*/}
+                            <span style={{display:it.detailName=='正常'?'inline':'none',color:'#3B9ED0'}}>(智能推荐)</span>
                           </label>
                         </td>
                       })}
@@ -62,16 +64,16 @@ class ScaleTable extends React.Component{
             <div>
               <p>
                 1. 计算方法:<br/>
-              感觉损伤得分=左右两侧感觉检查项目的分数之和
-              肌力得分=左右两侧肌力检查项目的分数之和
-              反射得分=左右两侧反射检查项目的分数之和
+              感觉损伤得分=左右两侧感觉检查项目的分数之和<br/>
+              肌力得分=左右两侧肌力检查项目的分数之和<br/>
+              反射得分=左右两侧反射检查项目的分数之和<br/>
               体格检查得分=感觉损伤得分+肌力得分+反射得分
               </p>
               <p>
                 2. 临床体格检查部分:<br/>
               最低得分0  最高得分46, 分数越高,周围神经病越重
               </p>
-              {datas&&datas.formula.map((v,i)=>{
+              {datas&&datas.calculate.range.map((v,i)=>{
                 return <p>
                   <span>{v.min}~{v.max}</span>&nbsp;<span>{v.text}</span>
                 </p>

+ 2 - 2
src/store/actions/currentIll.js

@@ -130,8 +130,8 @@ export const setData = (state,action) =>{
   /****************************************/
   // 是否使用空模板:num=0时判断mainIds,num>=1,截取第一病程遍历是否有症状exist
   if(num==0){
-    useEmpty = mainIds.length>0 ? false:true;
-    useEmpty = mainIds.length==0 && symptomFeature.length? false:true;
+    // useEmpty = mainIds.length>0 ? false:true;
+    useEmpty = mainIds.length==0 && !symptomFeature || symptomFeature.length==0? true:false;
     mainData = mainModleData;
   }else{
     // 模板也分词时得加上分词结果的判断

+ 3 - 0
src/store/actions/mainSuit.js

@@ -673,6 +673,9 @@ export const clearMainSuit = (state,action)=>{//回读和清除
   if(res.data.length > 0){//回读
     res.editClear = false;
   }
+  if(action.symptomFeature !== undefined){//清除分词数据
+    res.symptomFeature.featureData = action.symptomFeature;
+  }
   return res;
 }
 

+ 1 - 1
src/utils/tools.js

@@ -241,7 +241,7 @@ const getAllDataStringList =(baseList) =>{           //获取所有模块文本
 const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清空所有的数据
     if(action == 'clear'){     //清空
       const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
-      store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[],clearAction:true});
+      store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[],clearAction:true,symptomFeature:[]});
         store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],selecteds:[],editClear:true,symptomIds:[]});
         store.dispatch({type: CLEAROTHERHISTORY,data:[block],isEmpty:true,saveText:[],selecteds:[],editClear:true,yjs_1:'',yjs_2:'',yjs_3:'',yjs_4:''});
         store.dispatch({type: CLEARCHECKBODY,data:[block],isEmpty:true,saveText:[],selecteds:[]});