Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

src/components/ScaleTable/index.jsx

@@ -24,7 +24,7 @@ class ScaleTable extends React.Component{
     this.handleFormula = this.handleFormula.bind(this);
   }
   
-  handleRadio(groupName,name,item){
+  handleRadio(groupName,name,item,indexId){
     const {selecteds,valueData} = this.state;
     const value = item.detailName;
     this.setState({
@@ -43,13 +43,27 @@ class ScaleTable extends React.Component{
     if(rows){
       for(let j=0; j<rows.length; j++){
         let row = rows[j].row;
-        for(let k=0;k < row.length; k++){
-          if(row[k].name==name){
-            details = row[k].details;
+        let required = rows[j].required;
+        let rowsId = rows[j].indexId;
+        // 必填项处理
+        if(required==1&&rowsId==indexId){
+          for(let k=0;k < row.length; k++){
             row[k].isSelect = true;
-            break;
+            if(row[k].name==name){
+              details = row[k].details;
+              // break;
+            }
+          }
+        }else{
+          for(let k=0;k < row.length; k++){
+            if(row[k].name==name){
+              details = row[k].details;
+              row[k].isSelect = true;
+              break;
+            }
           }
         }
+        
       }
     }
     if(details){
@@ -221,8 +235,7 @@ class ScaleTable extends React.Component{
     let {selecteds,valueData,start,scaleResult1} = this.state;
     const {tableId,formulaResult} = this.props;
     const scaleResult = scaleResult1 || formulaResult&&formulaResult[tableId]; //量表计算结果
-    // const datas = valueData&&valueData.group?valueData:mocks.newData;
-    const datas = valueData&&valueData.group?valueData:'';
+    const datas = valueData&&valueData.group?valueData:'';//console.log(666,datas);
     let content =  datas&&datas.group&&datas.group.map((v,i)=>{
                 return <div className={style['group']}>
                   <p className={style['groupName']}>{v.groupName}</p>
@@ -236,7 +249,7 @@ class ScaleTable extends React.Component{
                                 return <div className={style['item']}>
                                         <Radio label={vv.detailName+'('+vv.score+')'}
                                            isSelect={vv.select==1||selecteds[item.name]==vv.detailName}
-                                           handleClick={this.handleRadio.bind(this,v.groupName,item.name,vv)}>
+                                           handleClick={this.handleRadio.bind(this,v.groupName,item.name,vv,it.indexId)}>
                                         </Radio>
                                         {vv.state==1?<span className={style['recomand']}>（智能推荐）</span>:''}
                                     </div>

src/store/actions/currentIll.js

@@ -97,7 +97,7 @@ export const fillChronicModule = (state,action)=>{
   let res = Object.assign({},state);
   let moduleData = JSON.parse(JSON.stringify(res.moduleData));//现病史模板
   res.data = fullfillText(moduleData).newArr;
-  res.saveText = fullfillText(res.data).saveText;console.log(111,"慢病",res)
+  res.saveText = fullfillText(res.data).saveText;
   res.update=Math.random();
   return res;
 }