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

src/components/AssessResult/AssessHis/index.jsx

@@ -1,7 +1,8 @@
 import React, { Component } from "react";
 import style from "./index.less";
 import { Radio,ComplexModal} from '@commonComp';
-import arrow from '@common/images/icon_tri_blue.png';
+import arrow from '@common/images/show.png';
+import arrowDown from '@common/images/close.png';
 import loadingIcon from '@common/images/loading.gif';
 import ChooseItem from "../ChooseItem";
 import ScaleItem from "../ScaleItem";
@@ -18,7 +19,8 @@ class AssessResultHis extends Component {
       chartTimeTypes:{},      //图表模块
       tableName:'',
       tableId:'',
-      parentIndex:0
+      parentIndex:0,
+      showAssess:false,     //显示收起数据
     };
     this.showAssessFn = this.showAssessFn.bind(this);
     this.getAssessContent = this.getAssessContent.bind(this);
@@ -32,7 +34,13 @@ class AssessResultHis extends Component {
   }
   showAssessFn(){
     //获取历史评估数据
-    this.props.getAssessHis(this.props.inquiryId);
+    const {showAssess} = this.state;
+    this.setState({
+      showAssess:!showAssess
+    });
+    if(!showAssess){
+      this.props.getAssessHis(this.props.inquiryId);
+    }
   }
   handoutTypes(obj,item,i){
     const {wholeAssess,wholeIndexs,chooseSelecteds,scaleResult,wholeResults} =obj;
@@ -108,9 +116,16 @@ class AssessResultHis extends Component {
       operaSupport: false,
     });
   }
+  componentWillReceiveProps(next){
+    if(next.inquiryId!=this.props.inquiryId){
+      this.setState({
+        showAssess:false
+      });
+    }
+  }
   render() {
     const { loading,isChronic, list,inquiryId } = this.props;
-    const {tableName,tableId,showScale} = this.state;
+    const {tableName,tableId,showScale,showAssess} = this.state;
     const obj = list&&list[inquiryId];
     const scaleFooter = <div className={style['footer']}>
       <span className={style['print']} onClick={this.onPrint}><img src={printIcon} alt=""/>打印</span>
@@ -118,11 +133,12 @@ class AssessResultHis extends Component {
     </div>;
     return <div className={style['assess-cont']}>
       <div className={style['assess-result']}>
-        <p className={style['enter']}>{isChronic?'管理和评估':'推荐'}结果：<a onClick={this.showAssessFn}>查看结果<img src={arrow} /></a></p>
+        <p className={style['enter']}>{isChronic?'管理和评估':'推荐'}结果：{showAssess?<a onClick={this.showAssessFn}>收起结果<img src={arrowDown} /></a>:<a onClick={this.showAssessFn}>查看结果<img src={arrow} /></a>}</p>
       </div>
-      <div className={style['assess-box']}>
+      <div className={style['assess-box']} style={{display:showAssess?'block':'none'}}>
         {loading?<p className={style['loading']}><img src={loadingIcon} alt='loading...'/></p>:''}
-        {this.getAssessContent()}
+        {/*以下必须做判断再执行getAssessContent，否则再次打开评估历史时图表显示有问题，因为提前渲染*/}
+        {showAssess?this.getAssessContent():''}
       </div>
       {showScale?<ComplexModal onclose={this.showScaleFn} footer={scaleFooter}
                                           title={tableName}

src/components/AssessResult/AssessHis/index.less

@@ -9,7 +9,8 @@
     color: @blue;
     cursor: pointer;
     img{
-      margin-left: 4px;
+      vertical-align: text-top;
+      width: 18px;
     }
   }
 }

src/containers/CheckBody.js

@@ -1,7 +1,7 @@
 import {connect} from 'react-redux';
 import CheckBody from '@components/CheckBody';
 import {getModule,getInitData} from '@store/async-actions/fetchModules.js';
-import {HIDE,RESET,SETDROPSHOW,ISREAD,SEARCH_DROP_LOCATION} from '@store/types/homePage.js';
+import {HIDE,RESET,SETDROPSHOW,ISREAD,SEARCH_DROP_LOCATION,MODI_LOADING} from '@store/types/homePage.js';
 import {SELECTSEARCHDATA} from "@store/types/checkBody";
 import {billing} from '@store/async-actions/pushMessage';
 import {filterDataArr} from '@utils/tools.js';
@@ -32,6 +32,7 @@ function mapStateToProps(state){
 function mapDispatchToProps(dispatch,state){
   return {
     getInit(){
+      dispatch({type:MODI_LOADING,flag:true});
       dispatch(getInitData());
     },
     fetchModules(param){

src/store/async-actions/fetchModules.js

@@ -10,6 +10,7 @@ import {SETOTHERHISTORY,ISREAD} from "../types/homePage";
 import {SAVE_TABLE_RESULT,SET_CHRONIC_PUSHS} from "../types/pushMessage";
 import config from "@config/index";
 import {CURRENT_CHRONIC} from '@store/types/currentIll';
+import {MODI_LOADING} from '@store/types/homePage.js';
 
 const api={
   getSpreadModule:'/questionInfo/getByIds',
@@ -154,6 +155,7 @@ export function getInitData(){
     };
     json(api.getBigPush,param).then((res)=>{
       if(+res.data.code === 0){
+        dispatch({type:MODI_LOADING,flag:false});
         const data = res.data.data&&res.data.data.vital;
         const str = JSON.stringify(data);
         const arr = fullfillText(JSON.parse(str),false,false,false).newArr;
@@ -163,6 +165,7 @@ export function getInitData(){
           isEmpty:false
         });
       }else{
+        dispatch({type:MODI_LOADING,flag:false});
         const block = Object.assign(JSON.parse(config.textLabel),{full:true});      //无数据时保留一个自由文本标签可输入
         dispatch({
           type:SET,

src/store/async-actions/pushMessage.js

@@ -162,13 +162,17 @@ export const getScaleInfo = (it)=>{
         const emrData = getEMRParams();
           const params = {
             age: emrData.age,
+            sex: emrData.sex,
             featureType: "21",
             diag: emrData.dis,
-            // lis: emrData.lis,
-            lis: [],
-            sex: emrData.sex,
+            lis: emrData.lis,
             scaleId:it.id,
-            scaleName:it.name
+            scaleName:it.name,
+            other: emrData.other,
+            pacs: emrData.pacs,
+            vital:emrData.vital,
+            symptom: emrData.current + emrData.main,
+            // indications:'' //指标结果
           };
         json(api.push, params)
         .then((res)=>{