Merge branch 'dev/new1' of http://192.168.2.236:10080/zhouna/newICSS into dev/new1

src/components/AssessResult/index.jsx

@@ -15,6 +15,7 @@ class AssessResult extends Component {
     const chooseSelecteds = deepClone(props.chooseSelecteds);
     const wholeIndexs = deepClone(props.wholeIndexs);      //深度复制，Object.assgin为浅复制，下下级会同源
     const wholeScale = deepClone(props.wholeScaleItems);
+    const wholeResults = deepClone(props.wholeResults);
 
     this.state={
       chooseSelecteds:chooseSelecteds,     //大数据选择模块
@@ -22,10 +23,7 @@ class AssessResult extends Component {
       wholeAssessItems:wholeIndexs,     //整体评估模块
       wholeScaleItems:wholeScale,
       wholeAssessText:props.wholeAssessText||{},     //整体评估补充说明
-      wholeResults:{
-        possible:props.possible,
-        radioVal:props.radioVal
-      },
+      wholeResults: wholeResults,
       calcuResult:props.calcuResult,     //计算公式结果
       calcuValues:props.calcuValues,    //计算公式填的值
       addedScaleIds:props.addedScaleIds,    //已加入量表的id
@@ -74,10 +72,12 @@ class AssessResult extends Component {
   }
   handleResult(opt){
     const {wholeResults} = this.state.wholeResults;
+    const {savePossibleRes} = this.props;
     const res = Object.assign({},wholeResults,opt);
     this.setState({
       wholeResults:res
     });
+    savePossibleRes && savePossibleRes(res);
   }
   handleChooseChange(i,selects){
     const {chooseSelecteds} = this.state;
@@ -92,21 +92,23 @@ class AssessResult extends Component {
     });
   }
   handleCalcu(values,ret){
+    const {saveCalcuValue,saveCalcuResult}=this.props;
     this.setState({
       calcuResult:ret,
       calcuValues:values
     });
+    saveCalcuResult&&saveCalcuResult(ret);
+    saveCalcuValue&&saveCalcuValue(values);
   }
   componentWillUnmount(){
     //点确定关闭弹窗时把参数传到父组件去
-    const {saveAssessInfos,isAssessConfirm,clearChartData,handleSavePossible} = this.props;
+    const {saveAssessInfos,isAssessConfirm,clearChartData} = this.props;
     clearChartData&&clearChartData();
     if(isAssessConfirm && readyKeepHistory() == 1){
       Notify.error("主诉不能为空");
     }else if(isAssessConfirm && readyKeepHistory() == 2){
       Notify.info('诊断不能为空');
     }
-    handleSavePossible&&handleSavePossible(this.state.wholeResults);
     if(isAssessConfirm){
       saveAssessInfos(this.state,readyKeepHistory());
     }

src/components/ChronicInfo/index.jsx

@@ -296,7 +296,7 @@ class ChronicInfo extends React.Component{
         if(!calcuValues[i].value) {
           allHasInfo = false;
         }
-      } else if(calcuValues[i].controlType == 1) {
+      } else if(calcuValues[i].controlType == 0) {
         let hasSelect = false;
         for( let z = 0; z <calcuValues[i].details.length; z++) {
           if(calcuValues[i].details[z].state == 1) {
@@ -484,6 +484,12 @@ class ChronicInfo extends React.Component{
         calcuValues:next.calcuValues
       })
     }
+    if (JSON.stringify(next.wholeResults.possible) != JSON.stringify(this.props.possible)) {
+      this.setState({
+        radioVal: next.wholeResults.radioVal,
+        possible: next.wholeResults.possible
+      })
+    }
     if(next.slideUp!=this.props.slideUp){
       if(next.slideUp){
         $(this.$content.current).slideUp(config.slideTime);

src/components/DiagnosticList/index.jsx

@@ -32,8 +32,6 @@ class DiagnosticList extends Component {
             assessId:'',
             disName:'',
             isAssessConfirm:false,
-            radioVal:{},  //可能结果选择内容
-            possible:{},  //可能结果
             hasOndel: false,
             hasOnIndex: -1
         }
@@ -48,7 +46,6 @@ class DiagnosticList extends Component {
         this.closeHistoryCaseModal = this.closeHistoryCaseModal.bind(this);
         this.referCase = this.referCase.bind(this);
         this.handleSaveAssess = this.handleSaveAssess.bind(this);       //评估弹窗确定
-        this.handleSavePossible = this.handleSavePossible.bind(this);
         this.onPrint = this.onPrint.bind(this);
     }
     onPrint() {
@@ -209,12 +206,6 @@ class DiagnosticList extends Component {
             dragBox('dragModalWrap','dragModalTitle','del')
         }
     }
-    handleSavePossible(obj){
-      this.setState({
-        possible:Object.assign({},obj.possible),
-        radioVal:Object.assign({},obj.radioVal),//不设置radioVal只有最近一次选中的值
-      })
-    }
     handleSaveAssess(){
       this.setState({
         isAssessConfirm:true
@@ -231,12 +222,6 @@ class DiagnosticList extends Component {
       if (this.props.diagnosticStr != nextprops.diagnosticStr) {
         this.props.getBilling();
       }
-      if(deepClone(nextprops.wholeResults)!=deepClone(this.props.wholeResults)){
-          this.setState({
-            radioVal:Object.assign({},nextprops.wholeResults.radioVal),
-            possible:Object.assign({},nextprops.wholeResults.possible),
-          })
-      }
     }
     handleEnterDel(index) {
       this.setState({
@@ -252,7 +237,7 @@ class DiagnosticList extends Component {
     }
     render(){
         const { list, treatment, showReferRecord, showHistoryCase ,chronicMagItem,loading} = this.props;
-        const { visible, treatTitle ,showAssess, isAssessConfirm, radioVal, possible,assessId,disName, hasOndel, hasOnIndex} = this.state;
+      const {visible, treatTitle, showAssess, isAssessConfirm, assessId, disName, hasOndel, hasOnIndex} = this.state;
         const chronicList = JSON.parse(localStorage.getItem('chronic')||null);
         let isChronic = false;      //是否要显示管理评估
         const footer = <Footer print={true}
@@ -290,12 +275,9 @@ class DiagnosticList extends Component {
                                                top={'3%'}
                                                bottom={'3%'}
                                                width={820}>
-                       <AssessResult handleSavePossible={this.handleSavePossible}
-                                     closeAssess={this.showAssessFn.bind(this)}
+                       <AssessResult closeAssess={this.showAssessFn.bind(this)}
                                      disId={assessId}
                                      disName={disName}
-                                     radioVal={radioVal}
-                                     possible={possible}
                                      isAssessConfirm={isAssessConfirm}
                                      ></AssessResult>
                       </ComplexModal>:''}

src/components/MedicalInfo/index.jsx

@@ -22,10 +22,12 @@ class MedicalInfo extends Component {
     getSearchList() {
         const { getAllConceptDetail,searchResult } = this.props;
         return searchResult && searchResult.map((item) => {
-                return <li key={item.conceptId} onClick={() =>getAllConceptDetail({name: item.name, type: item.type})}>
+                return <li key={item.conceptId}
+                           title='点击查看详情'
+                           onClick={() =>getAllConceptDetail({name: item.name, type: item.type})}>
                             <span>{item.name}</span>
                             <i>( {item.libTypeName} )</i>
-                            <button>查看</button>
+                            {/*<button>查看</button>*/}
                         </li>;
             });
     }

src/components/MedicalInfo/index.less

@@ -81,6 +81,9 @@
                 margin-top: 8px;
                 outline: none;
             }
+            &:hover{
+                border-bottom:2px solid #3B9ED0;
+            }
         }
     }
     .no-data{

src/components/ScaleSearch/index.jsx

@@ -38,9 +38,11 @@ class ScaleSearch extends Component {
   getSearchList() {
     const { searchResult } = this.props;
     return searchResult && searchResult.map((item) => {
-      return <li key={item.conceptId} onClick={this.showScale.bind(this,{conceptId:item.conceptId,name:item.name})}>
+      return <li key={item.conceptId}
+                 title='点击查看详情'
+                 onClick={this.showScale.bind(this,{conceptId:item.conceptId,name:item.name})}>
         <span className={style['scale-name']}>{item.name}{this.getResult(item.conceptId)}</span>
-        <button>查看</button>
+        {/*<button>查看</button>*/}
       </li>;
     });
   }

src/components/ScaleSearch/index.less

@@ -86,6 +86,9 @@
         margin-top: 8px;
         outline: none;
       }
+      &:hover{
+        border-bottom:2px solid #3B9ED0;
+      }
     }
   }
   .no-data{

src/containers/AssessResult.js

@@ -4,7 +4,7 @@ import AssessResult from '@components/AssessResult';
 import {ISREAD} from '@store/types/homePage.js';
 import {billing} from '@store/async-actions/pushMessage';
 import {getAssessData,getIndexData} from '@store/async-actions/fetchModules';
-import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_INDEX_SUB_TYPE,REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA,SET_CHRONIC_CALCU_RESULT} from '@types/assessResult';
+import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_INDEX_SUB_TYPE,REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA,SET_CHRONIC_CALCU_RESULT,SET_CALCU_VALUES} from '@types/assessResult';
 import {parseChartData,deepClone} from '@utils/tools';
 import {SHOW_TABLE_LIST,HIDE_TABLE_LIST} from '@store/types/pushMessage';
 import {saveMessage} from "../store/async-actions/print";
@@ -119,6 +119,18 @@ function mapDispatchToProps(dispatch) {
         }
       }
     },
+    savePossibleRes(data) {
+      dispatch({
+        type: 'SAVE_POSSIBLE_RESULT',
+        wholeResults: data
+      })
+    },
+    saveCalcuValue(data){
+      dispatch({
+        type:SET_CALCU_VALUES,
+        data
+      })
+    }
   }
 }
 

src/containers/DiagnosticList.js

@@ -25,7 +25,7 @@ function mapStateToProps(state) {
         items:state.historyTemplates.items,
         chronicMagItem: diagnC?diagnC:state.mainSuit.chronicDesease,
         typeConfig: state.typeConfig.typeConfig,
-        wholeResults:assessResult.wholeResults,
+      //wholeResults:assessResult.wholeResults,
         scaleInfo: pushMessage.scaleInfo,//量表内容
         showHide: pushMessage.showHide,
         loading: diagnosticList.loading,

src/store/reducers/assessResult.js

@@ -120,7 +120,11 @@ export default (state=init,action)=>{
       res.update1= Math.random();
       return res;
     case SET_CALCU_VALUES:
-      res.calcuValues[action.id] = action.data;
+      if(action.id){
+        res.calcuValues[action.id] = action.data;
+      }else{
+        res.calcuValues = action.data;
+      }
       return res;
     default:
       return res;