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

src/components/AssessResult/AssessHis/index.jsx

@@ -43,7 +43,7 @@ class AssessResultHis extends Component {
     }
   }
   handoutTypes(obj,item,i){
-    const {wholeAssess,wholeIndexs,chooseSelecteds,scaleResult,wholeResults} =obj;
+    const {wholeAssess,wholeIndexs,chooseSelecteds,scaleResult,wholeResults,wholeAssessText} =obj;
     const {getIndexData,inquiryDate,indexData,timeTypes} = this.props;
     const {chartTimeTypes} = this.state;
     const name = item.regionName+"：";
@@ -57,6 +57,7 @@ class AssessResultHis extends Component {
                           formulaResult={scaleResult}
                           result={wholeResults}
                           disabled={true}
+                          text={wholeAssessText}
                           isRecommend={item.isRecommend}></ScaleItem>;
       case 1:     //数据来源于大数据
         return <ChooseItem title={name} data={list} selecteds={chooseSelecteds&&chooseSelecteds[i]} disabled={true}></ChooseItem>;
@@ -117,7 +118,7 @@ class AssessResultHis extends Component {
     });
   }
   componentWillReceiveProps(next){
-    if(next.inquiryId!=this.props.inquiryId){
+    if(next.inquiryId!=this.props.inquiryId||!next.showHistoryCases){
       this.setState({
         showAssess:false
       });

src/components/ChronicInfo/index.jsx

@@ -294,7 +294,7 @@ class ChronicInfo extends React.Component{
     }
   }
   getDetail(){
-    const {data,indexs,formulaResult} = this.props;
+    const {data,indexs,formulaResult,calcuResult} = this.props;
     const {formulaId,optionId,possible,radioVal,isFormulaConfirm} = this.state;
     let list = data&&data.map((v,i)=>{
                     return <div className={style["list"]}>
@@ -326,7 +326,8 @@ class ChronicInfo extends React.Component{
                                 }
                               </p>
                         }else if(it.type==2){
-                          const result = it.content.result&&it.content.result[1]&&it.content.result[1].text;
+                          const cres = calcuResult&&calcuResult[v.id]||it.content.result;
+                          const result = cres&&cres[1]&&cres[1].text;
                           return <div className={style["marTop"]}>
                             <span className={style["limit"]}>
                               计算公式结果：

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -75,6 +75,7 @@ class HistoryCaseContainer extends React.Component {
                         baseObj == undefined || JSON.stringify(baseObj) == "{}" ? null :
                         <PreviewBody
                             preInfo={preInfo}
+                            showHistoryCases={this.props.showHistoryCases}
                             dataJson={dataJson}
                             baseObj={baseObj}
                             dataStr={dataStr.length > 0?getAllDataStringList(dataStr):[]}

src/components/HistoryCaseContainer/index.jsx

@@ -38,6 +38,7 @@ class HistoryCaseContainer extends React.Component {
                 <div className={styles.maskHistory} onClick={showHistoryBox}></div>
                 <HistoryList 
                     items={items}
+                    showHistoryCases={showHistoryCases}
                     activeHistory={activeHistory}
                     showHistoryBox={showHistoryBox}
                     handleCaseClick={handleCaseClick}

src/components/PreviewBody/index.jsx

@@ -73,7 +73,7 @@ class PreviewBody extends Component {
     }
   }
   render() {
-    const { show, preInfo, dataJson, dataStr, baseObj, flg ,showAssessBtn} = this.props;
+    const { show, preInfo, dataJson, dataStr, baseObj, flg ,showAssessBtn,showHistoryCases} = this.props;
     const other_yjs = filterOtherDataArr(JSON.parse(dataStr.other),dataJson.other);
     const noData = JSON.stringify(preInfo) == '{}';
     const isChronic = (dataJson.diagChronicMagItem&&dataJson.diagChronicMagItem.name)||(dataJson.mainChronicDesease&&dataJson.mainChronicDesease.name);
@@ -226,7 +226,7 @@ class PreviewBody extends Component {
           </tr>
         </table>
         <p style={{textAlign:'right',marginTop:'15px'}}>医生签名：<span style={{minWidth: '60px',padding: '0 5px 2px 5px',borderBottom: '1px solid #333',}}>{baseObj ? baseObj.doctorName : (noData ? '' : preInfo.doctorName)}</span></p>
-        {showAssessBtn?<AssessResultHis isChronic={isChronic?true:false} inquiryId={baseObj&&baseObj.id} inquiryDate={baseObj&&baseObj.inquiryDate}></AssessResultHis>:""}
+        {showAssessBtn?<AssessResultHis showHistoryCases={showHistoryCases} isChronic={isChronic?true:false} inquiryId={baseObj&&baseObj.id} inquiryDate={baseObj&&baseObj.inquiryDate}></AssessResultHis>:""}
         
         <div onClick={() => { this.surePrint(dataStr) }} style={{
           display: show ? 'inline-block' : 'none',

src/containers/ChronicInfo.js

@@ -23,6 +23,7 @@ function mapStateToProps(state){
     formulaResult:pushMessage.formulaResult, //量表信息
     indexs:assessResult.wholeIndexs,
     wholeResults:assessResult.wholeResults,     //整体评估可能结果
+    calcuResult:pushMessage.calcuResult
   }
 }