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

src/components/ChronicInfo/index.jsx

@@ -312,8 +312,7 @@ class ChronicInfo extends React.Component{
                           return <p>
                                 <span className={style["listName"]}>
                                   <i onClick={this.showTable.bind(this,it.content,v.id,i)}>{'【'+it.content.name+'】'}</i>
-                                  {formulaResult&&formulaResult[it.content.id]&&formulaResult[it.content.id].pIndex==i?<i>{'结果：'}{formulaResult[it.content.id].calcalculate&&formulaResult[it.content.id].calcalculate.result.value +' '+ formulaResult[it.content.id].calcalculate.result.text}</i>:''}
-                                  
+                                  {formulaResult&&formulaResult[it.content.id]?<i>{'结果：'}{formulaResult[it.content.id].calcalculate&&formulaResult[it.content.id].calcalculate.result.value +' '+ formulaResult[it.content.id].calcalculate.result.text}</i>:''}
                                 </span>
                                 {indexs[i]&&indexs[i].includes(j)?<span className={style["addResult"]}>
                                   <img src={added} />

src/components/DiagnosticList/index.jsx

@@ -102,7 +102,7 @@ class DiagnosticList extends Component {
               store.dispatch(setInitHistory(result.data));
               showHistoryCaseModal && showHistoryCaseModal();
             }else{
-              Notify.info("暂无历史病例，默认引用通用模板");
+              Notify.info("暂无历史病例，已默认展示慢病相关内容");
               const timer = setTimeout(function(){
                 autoFillModules && autoFillModules();
                 clearTimeout(timer);
@@ -116,9 +116,14 @@ class DiagnosticList extends Component {
         autoFillModules&&autoFillModules();
     }
     referCase() {
-        const { hideHistoryCaseModal, items } = this.props
+        const { hideHistoryCaseModal, items ,autoFillModules} = this.props
         hideHistoryCaseModal && hideHistoryCaseModal()
-        if (this.state.activeHistory === -1) {
+        if (this.state.activeHistory === -1) {//没有选择历史病例直接点确定
+            Notify.info("未选择历史病历，已默认展示慢病相关内容");
+              const timer = setTimeout(function(){
+                autoFillModules && autoFillModules();
+                clearTimeout(timer);
+              },1000)
             return
         }
         let baseList = store.getState();
@@ -152,7 +157,7 @@ class DiagnosticList extends Component {
         return (<div className={style['history-info']}>
             {items.map((item, index) => {
                 return<div onClick={this.handleQuoteClick.bind(this, item, index)} style={this.state.activeHistory === index ? {color: '#3B9ED0'} : ''}>
-                    <img src={this.state.activeHistory === index ? iconRadioActive : iconRadioDefault}/>{item.diagnose}
+                    <img src={this.state.activeHistory === index ? iconRadioActive : iconRadioDefault}/>{item.diagnose + '（' + item.inquiryDate + '）'}
                 </div>
             })}
         </div>)

src/components/ScaleTable/index.jsx

@@ -118,7 +118,7 @@ class ScaleTable extends React.Component{
   }
 
   handleFormula(data){//得分计算
-    const {tableId,getResult,parentId,scaleInfo,parentIndex} = this.props; 
+    const {tableId,parentId,scaleInfo,parentIndex} = this.props; 
     const {valueData} = this.state; 
     this.setState({
       start:true
@@ -178,14 +178,16 @@ class ScaleTable extends React.Component{
   }
   componentWillUnmount(){
     // 储存计算结果和选择后的data
-    const {tableId,getResult,parentId,parentIndex,scaleInfo} = this.props; 
+    const {tableId,getResult,parentId,parentIndex,scaleInfo,saveScaleData} = this.props; 
     const {valueData,scaleResult1} = this.state; 
     // 替换表格内容
     let allDatas = scaleInfo[tableId]?JSON.parse(JSON.stringify(scaleInfo[tableId])):'' ;
     if(allDatas){
       allDatas[1].content = JSON.stringify(valueData);
+      // 需求：未点计算，直接点确定、关闭也保存选中数据 4-30
+      saveScaleData&&saveScaleData({id:tableId,data:allDatas});
     }
-     
+    
      if(scaleResult1){
       const params = {
         type:1,
@@ -193,7 +195,7 @@ class ScaleTable extends React.Component{
         id:tableId,
         pIndex:parentIndex
       }
-      getResult&&getResult({params,allDatas});
+      getResult&&getResult(params);
      }  
   }
   getContent(){ 
@@ -213,7 +215,7 @@ class ScaleTable extends React.Component{
                               <p className={style['miniName']}>{item.name}</p>
                               {item.details&&item.details.map((vv,ii)=>{
                                 return <div className={style['item']}>
-                                        <Radio label={vv.detailName}
+                                        <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)}>
                                         </Radio>

src/components/Treat/AdverseReactions/index.jsx

@@ -79,7 +79,7 @@ class AdverseReactions extends Component {
                     </span>
                         {item.details.map((it, idx) => {
                             return <span key={item.id + it.name}>
-                                <input type="checkbox" checked={it.checked} id={item.id + it.name} onChange={this.changeReact.bind(this, it, index)}/>
+                                <input type="checkbox" checked={it.value == 1} id={item.id + it.name} onChange={this.changeReact.bind(this, it, index)}/>
                                 <label for={item.id + it.name}> {it.name} </label>
                             </span>
                         })}

src/containers/ScaleTable.js

@@ -3,7 +3,7 @@ import ScaleTable from '@components/ScaleTable';
 import {getFormulaResult} from '@store/async-actions/fetchModules.js';
 import {SET_SCALE_INFO,SAVE_TABLE_RESULT} from '@store/types/pushMessage';
 
-function mapStateToProps (state){//console.log(state);
+function mapStateToProps (state){
   return {
     scaleInfo: state.pushMessage.scaleInfo,//量表内容
     formulaResult:state.pushMessage.formulaResult //计算结果
@@ -13,17 +13,17 @@ function mapStateToProps (state){//console.log(state);
 function mapDispatchToProps (dispatch){
   return {
     getResult(obj){//计算结果
-      const {params,allDatas} = obj;
-      // dispatch(getFormulaResult(params));
       dispatch({
-        type:SET_SCALE_INFO,
-        data:allDatas,
-        id:params.id //量表id
+        type:SAVE_TABLE_RESULT,
+        id:obj.id,  //量表id
+        data:Object.assign({},obj.data,{pIndex:obj.pIndex})
       })
+    },
+    saveScaleData(obj){//储存表格数据
       dispatch({
-        type:SAVE_TABLE_RESULT,
-        id:params.id,  //量表id
-        data:Object.assign({},params.data,{pIndex:params.pIndex})
+        type:SET_SCALE_INFO,
+        data:obj.data,
+        id:obj.id //量表id
       })
     }
   }

src/store/actions/treat.js

@@ -147,7 +147,7 @@ export const changeReact=(state,action)=>{
     const index = action.index
     res.adversReactionList[index].details = res.adversReactionList[index].details.map(item => {
       if(item.name == action.it.name){
-        item.checked = !item.checked
+        item.value = item.value == 0 ? 1 : 0
       }
       return item
     })