6 yıl önce · e93231b4e2
--- a/src/common/components/ConfirmModal/index.less
+++ b/src/common/components/ConfirmModal/index.less
@@ -28,6 +28,7 @@
 
				     right: 0px;
			
 
				     width: 40px;
			
 
				     height: 40px;
			
 
				+    cursor: pointer;
			
 
				 }
			
 
				 
			
 
				 .modal-content {
			
--- a/src/common/components/EditableSpan/index.jsx
+++ b/src/common/components/EditableSpan/index.jsx
@@ -82,7 +82,7 @@ class EditableSpan extends Component{
 
				     this.setState({
			
 
				       labelVal:text1
			
 
				     });
			
 
				-
			
 
				+    
			
 
				     const that = this;
			
 
				     handleChange&&handleChange({text1,boxMark,i});
			
 
				 
			
--- a/src/common/components/InlineTag/index.jsx
+++ b/src/common/components/InlineTag/index.jsx
@@ -21,7 +21,7 @@ class InlineTag extends Component {
 
				     this.$span = React.createRef();
			
 
				     this.state = {
			
 
				       editable:false,
			
 
				-      value:props.value
			
 
				+      value:props.value||''
			
 
				     };
			
 
				     this.changeToEdit = this.changeToEdit.bind(this);
			
 
				     this.changeToClick = this.changeToClick.bind(this);
			
@@ -47,17 +47,30 @@ class InlineTag extends Component {
 
				     });
			
 
				   }
			
 
				   handleInput(e){       //输入时保存临时值，在修改灰显为黑色时判断用
			
 
				+    const {handleInput,ikey,prefix,suffix} = this.props;
			
 
				     const text = e.target.innerText || e.target.innerHTML;
			
 
				+    // 内容全部删除时，要把空值存到store，否则会遗留最后一个字且为灰色无法删除
			
 
				+    if(!text){
			
 
				+      this.$span.current.innerText?(this.$span.current.innerText=''):(this.$span.current.innerHTML='');      //修改生成文字变成输入的2倍bug
			
 
				+      handleInput&&handleInput({text:text,ikey,prefix,suffix});
			
 
				+      this.setState({
			
 
				+        value:" "
			
 
				+      });
			
 
				+      return
			
 
				+    }
			
 
				     this.setState({
			
 
				       value:text
			
 
				     });
			
 
				-   // e.target.innerText = text;
			
 
				+   // e.target.innerText = text;  
			
 
				   }
			
 
				   handleBlur(e){         //鼠标离开是保存值到store中
			
 
				     const {value} = this.state;
			
 
				     const {handleInput,ikey,prefix,suffix} = this.props;
			
 
				     this.$span.current.innerText?(this.$span.current.innerText=''):(this.$span.current.innerHTML='');      //修改生成文字变成输入的2倍bug
			
 
				-    handleInput&&handleInput({text:value,ikey,prefix,suffix});
			
 
				+    handleInput&&handleInput({text:value.trim(),ikey,prefix,suffix});
			
 
				+    this.setState({
			
 
				+      value:value.trim()
			
 
				+    });
			
 
				   }
			
 
				   handleFocus(e){
			
 
				     e.stopPropagation();
			
--- a/src/common/components/MiniToast/index.less
+++ b/src/common/components/MiniToast/index.less
@@ -3,7 +3,7 @@
 
				   top:27px;
			
 
				   width: 388px;
			
 
				   background: #fff;
			
 
				-  z-index: 66;
			
 
				+  z-index: 40;
			
 
				   border: 1px solid #EAEDF1;
			
 
				   box-shadow: 0 5px 10px 0 rgba(0,0,0,0.10);
			
 
				   .infoTitle{
			
--- a/src/common/components/Textarea/index.jsx
+++ b/src/common/components/Textarea/index.jsx
@@ -23,7 +23,7 @@ class Textarea extends Component {
 
				     const {handleFocus,fuzhen,handleInput,isChronic} = this.props;
			
 
				     handleFocus&&handleFocus();         //其他史、查体获取数据的方法
			
 
				     if(fuzhen&& !isChronic.name&&!(this.$dom.current.innerText?this.$dom.current.innerText:this.$dom.current.innerHTML)){
			
 
				-      const text = config.currentText.replace("(**)",fuzhen);
			
 
				+      const text = config.currentText.replace("(**)",fuzhen.replace(";",''));
			
 
				       this.$dom.current.innerText?(this.$dom.current.innerText = text):(this.$dom.current.innerHTML = text);
			
 
				       handleInput&&handleInput({text});
			
 
				     }
			
--- a/src/common/images/1.png
+++ b/src/common/images/1.png
--- a/src/common/images/2.png
+++ b/src/common/images/2.png
--- a/src/common/images/3.png
+++ b/src/common/images/3.png
--- a/src/common/images/4.png
+++ b/src/common/images/4.png
--- a/src/common/images/5.png
+++ b/src/common/images/5.png
--- a/src/common/images/6.png
+++ b/src/common/images/6.png
--- a/src/common/images/7.png
+++ b/src/common/images/7.png
--- a/src/common/images/8.png
+++ b/src/common/images/8.png
--- a/src/common/less/variables.less
+++ b/src/common/less/variables.less
@@ -201,3 +201,42 @@
 
				   -ms-user-select: none;
			
 
				   user-select: none;
			
 
				 }
			
 
				+// 加入病历
			
 
				+.add-record{
			
 
				+  float: right;
			
 
				+  text-align: left;
			
 
				+  padding-left: 5px;
			
 
				+  cursor: default;
			
 
				+  display: inline-block;
			
 
				+  width: 99px;
			
 
				+  height: 26px;
			
 
				+  line-height: 26px;
			
 
				+  border: 1px solid #EAEDF1;
			
 
				+  border-radius: 4px;
			
 
				+  font-size: 12px;
			
 
				+  img{
			
 
				+    vertical-align: middle;
			
 
				+    width: 12px;
			
 
				+    margin:-3px 3px 0 0;
			
 
				+  }
			
 
				+}
			
 
				+.disable-add{
			
 
				+  float: right;
			
 
				+  text-align: left;
			
 
				+  padding-left: 5px;
			
 
				+  cursor: default;
			
 
				+  display: inline-block;
			
 
				+  width: 99px;
			
 
				+  height: 26px;
			
 
				+  line-height: 26px;
			
 
				+  border: 1px solid #EAEDF1;
			
 
				+  border-radius: 4px;
			
 
				+  font-size: 12px;
			
 
				+  color: @placeholder-color;
			
 
				+  img{
			
 
				+    vertical-align: middle;
			
 
				+    width: 12px;
			
 
				+    margin:-3px 3px 0 0;
			
 
				+    opacity: .5;
			
 
				+  }
			
 
				+}
			
--- a/src/components/Advice/Textarea/index.jsx
+++ b/src/components/Advice/Textarea/index.jsx
@@ -30,7 +30,7 @@ class Textarea extends Component {
 
				     return true;
			
 
				   }
			
 
				   componentWillReceiveProps(next){
			
 
				-    const isRead = this.props.isRead;
			
 
				+    const {isRead, typeConfig} = this.props;
			
 
				     // if(next.isRead != isRead && next.value!=this.props.value){      //value对比解决复诊不显示bug
			
 
				     //   next.value ? this.$dom.current.innerText = next.value :  this.$dom.current.innerText = next.value 
			
 
				     //   // this.$dom.current.innerText?(this.$dom.current.innerText = next.value||''):(this.$dom.current.innerHTML = next.value||'');
			
@@ -39,6 +39,9 @@ class Textarea extends Component {
 
				       next.value ? this.$dom.current.innerText = next.value :  this.$dom.current.innerText = '' 
			
 
				       // this.$dom.current.innerText?(this.$dom.current.innerText = next.value||''):(this.$dom.current.innerHTML = next.value||'');
			
 
				     }
			
 
				+    if(next.typeConfig != typeConfig) {
			
 
				+      this.$dom.current.innerText = '' 
			
 
				+    }
			
 
				   }
			
 
				   componentDidMount(){
			
 
				     const {value} = this.props;
			
--- a/src/components/Advice/index.jsx
+++ b/src/components/Advice/index.jsx
@@ -66,7 +66,7 @@ class Advice extends Component{
 
				 
			
 
				   render(){
			
 
				     const {advice} = this.props.pushMessage;
			
 
				-    const {isRead, isFirstMainDiag, followUp, hasFollowUp, saveFollowUp} = this.props
			
 
				+    const {isRead, isFirstMainDiag, followUp, hasFollowUp, saveFollowUp, typeConfig} = this.props
			
 
				     let scheme = advice.scheme && advice.scheme.map((item, index) => {
			
 
				       return <p>{item.treatment.map((it,ii) =>{
			
 
				         return(it.treatmentStr && it.treatmentStr.length > 0 ? 
			
@@ -93,7 +93,7 @@ class Advice extends Component{
 
				             {/* {advice.commontreatment && <div className={style['treat-input']}  onInput={this.handleComTreatInput}  contentEditable={true} style = {{outline: 'none'}}></div>} */}
			
 
				             {<Textarea value={advice.commontreatment} isRead={isRead} handleChangeAssistValue={this.handleComTreatInput} ></Textarea>}
			
 
				         </div>}
			
 
				-        {!isFirstMainDiag &&<div><FollowUp  noHeader="true" textStyle={{padding: '0 10px'}}  setFollowUp={saveFollowUp} followUp = {followUp} isRead={isRead}></FollowUp></div>}
			
 
				+        {!isFirstMainDiag && followUp &&<div><FollowUp  noHeader="true" textStyle={{padding: '0 10px'}}  setFollowUp={saveFollowUp} followUp = {followUp} isRead={isRead}></FollowUp></div>}
			
 
				         {advice.scheme && advice.scheme.length > 0 &&<div contentEditable='false' className={style['scheme']}>
			
 
				           {advice.scheme && advice.scheme.length > 0  && <h1>治疗方案</h1>}
			
 
				           {scheme}
			
@@ -101,7 +101,7 @@ class Advice extends Component{
 
				         <div className={style['billing']} > 
			
 
				             {/* {!advice.adviceInput && <Textarea value='' isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>}
			
 
				             {advice.adviceInput && <Textarea value={advice.adviceInput} isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>} */}
			
 
				-            <Textarea value={advice.adviceInput} isRead={isRead} handleChangeAssistValue={this.handleAdviceInput} ></Textarea>
			
 
				+            <Textarea value={advice.adviceInput} isRead={isRead} handleChangeAssistValue={this.handleAdviceInput}  typeConfig={typeConfig}></Textarea>
			
 
				         </div>
			
 
				       </ItemBox>
			
 
				     </div>
			
--- a/src/components/AssessResult/AssessHis/index.jsx
+++ b/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 { Radio,ComplexModal,Notify} from '@commonComp';
			
 
				+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,11 +34,17 @@ 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;
			
 
				-    const {getIndexData,inquiryDate,indexData,timeTypes} = this.props;
			
 
				+    const {wholeAssess,wholeIndexs,chooseSelecteds,scaleResult,wholeResults,wholeAssessText,calcuResult,calcuValues,scaleItems} =obj;
			
 
				+    const {getIndexData,inquiryDate,indexData,timeTypes,indexNames} = this.props;
			
 
				     const {chartTimeTypes} = this.state;
			
 
				     const name = item.regionName+"：";
			
 
				     const list = item.data&&item.data.rows;
			
@@ -45,16 +53,22 @@ class AssessResultHis extends Component {
 
				         return <ScaleItem title={name}
			
 
				                           data={wholeAssess}
			
 
				                           showScaleFn={this.showScaleFn}
			
 
				+                          showListScale={this.showScaleFn}
			
 
				                           indexs={wholeIndexs}
			
 
				                           formulaResult={scaleResult}
			
 
				+                          calcuResult={calcuResult}
			
 
				+                          calcuValues={calcuValues}
			
 
				+                          scaleItems={scaleItems}
			
 
				                           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>;
			
 
				       case 10:    //数据来源于后台
			
 
				         return <ChartItem title={name}
			
 
				                           data={indexData||{}}
			
 
				+                          names={indexNames||{}}
			
 
				                           timeTypes={JSON.stringify(chartTimeTypes||{})=='{}'?timeTypes&&timeTypes[i]:chartTimeTypes[i]}
			
 
				                           initFn={getIndexData}
			
 
				                           endDate={inquiryDate}
			
@@ -76,16 +90,13 @@ class AssessResultHis extends Component {
 
				       return data===null||(data&&data.length==0)?<p className={style['no-data']}>没有历史评估记录！</p>:'';
			
 
				     }
			
 
				   }
			
 
				-  /*componentDidMount(){
			
 
				-    const indexTimeTypes = JSON.parse(JSON.stringify(this.props.indexTimeTypes));
			
 
				-    console.log(indexTimeTypes)
			
 
				-    this.setState({
			
 
				-      chartTimeTypes:indexTimeTypes
			
 
				-    });
			
 
				-  }*/
			
 
				   showScaleFn(item,pid){
			
 
				     const { list,inquiryId } = this.props;
			
 
				     const obj = list&&list[inquiryId];
			
 
				+    if(item&&item.id&&!(obj.scaleInfo&&obj.scaleInfo[item.id])){
			
 
				+      Notify.info("未保存该量表数据");
			
 
				+      return ;
			
 
				+    }
			
 
				     if(item){
			
 
				       this.setState({
			
 
				         tableName:item.name,
			
@@ -108,9 +119,16 @@ class AssessResultHis extends Component {
 
				       operaSupport: false,
			
 
				     });
			
 
				   }
			
 
				+  componentWillReceiveProps(next){
			
 
				+    if(next.inquiryId!=this.props.inquiryId||!next.showHistoryCases){
			
 
				+      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 +136,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}
			
--- a/src/components/AssessResult/AssessHis/index.less
+++ b/src/components/AssessResult/AssessHis/index.less
@@ -9,7 +9,8 @@
 
				     color: @blue;
			
 
				     cursor: pointer;
			
 
				     img{
			
 
				-      margin-left: 4px;
			
 
				+      vertical-align: text-top;
			
 
				+      width: 18px;
			
 
				     }
			
 
				   }
			
 
				 }
			
--- a/src/components/AssessResult/ChartItem/index.jsx
+++ b/src/components/AssessResult/ChartItem/index.jsx
@@ -81,16 +81,27 @@ class ChartItem extends Component {
 
				     }
			
 
				     handleChange&&handleChange(Object.assign(temp,{[i]:type}));
			
 
				   }
			
 
				-  getContainers(){
			
 
				+  getContainers(obj){
			
 
				     const timeTypes = this.props.timeTypes;
			
 
				-    const range = this.getXAxisArr(config.chartDismen);
			
 
				-    const obj = this.props.data[range[0]+range[range.length-1]];
			
 
				     const {endDate} = this.props;
			
 
				-    let arr = [];
			
 
				+    let len = 1,idx=0;    //单个图表第一条线的在所有线中的index,用于显示不同的形状，打印使用
			
 
				+    let arr = [],keys = Object.keys(obj||{});
			
 
				     for(let i in obj){
			
 
				-      arr.push(<Chart data={obj[i]} endDate={endDate} type={timeTypes&&timeTypes[i]} index={i} getXAxisArr={this.getXAxisArr} handleRangeChange={this.rangChange}/>)
			
 
				+      idx = keys.findIndex((t)=>{return t==i});
			
 
				+      len = idx==0?0:len+obj[keys[idx-1]].length;
			
 
				+      arr.push(<Chart data={obj[i]} len={len} endDate={endDate} type={timeTypes&&timeTypes[i]} index={i} getXAxisArr={this.getXAxisArr} handleRangeChange={this.rangChange}/>)
			
 
				     }
			
 
				-    return arr;
			
 
				+    return arr.length>0?arr:<p style={{color:'#acacac'}}>该模块暂无数据</p>;
			
 
				+  }
			
 
				+  getLegends(obj){
			
 
				+    let arr = [],temp='',doms=[];
			
 
				+    for(let i in obj){
			
 
				+      arr = [...arr,...obj[i]];
			
 
				+    }
			
 
				+    arr.map((it,ix)=>{
			
 
				+      doms.push(<div><img src={require('@common/images/'+(ix+1)+'.png')} /><span>{it}</span></div>);
			
 
				+    });
			
 
				+    return doms;
			
 
				   }
			
 
				   componentDidMount(){
			
 
				     const {initFn,pindex} = this.props;
			
@@ -102,11 +113,17 @@ class ChartItem extends Component {
 
				     initFn&&initFn({range,rangeType:type,pindex,getNew:true});
			
 
				   }
			
 
				   render() {
			
 
				-    const {title} = this.props;
			
 
				+    const {title,data,names} = this.props;
			
 
				+    const range = this.getXAxisArr(config.chartDismen);
			
 
				+    const obj = data[range[0]+range[range.length-1]];
			
 
				+    const nameObj = names&&names[range[0]+range[range.length-1]];
			
 
				     return <div className={style['assess-item']}>
			
 
				       <h2>{title}</h2>
			
 
				+      <div className={style['legend']}>
			
 
				+        {this.getLegends(nameObj)}
			
 
				+      </div>
			
 
				       <div className={style['item-content']}>
			
 
				-        {this.getContainers()}
			
 
				+        {this.getContainers(obj)}
			
 
				       </div>
			
 
				     </div>;
			
 
				   }
			
@@ -127,20 +144,19 @@ class Chart extends Component{
 
				     this.timeSwitch = this.timeSwitch.bind(this);
			
 
				   }
			
 
				   drawChart(){
			
 
				-    const {index,data,getXAxisArr,type,endDate} = this.props;
			
 
				+    const {index,data,getXAxisArr,type,endDate,len} = this.props;
			
 
				     const xAxis = getXAxisArr(type);
			
 
				     const id = endDate?'chart'+endDate+index:'chart'+index;
			
 
				     let series = [],names=[],inx=-1;
			
 
				     let myChart = echarts.init(document.getElementById(id) ,null, {renderer: 'svg'});
			
 
				     let xAxisArr = [...xAxis];
			
 
				-
			
 
				     const interval = {
			
 
				       week:23,
			
 
				       month:4,
			
 
				       sixMonth:9,
			
 
				       year:60
			
 
				     };
			
 
				-    data&&data.map((it)=>{
			
 
				+    data&&data.map((it,j)=>{
			
 
				       let values=new Array();
			
 
				       let name='';
			
 
				       it&&it.creatTime.map((x,i)=>{
			
@@ -160,7 +176,12 @@ class Chart extends Component{
 
				         name: it.itemName,
			
 
				         type: 'line',
			
 
				         data: values,
			
 
				-        showAllSymbol:true
			
 
				+        showAllSymbol:true,
			
 
				+        symbol:'image://'+require('@common/images/'+((len+j)%8+1)+'.png'),//config.chartSymbols[(len+j)%8],
			
 
				+        symbolSize:10,
			
 
				+        itemStyle:{
			
 
				+          color:config.chartColors[(len+j)%8]
			
 
				+        }
			
 
				       });
			
 
				     });
			
 
				     // 指定图表的配置项和数据
			
@@ -172,11 +193,13 @@ class Chart extends Component{
 
				         }
			
 
				       },
			
 
				       legend: {
			
 
				-        data:names,
			
 
				-        bottom:210
			
 
				+        show:false
			
 
				+        /*data:names,
			
 
				+        padding:0,
			
 
				+        itemHeight:16,*/
			
 
				       },
			
 
				       grid:{
			
 
				-        top:80
			
 
				+        top:40
			
 
				       },
			
 
				       xAxis: {
			
 
				         type: 'category',
			
--- a/src/components/AssessResult/ScaleItem/index.jsx
+++ b/src/components/AssessResult/ScaleItem/index.jsx
@@ -7,6 +7,7 @@ import checkIcon from '@common/images/check.png';
 
				 import {ComplexModal,MiniToast,Radio} from '@commonComp';
			
 
				 import Notify from '@commonComp/Notify';
			
 
				 import {deepClone} from '@utils/tools';
			
 
				+import { getFormulaResult } from '@store/async-actions/fetchModules'
			
 
				 /**
			
 
				  * 来源于页面选择
			
 
				  *
			
@@ -56,9 +57,13 @@ class ScaleItem extends Component {
 
				     this.closeOption();
			
 
				   }
			
 
				   handleShowScale(item,parentId,pIndex){
			
 
				-    const {showScaleFn,closeAssess} = this.props;
			
 
				+    const {showScaleFn,closeAssess,showListScale} = this.props;
			
 
				     closeAssess&&closeAssess();    //关闭评估弹窗
			
 
				-    showScaleFn&&showScaleFn(item,parentId,pIndex);        //显示量表
			
 
				+    if(!parentId){                //显示量表
			
 
				+      showListScale&&showListScale(item);
			
 
				+    }else{
			
 
				+      showScaleFn&&showScaleFn(item,parentId,pIndex);
			
 
				+    }
			
 
				 
			
 
				   }
			
 
				   handleRadio(item,parent){
			
@@ -70,8 +75,10 @@ class ScaleItem extends Component {
 
				   }
			
 
				   handleForRadio(id,idd, ind){
			
 
				     const {formulaData} = this.state;
			
 
				-    const obj = JSON.parse(JSON.stringify(formulaData));
			
 
				+    const {calcuValues} = this.props;
			
 
				+    const obj = deepClone(formulaData);
			
 
				     const data = obj&&obj[id];
			
 
				+    data.content = calcuValues&&calcuValues[id];
			
 
				     if (data) {
			
 
				       for(let z = 0; z <  data.content.details[idd].details.length; z++) {
			
 
				         data.content.details[idd].details[z].state = 0;
			
@@ -84,7 +91,7 @@ class ScaleItem extends Component {
 
				   }
			
 
				   showFormula(id,it){
			
 
				     const {formulaData} = this.state;
			
 
				-    const obj = JSON.parse(JSON.stringify(formulaData)||{});
			
 
				+    const obj = deepClone(formulaData)||{};
			
 
				     if(!obj[id]){
			
 
				       obj[id] = it;
			
 
				     }
			
@@ -104,20 +111,18 @@ class ScaleItem extends Component {
 
				       formulaId:null
			
 
				     })
			
 
				   }
			
 
				-  calcuFormula(j, v, ii) { //计算公式计算
			
 
				-    const { calcuFormula,chronicPushItems } = this.props;
			
 
				+  calcuFormula() { //计算公式计算
			
 
				+    const { calcuResult,handleCalcu } = this.props;
			
 
				     const {formulaId,formulaData} = this.state;
			
 
				-    const it =formulaData&&formulaData[formulaId];
			
 
				-    let pushObj = deepClone(chronicPushItems);
			
 
				-    pushObj[ii].details[j]=it;
			
 
				-    let allHasInfo = true
			
 
				+    let it=formulaData&&formulaData[formulaId];
			
 
				+    let allHasInfo = true;
			
 
				     for (let i = 0; i < it.content.details.length; i++) {
			
 
				       if(it.content.details[i].controlType == 2) {  //输入框类型的有没有填值
			
 
				         if(!it.content.details[i].value) {
			
 
				           allHasInfo = false
			
 
				         }
			
 
				-      } else if(it.content.details[i].controlType == 1) {
			
 
				-        let hasSelect = false
			
 
				+      } else if(it.content.details[i].controlType == 0) {
			
 
				+        let hasSelect = false;
			
 
				         for( let z = 0; z <it.content.details[i].details.length; z++) {
			
 
				           if(it.content.details[i].details[z].state == 1) {
			
 
				             hasSelect= true
			
@@ -130,23 +135,26 @@ class ScaleItem extends Component {
 
				 
			
 
				     }
			
 
				     if(allHasInfo) { //所有都有值，则计算
			
 
				-      // delete it.content.resultz
			
 
				-      let param = {
			
 
				-        type: 2,
			
 
				-        data: it,
			
 
				-        disId: v.id,
			
 
				-        pIndex: j,
			
 
				-        ppIndex: ii,
			
 
				-      }
			
 
				-      calcuFormula({param,chronicPushItems:pushObj})
			
 
				+      let results = deepClone(calcuResult);
			
 
				+      getFormulaResult({type:2,data:it}).then((res)=>{
			
 
				+        if(+res.data.code==0){
			
 
				+          const result = res.data.data.result;
			
 
				+          results[formulaId] = result;
			
 
				+          handleCalcu&&handleCalcu(results);
			
 
				+        }else{
			
 
				+          Notify.error(res.data.msg||'计算没有结果返回');
			
 
				+        }
			
 
				+      })
			
 
				     } else {  //不是所有值都填过了
			
 
				       Notify.info('请填写计算公式内容')
			
 
				     }
			
 
				   }
			
 
				   handleInputformula(id,idd,text) {
			
 
				     const {formulaData} = this.state;
			
 
				+    const {calcuValues} = this.props;
			
 
				     const obj = deepClone(formulaData);
			
 
				     const data = obj&&obj[id];
			
 
				+    data.content = calcuValues&&calcuValues[id];
			
 
				     if (data) {
			
 
				       data.content.details[idd].value = text;
			
 
				     }
			
@@ -156,8 +164,8 @@ class ScaleItem extends Component {
 
				   }
			
 
				   getDetailItems(item,i){
			
 
				     let arr = [],temp='';
			
 
				-    const {indexs,result,formulaResult,calcuResult,disabled} = this.props;
			
 
				-    const {optionId,formulaId,radioVal,formulaData,isFormulaConfirm} = this.state;
			
 
				+    const {indexs,result,formulaResult,calcuValues,disabled,calcuResult} = this.props;
			
 
				+    const {optionId,formulaId,radioVal,formulaData} = this.state;
			
 
				     const possible=result&&result.possible;
			
 
				 
			
 
				     item.details.map((its,j)=>{
			
@@ -168,11 +176,12 @@ class ScaleItem extends Component {
 
				           let scaleRes=formulaResult&&formulaResult[it.content.id]&&formulaResult[it.content.id].calcalculate;
			
 
				           temp =<span className={style['scale']}
			
 
				                       onClick={()=>this.handleShowScale(it.content,item.id,i)}>
			
 
				-                        {scaleRes&&scaleRes.result?(' 【'+it.content.name+'】 结果：'+scaleRes.result.value+" "+scaleRes.result.text):'【'+it.content.name+'】'}
			
 
				+                        {scaleRes&&scaleRes.result?(' 【'+it.content.name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.content.name+'】'}
			
 
				                         </span>;
			
 
				         }else if(its.type==2){      //计算公式
			
 
				           it=formulaData[formulaId]||deepClone(its);
			
 
				           const showRes = calcuResult&&calcuResult[item.id]||it.content.result;
			
 
				+          const details = calcuValues&&calcuValues[item.id]&&calcuValues[item.id].details||it.content.details;
			
 
				           const cresult = showRes&&showRes[1]&&showRes[1].text;
			
 
				                     temp = <div className={style['results']}>
			
 
				                     <span>计算公式结果：</span>
			
@@ -185,8 +194,8 @@ class ScaleItem extends Component {
 
				                                confirm={this.confirmFormula.bind(this,item,i)}
			
 
				                                footer="true">
			
 
				                       <table>
			
 
				-                        {it.content.details.map((item1,idd)=>{
			
 
				-                          if(item1.controlType==1){//单选
			
 
				+                        {details.map((item1,idd)=>{
			
 
				+                          if(item1.controlType==0){//单选
			
 
				                             return <tr>
			
 
				                               <td>
			
 
				                                 <span>{'请选择'+item1.name+'：'}</span>
			
@@ -220,9 +229,9 @@ class ScaleItem extends Component {
 
				                           }
			
 
				                         })}
			
 
				                       </table>
			
 
				-                      {disabled?"":<div className={style["forMulBtn"]} onClick={this.calcuFormula.bind(this,j, item, i)}>计算</div>}
			
 
				+                      {disabled?"":<div className={style["forMulBtn"]} onClick={this.calcuFormula.bind(this)}>计算</div>}
			
 
				                       <table>
			
 
				-                        {showRes && Array.isArray(showRes) &&showRes.map((itemResult, resultIndex) => {
			
 
				+                        {showRes && Array.isArray(showRes) &&showRes.map((itemResult) => {
			
 
				                           return <tr>
			
 
				                             <td>
			
 
				                               <span>{itemResult.name+'：'}</span>
			
@@ -255,6 +264,7 @@ class ScaleItem extends Component {
 
				                                      isSelect={radioVal&&radioVal[item.id]==lis.detailName}
			
 
				                                      handleClick={this.handleRadio.bind(this,lis,item,i)}>
			
 
				                               </Radio>
			
 
				+                              {lis.state==1?<span className={style['recomand']}>（智能推荐）</span>:''}
			
 
				                             </div>
			
 
				                           })}
			
 
				                         </div>
			
@@ -267,7 +277,7 @@ class ScaleItem extends Component {
 
				           </li>:<li>
			
 
				           <span>{item.name}：</span>
			
 
				           <div className={style['row']}>{temp}</div>
			
 
				-          <div className={style["recommend"]} onClick={()=>this.props.handleRemove(i,j)}>
			
 
				+          <div className={style["recommend"]} onClick={()=>this.props.handleRemove(false,i,j)}>
			
 
				             <img className={style["deleteIcon"]} src={deleteIcon} />
			
 
				           </div>
			
 
				         </li>;
			
@@ -282,14 +292,45 @@ class ScaleItem extends Component {
 
				       return this.getDetailItems(it,i);
			
 
				     });
			
 
				   }
			
 
				+  getScales(){
			
 
				+    const {scaleItems,disabled,formulaResult} = this.props;
			
 
				+    let li='',temp='';
			
 
				+    const arr = scaleItems&&scaleItems.map((it,i)=>{
			
 
				+      if(!it) return '';
			
 
				+      let scaleRes=formulaResult&&formulaResult[it.id]&&formulaResult[it.id].calcalculate;
			
 
				+      temp =<span className={style['scale']} onClick={()=>this.handleShowScale(it)}>
			
 
				+                        {scaleRes&&scaleRes.result?(' 【'+it.name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.name+'】'}
			
 
				+                        </span>;
			
 
				+      li = disabled?<li>
			
 
				+        <span>相关量表：</span>
			
 
				+        <div className={style['row']}>{temp}</div>
			
 
				+      </li>:<li>
			
 
				+        <span>相关量表：</span>
			
 
				+        <div className={style['row']}>{temp}</div>
			
 
				+        <div className={style["recommend"]} onClick={()=>this.props.handleRemove(true,i)}>
			
 
				+          <img className={style["deleteIcon"]} src={deleteIcon} />
			
 
				+        </div>
			
 
				+      </li>;
			
 
				+      return li;
			
 
				+    });
			
 
				+    return arr;
			
 
				+  }
			
 
				   handleInput(e){
			
 
				     const text = e.target.value;
			
 
				     this.setState({
			
 
				       text
			
 
				     });
			
 
				   }
			
 
				+  componentWillReceiveProps(next){        //修复bug1329,第二次保存值不显示
			
 
				+    if(next.text!=this.state.text){
			
 
				+      this.setState({
			
 
				+        text:next.text
			
 
				+      });
			
 
				+    this.$area.current.value=next.text;
			
 
				+    }
			
 
				+  }
			
 
				   render() {
			
 
				-    const {title,handleInp,disabled,isRecommend,formulaResult} = this.props;
			
 
				+    const {title,handleInp,disabled,isRecommend} = this.props;
			
 
				     return <div className={style['assess-item']}>
			
 
				       {isRecommend?'':<h2>{title}</h2>}
			
 
				       <div className={style['item-content']}>
			
@@ -297,6 +338,9 @@ class ScaleItem extends Component {
 
				           {
			
 
				             this.getItems()
			
 
				           }
			
 
				+          {
			
 
				+            this.getScales()
			
 
				+          }
			
 
				           {isRecommend?'':<li>
			
 
				             <textarea className={style['edit-row']}
			
 
				                       ref={this.$area}
			
--- a/src/components/AssessResult/index.jsx
+++ b/src/components/AssessResult/index.jsx
@@ -7,23 +7,26 @@ import Information from '../Information'
 
				 import ChartItem from "./ChartItem";
			
 
				 import Notify from '@commonComp/Notify';
			
 
				 import {readyKeepHistory} from '@utils/tools';
			
 
				+import loadingIcon from '@common/images/loading.gif';
			
 
				 
			
 
				 class AssessResult extends Component {
			
 
				   constructor(props) {
			
 
				     super(props);
			
 
				     const chooseSelecteds = JSON.parse(JSON.stringify(props.chooseSelecteds)||{});
			
 
				     const wholeIndexs = JSON.parse(JSON.stringify(props.wholeIndexs)||{});      //深度复制，Object.assgin为浅复制，下下级会同源
			
 
				-    //const wholeResults = JSON.parse(JSON.stringify(props.wholeResults)||{});
			
 
				+    const wholeScale = JSON.parse(JSON.stringify(props.wholeScaleItems)||{});
			
 
				 
			
 
				     this.state={
			
 
				       chooseSelecteds:chooseSelecteds,     //大数据选择模块
			
 
				       chartTimeTypes:{},      //图表模块
			
 
				       wholeAssessItems:wholeIndexs,     //整体评估模块
			
 
				+      wholeScaleItems:wholeScale,
			
 
				       wholeAssessText:props.wholeAssessText||'',     //整体评估补充说明
			
 
				       wholeResults:{
			
 
				         possible:props.possible,
			
 
				         radioVal:props.radioVal
			
 
				       },
			
 
				+      calcuResult:props.calcuResult,     //计算公式结果
			
 
				     };
			
 
				     this.handleChooseChange = this.handleChooseChange.bind(this);
			
 
				     this.handleScaleDel = this.handleScaleDel.bind(this);
			
@@ -39,13 +42,22 @@ class AssessResult extends Component {
 
				         wholeAssessText:text
			
 
				       })
			
 
				   }
			
 
				-  handleScaleDel(i,j){
			
 
				-    const items = Object.assign({},this.state.wholeAssessItems);
			
 
				-    const inx = items[i].findIndex(x=>x==j);
			
 
				-    items[i].splice(inx,1);
			
 
				-    this.setState({
			
 
				-      wholeAssessItems: items
			
 
				-    });
			
 
				+  handleScaleDel(isList,i,j){
			
 
				+    if(isList){         //删除全部量表中的项目
			
 
				+      const items = [...this.state.wholeScaleItems];
			
 
				+      items.splice(i,1);
			
 
				+      this.setState({
			
 
				+        wholeScaleItems: items
			
 
				+      });
			
 
				+    }else{
			
 
				+      const items = Object.assign({},this.state.wholeAssessItems);
			
 
				+      const inx = items[i].findIndex(x=>x==j);
			
 
				+      items[i].splice(inx,1);
			
 
				+      this.setState({
			
 
				+        wholeAssessItems: items
			
 
				+      });
			
 
				+    }
			
 
				+
			
 
				   }
			
 
				   handleResult(opt){
			
 
				     const {wholeResults} = this.state.wholeResults;
			
@@ -66,9 +78,14 @@ class AssessResult extends Component {
 
				       chartTimeTypes:Object.assign(chartTimeTypes,{[i]:selects})
			
 
				     });
			
 
				   }
			
 
				+  handleCalcu(ret){
			
 
				+    this.setState({
			
 
				+      calcuResult:ret
			
 
				+    });
			
 
				+  }
			
 
				   componentWillUnmount(){
			
 
				     //点确定关闭弹窗时把参数传到父组件去
			
 
				-    const {handleSave,isAssessConfirm,clearChartData,handleSaveCalcu,isRecommend} = this.props;
			
 
				+    const {handleSave,isAssessConfirm,clearChartData,handleSaveCalcu,isRecommend,saveCalcuResult} = this.props;
			
 
				     clearChartData&&clearChartData();
			
 
				     if(!isRecommend&&isAssessConfirm && readyKeepHistory() == 1){
			
 
				       Notify.error("主诉不能为空");
			
@@ -76,16 +93,20 @@ class AssessResult extends Component {
 
				       Notify.info('诊断不能为空');
			
 
				     }
			
 
				     handleSaveCalcu&&handleSaveCalcu(this.state.wholeResults);
			
 
				-    isAssessConfirm&&handleSave(this.state,readyKeepHistory(),isRecommend);
			
 
				+    if(isAssessConfirm){
			
 
				+      handleSave(this.state,readyKeepHistory(),isRecommend);
			
 
				+    }else{
			
 
				+      saveCalcuResult&&saveCalcuResult(this.state.calcuResult);
			
 
				+    }
			
 
				   }
			
 
				   handoutTypes(item,i){
			
 
				-    const {getIndexData,indexData,timeTypes,wholeIndexs,closeAssess,showScaleFn,calcuFormula,isRecommend,chronicPushItems,
			
 
				-      formulaResult,calcuResult} =this.props;
			
 
				+    const {getIndexData,indexData,timeTypes,wholeIndexs,closeAssess,showScaleFn,isRecommend,chronicPushItems,
			
 
				+      formulaResult,calcuValues,indexNames,showListScale} =this.props;
			
 
				     let obj = [];
			
 
				     Object.keys(wholeIndexs).map((i)=>{
			
 
				       obj[i]=chronicPushItems[i];
			
 
				     });
			
 
				-    const {chooseSelecteds,wholeAssessItems,wholeAssessText,chartTimeTypes,wholeResults} = this.state;
			
 
				+    const {chooseSelecteds,wholeAssessItems,wholeScaleItems,wholeAssessText,chartTimeTypes,wholeResults,calcuResult} = this.state;
			
 
				     const chartData = indexData;
			
 
				     const name = item.regionName+"：";
			
 
				     const list = item.data&&item.data.rows;
			
@@ -96,12 +117,15 @@ class AssessResult extends Component {
 
				                           handleRemove={this.handleScaleDel}
			
 
				                           handleInp={this.handleScaleText}
			
 
				                           handleRes={this.handleResult}
			
 
				+                          handleCalcu={this.handleCalcu.bind(this)}
			
 
				                           text={wholeAssessText}
			
 
				                           indexs={wholeAssessItems}
			
 
				+                          scaleItems ={wholeScaleItems}
			
 
				                           result={wholeResults}
			
 
				                           showScaleFn={showScaleFn}
			
 
				-                          calcuFormula={calcuFormula}
			
 
				+                          showListScale={showListScale}
			
 
				                           calcuResult={calcuResult}
			
 
				+                          calcuValues={calcuValues}
			
 
				                           formulaResult={formulaResult}
			
 
				                           isRecommend={isRecommend}
			
 
				                           chronicPushItems={chronicPushItems}
			
@@ -114,6 +138,7 @@ class AssessResult extends Component {
 
				       case 10:   //数据来源于后台
			
 
				         return <ChartItem title={name}
			
 
				                           data={chartData||{}}
			
 
				+                          names={indexNames||{}}
			
 
				                           timeTypes={JSON.stringify(chartTimeTypes)=='{}'?timeTypes&&timeTypes[i]:chartTimeTypes[i]}
			
 
				                           pindex={i}
			
 
				                           initFn={getIndexData}
			
@@ -131,6 +156,7 @@ class AssessResult extends Component {
 
				       <div className={style['printShow']}>
			
 
				         <Information></Information>
			
 
				       </div>
			
 
				+      {!(data&&data.length>0)?<p className={style['loading']}><img src={loadingIcon} alt='loading...'/></p>:''}
			
 
				       {data && data.map((it, i) => {
			
 
				         return this.handoutTypes(it, i);
			
 
				       })}
			
--- a/src/components/AssessResult/index.less
+++ b/src/components/AssessResult/index.less
@@ -43,6 +43,9 @@
 
				     .chooseItem{
			
 
				       display: inline-block;
			
 
				       margin-right: 10px;
			
 
				+      .recomand{
			
 
				+        color: @blue;
			
 
				+      }
			
 
				     }
			
 
				     .scale{
			
 
				       color: @blue;
			
@@ -73,7 +76,7 @@
 
				     min-width: 302px;
			
 
				     width: 49%;
			
 
				     height: 250px;
			
 
				-    margin-bottom: 20px;
			
 
				+    margin: 15px 0 5px;
			
 
				     position: relative;
			
 
				     .chart-box{
			
 
				       width: 100%;
			
@@ -85,7 +88,7 @@
 
				   }
			
 
				   .time-range{
			
 
				     position: absolute;
			
 
				-    bottom: 180px;
			
 
				+    bottom: 224px;
			
 
				     /*top: 26px;*/
			
 
				     z-index: 2;
			
 
				     width: 100%;
			
@@ -158,6 +161,32 @@
 
				   border-radius: 4px;
			
 
				   padding: 5px;
			
 
				 }
			
 
				+.legend{
			
 
				+  padding: 0 36px;
			
 
				+  /*margin-bottom: 15px;*/
			
 
				+  &>div{
			
 
				+    display: inline-block;
			
 
				+    margin-top: 10px;
			
 
				+  }
			
 
				+  span{
			
 
				+    margin-right: 20px;
			
 
				+  }
			
 
				+  img{
			
 
				+    vertical-align: middle;
			
 
				+    width: 18px;
			
 
				+    margin-right: 3px;
			
 
				+  }
			
 
				+}
			
 
				+.loading{
			
 
				+  text-align: center;
			
 
				+  position: absolute;
			
 
				+  top: 49%;
			
 
				+  left: 49%;
			
 
				+  img{
			
 
				+    width: 40px;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				 @media print {
			
 
				   .printShow,.textareaStatic {
			
 
				     display: block;
			
--- a/src/components/CheckBody/index.jsx
+++ b/src/components/CheckBody/index.jsx
@@ -36,7 +36,7 @@ class CheckBody extends Component{
 
				     const moreNum =data.length-[...data].reverse().findIndex((it)=>it.showInCheck)-1;//被隐藏的位置
			
 
				     const moreText = filterDataArr([...saveText].splice(moreNum+1));     //被收起的标签中是否有有值得，有则不能再收起showMoreBtn?more:''
			
 
				     const more = showAll?<span className={style['more']} onClick={this.showHide}>收起<img src={hideImg} /></span>:<span className={style['more']} onClick={this.showHide}>展开<img src={showImg} /></span>;
			
 
				-    const showMoreBtn = data.length>config.showCheckNum&&(data.length>moreNum&&!data[0].full)&&!moreText;
			
 
				+    const showMoreBtn = data.length>config.showCheckNum&&(data.length-1>moreNum&&!data[0].full)&&!moreText;
			
 
				     let showArray = data.filter((it)=>{
			
 
				       if(it.showInCheck)
			
 
				         return it;
			
@@ -71,17 +71,14 @@ class CheckBody extends Component{
 
				       }
			
 
				       leftL = ele.offsetLeft+90
			
 
				     }
			
 
				-    getSearchLocation(getPageCoordinate(e).boxTop,leftL)
			
 
				+    getSearchLocation(getPageCoordinate(e).boxTop,leftL);
			
 
				     this.setState({
			
 
				-      // boxLeft:getPageCoordinate(e).boxLeft,
			
 
				-      // boxLeft:leftL,
			
 
				-      // boxTop:getPageCoordinate(e).boxTop,
			
 
				       tmpScroll: $("#addScrollEvent")[0].scrollTop,
			
 
				       tmpTop:getPageCoordinate(e).boxTop
			
 
				     });
			
 
				     windowEventHandler('scroll',()=>{      //弹窗跟随滚动条滚动或者关闭弹窗
			
 
				       let scrollYs = $("#addScrollEvent")[0].scrollTop;
			
 
				-      let boxTop = this.state.tmpTop - scrollYs + this.state.tmpScroll
			
 
				+      let boxTop = this.state.tmpTop - scrollYs + this.state.tmpScroll;
			
 
				       getSearchLocation(boxTop,this.state.boxLeft)
			
 
				     },$("#addScrollEvent")[0])
			
 
				   }
			
@@ -93,18 +90,14 @@ class CheckBody extends Component{
 
				   getData(){
			
 
				     //第一次聚焦查体时，主诉有数据则调接口，主诉无数据则显示提示；其他时间查体模板数据不调接口
			
 
				     const {hasMain,isEmpty} = this.props;
			
 
				-
			
 
				+    if(!hasMain&&isEmpty){
			
 
				+      Notify.error("无法操作，请先输入主诉");
			
 
				+      return;
			
 
				+    }
			
 
				     //无主诉提示在EditableSpan里
			
 
				     //有主诉时且本身无数据，第一次点击获取数据，(不论获取成功与否)再点击不获取（直到刷新成空白页或清空）
			
 
				     if(hasMain&&isEmpty!=false){
			
 
				       this.props.getInit();
			
 
				-      //隐藏区域有默认选中项，默认全部展开-有延迟，弃用
			
 
				-      /*const that = this;
			
 
				-      setTimeout(function(){
			
 
				-        that.props.showAll&&that.setState({
			
 
				-          showAll:true
			
 
				-        });
			
 
				-      },900)*/
			
 
				 
			
 
				     }
			
 
				   }
			
--- a/src/components/ChronicInfo/index.jsx
+++ b/src/components/ChronicInfo/index.jsx
@@ -14,6 +14,7 @@ import {ComplexModal,ConfirmModal,MiniToast, Radio,CheckBtn} from '@commonComp';
 
				 import AssessResult from '@containers/AssessResult';
			
 
				 import ScaleTable from '@containers/ScaleTable';
			
 
				 import Notify from '@commonComp/Notify';
			
 
				+import {deepClone} from '@utils/tools';
			
 
				 import $ from 'jquery';
			
 
				 
			
 
				 /***
			
@@ -64,6 +65,7 @@ class ChronicInfo extends React.Component{
 
				     this.handleForRadio = this.handleForRadio.bind(this);
			
 
				     this.showRecommendFn = this.showRecommendFn.bind(this);
			
 
				     this.handleSaveCalcu = this.handleSaveCalcu.bind(this);     //保存评估修改的计算和可能结果
			
 
				+    this.getAddBtnState = this.getAddBtnState.bind(this);
			
 
				   }
			
 
				 
			
 
				   onPrint() {
			
@@ -101,9 +103,6 @@ class ChronicInfo extends React.Component{
 
				       type:22,
			
 
				     }
			
 
				     getInfomation&&getInfomation(param);
			
 
				-    /*this.setState({
			
 
				-      infoId:id
			
 
				-    })*/
			
 
				   }
			
 
				   closeInfo(){//关闭静态知识
			
 
				     this.setState({
			
@@ -117,9 +116,18 @@ class ChronicInfo extends React.Component{
 
				     })
			
 
				   }
			
 
				   closeOption(){
			
 
				-    this.setState({
			
 
				-      optionId:null
			
 
				-    })
			
 
				+    // 关闭-有可能结果则保持与结果一致，没有就保持最新选择的内容
			
 
				+    let {possible,radioVal} = this.state;
			
 
				+    if(JSON.stringify(possible)=='{}'){
			
 
				+      this.setState({
			
 
				+        optionId:null
			
 
				+      })
			
 
				+    }else{
			
 
				+      this.setState({
			
 
				+        radioVal:Object.assign({},radioVal,possible),
			
 
				+        optionId:null,
			
 
				+      });
			
 
				+    } 
			
 
				   }
			
 
				   showTable(it,parentId,parentIndex){
			
 
				     const {formulaResult,scaleInfo} = this.props;
			
@@ -198,27 +206,31 @@ class ChronicInfo extends React.Component{
 
				     });
			
 
				   }
			
 
				   handleInputformula(v,i, j,idd,  e) {
			
 
				-    const { data, setChronicPush } = this.props;
			
 
				+    const { data, setChronicPush,calcuValues } = this.props;
			
 
				+    let data1 = JSON.parse(JSON.stringify(data));
			
 
				+    if(calcuValues&&calcuValues[data1[i].id]){
			
 
				+      data1[i].details[j].content=calcuValues&&calcuValues[data1[i].id];
			
 
				+    }
			
 
				     const text = e.target.value;
			
 
				-    if (data[i].details) {
			
 
				-      data[i].details[j].content.details[idd].value = text
			
 
				-    } 
			
 
				-    
			
 
				-    const data1 = JSON.parse(JSON.stringify(data));
			
 
				-    
			
 
				-    setChronicPush(data1)
			
 
				+    if (data1[i].details) {
			
 
				+      data1[i].details[j].content.details[idd].value = text
			
 
				+    }
			
 
				+
			
 
				+    setChronicPush(data1,data1[i].id,data1[i].details[j].content)
			
 
				   }
			
 
				   handleForRadio(ii,v,i, j,idd, ind){//计算公式
			
 
				-    const { data, setChronicPush } = this.props;
			
 
				-    if (data[i].details) {
			
 
				-      for(let z = 0; z <  data[i].details[j].content.details[idd].details.length; z++) {
			
 
				-        data[i].details[j].content.details[idd].details[z].state = 0
			
 
				-      }
			
 
				-      data[i].details[j].content.details[idd].details[ind].state = 1
			
 
				-    } 
			
 
				-    
			
 
				+    const { data, setChronicPush,calcuValues } = this.props;
			
 
				     const data1 = JSON.parse(JSON.stringify(data));
			
 
				-    setChronicPush(data1)
			
 
				+    if(calcuValues&&calcuValues[data1[i].id]){
			
 
				+      data1[i].details[j].content=calcuValues&&calcuValues[data1[i].id];
			
 
				+    }
			
 
				+    if (data1[i].details) {
			
 
				+      for(let z = 0; z <  data1[i].details[j].content.details[idd].details.length; z++) {
			
 
				+        data1[i].details[j].content.details[idd].details[z].state = 0
			
 
				+      }
			
 
				+      data1[i].details[j].content.details[idd].details[ind].state = 1
			
 
				+    }
			
 
				+    setChronicPush(data1,data1[i].id,data1[i].details[j].content);
			
 
				   }
			
 
				   confirmFormula(){//计算公式确定
			
 
				     this.setState({
			
@@ -248,8 +260,13 @@ class ChronicInfo extends React.Component{
 
				       radioVal:Object.assign({},obj.radioVal),//不设置radioVal只有最近一次选中的值
			
 
				     })
			
 
				   }
			
 
				-  calcuFormula(it,j, v, i) { //计算公式计算
			
 
				-    const { calcuFormula, data ,chronicPushItems} = this.props;
			
 
				+  calcuFormula(item,j, v, i) { //计算公式计算
			
 
				+    const { calcuFormula ,data,calcuValues} = this.props;
			
 
				+    let pushObj = deepClone(data);
			
 
				+    if(calcuValues&&calcuValues[pushObj[i].id]){
			
 
				+      pushObj[i].details[j].content=calcuValues&&calcuValues[pushObj[i].id];
			
 
				+    }
			
 
				+    let it = pushObj[i].details[j];
			
 
				     let allHasInfo = true;
			
 
				     for (let i = 0; i < it.content.details.length; i++) {
			
 
				       if(it.content.details[i].controlType == 2) {  //输入框类型的有没有填值
			
@@ -270,22 +287,52 @@ class ChronicInfo extends React.Component{
 
				 
			
 
				     }
			
 
				     if(allHasInfo) { //所有都有值，则计算
			
 
				-      // delete it.content.resultz
			
 
				       let param = {
			
 
				         type: 2,
			
 
				         data: it,
			
 
				         disId: v.id,
			
 
				         pIndex: j,
			
 
				         ppIndex: i
			
 
				-      }
			
 
				-      calcuFormula({param,chronicPushItems})
			
 
				+      };
			
 
				+      calcuFormula({param,chronicPushItems:pushObj})
			
 
				     } else {  //不是所有值都填过了
			
 
				       Notify.info('请填写计算公式内容')
			
 
				     }
			
 
				   }
			
 
				+  getAddBtnState(flag,v,i,j){
			
 
				+    const {indexs,wholeScaleItems,addScaleItems} = this.props;
			
 
				+    let btn = '';
			
 
				+    if(flag){     //有结果
			
 
				+      if(j!==undefined){
			
 
				+        btn = indexs[i]&&indexs[i].includes(j)?<span className={style["add-record"]}>
			
 
				+                   <img src={added} />
			
 
				+                   已加入
			
 
				+                 </span>:<span className={style["listResult"]} onClick={()=>this.handleAddAssessItem(v,i,j)}>
			
 
				+                   <img src={add} />
			
 
				+                   加入病历记录
			
 
				+                 </span>;
			
 
				+      }else{
			
 
				+        btn = wholeScaleItems&&wholeScaleItems[i]?<span className={style["add-record"]}>
			
 
				+                   <img src={added} />
			
 
				+                   已加入
			
 
				+                 </span>:<span className={style["listResult"]} onClick={()=>addScaleItems(v,i)}>
			
 
				+                   <img src={add} />
			
 
				+                   加入病历记录
			
 
				+                 </span>;
			
 
				+      }
			
 
				+
			
 
				+    }else{
			
 
				+      btn = <span className={style["disable-add"]}>
			
 
				+                   <img src={add} />
			
 
				+                   加入病历记录
			
 
				+                 </span>;
			
 
				+    }
			
 
				+
			
 
				+    return btn;
			
 
				+  }
			
 
				   getDetail(){
			
 
				-    const {data,indexs,formulaResult} = this.props;
			
 
				-    const {formulaId,optionId,possible,radioVal,isFormulaConfirm} = this.state;
			
 
				+    const {data,formulaResult,calcuResult,calcuValues} = this.props;
			
 
				+    const {formulaId,optionId,possible,radioVal} = this.state;
			
 
				     let list = data&&data.map((v,i)=>{
			
 
				                     return <div className={style["list"]}>
			
 
				                       {v.name?<p>
			
@@ -293,12 +340,6 @@ class ChronicInfo extends React.Component{
 
				                                 <img src={infoPic} className={style["infoPic"]} onClick={this.showInfo.bind(this,v.id)}/>
			
 
				                                 ：
			
 
				                               </p>:''}
			
 
				-                      {/*<MiniToast title='静态知识'
			
 
				-                                icon={allTableIcon}
			
 
				-                                show={infoId&&infoId==v.id?true:false}
			
 
				-                                close={this.closeInfo}>
			
 
				-                          {pureText}
			
 
				-                      </MiniToast>*/}
			
 
				                       {v.details&&v.details.map((it,j)=>{
			
 
				                         if(it.type==1){
			
 
				                           return <p>
			
@@ -306,46 +347,38 @@ class ChronicInfo extends React.Component{
 
				                                   <i onClick={this.showTable.bind(this,it.content,v.id,i)}>{'【'+it.content.name+'】'}</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} />
			
 
				-                                  已加入
			
 
				-                                </span>:<span className={style["listResult"]} onClick={()=>this.handleAddAssessItem(v,i,j)}>
			
 
				-                                  <img src={add} />
			
 
				-                                  加入病历记录
			
 
				-                                </span>
			
 
				+                                {
			
 
				+                                  this.getAddBtnState(formulaResult&&formulaResult[it.content.id],v,i,j)
			
 
				                                 }
			
 
				                               </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;
			
 
				+                          const details = calcuValues&&calcuValues[v.id]&&calcuValues[v.id].details||it.content.details;
			
 
				                           return <div className={style["marTop"]}>
			
 
				                             <span className={style["limit"]}>
			
 
				                               计算公式结果：
			
 
				                               <i className={style["blue"]} onClick={this.showFormula.bind(this,v.id)}>{result?result:'请选择'}</i>
			
 
				                               <img src={level1} />
			
 
				                             </span>
			
 
				-                            {indexs[i]&&indexs[i].includes(j)?<span className={style["addResult"]}>
			
 
				-                                  <img src={added} />
			
 
				-                                  已加入
			
 
				-                                </span>:<span className={style["listResult"]} onClick={()=>this.handleAddAssessItem(v,i,j)}>
			
 
				-                                  <img src={add} />
			
 
				-                                  加入病历记录
			
 
				-                                </span>
			
 
				+                            {
			
 
				+                              this.getAddBtnState(result,v,i,j)
			
 
				                             }
			
 
				-                            <MiniToast title={it.content.name}
			
 
				+                            {formulaId&&formulaId==v.id&&<MiniToast title={it.content.name}
			
 
				                                 icon={allTableIcon}
			
 
				                                 show={formulaId&&formulaId==v.id?true:false}
			
 
				                                 close={this.closeFormula}
			
 
				                                 confirm={this.confirmFormula.bind(this,v,i)}
			
 
				                                 footer="true">
			
 
				                                 <table>
			
 
				-                                {it.content.details.map((item,idd)=>{
			
 
				-                                    if(item.controlType==1){//单选
			
 
				+                                {details.map((item,idd)=>{
			
 
				+                                    if(item.controlType==0){//单选
			
 
				                                       return <tr>
			
 
				                                         <td>
			
 
				                                           <span>{'请选择'+item.name+'：'}</span>
			
 
				                                         </td>
			
 
				                                         <td>
			
 
				-                                          {item.details.map((ii,ind)=>{
			
 
				+                                          {Array.isArray(item.details)&&item.details.map((ii,ind)=>{
			
 
				                                             return <div className={style["chooseItem"]}>
			
 
				                                                     <Radio label={ii.detailName}
			
 
				                                                              isSelect={ii.state == 1}
			
@@ -355,8 +388,6 @@ class ChronicInfo extends React.Component{
 
				                                           })}
			
 
				                                         </td>  
			
 
				                                       </tr>
			
 
				-                                    }else if(item.controlType==1){//多选
			
 
				-
			
 
				                                     }else if(item.controlType==2){//输入框
			
 
				                                       return <tr>
			
 
				                                         <td>
			
@@ -369,31 +400,13 @@ class ChronicInfo extends React.Component{
 
				                                           <span>{item.uint}</span>
			
 
				                                         </td>
			
 
				                                         
			
 
				-                                      </tr>
			
 
				-                                    }else if(item.controlType==3){//下拉
			
 
				-                                      return <tr>
			
 
				-                                        <td>
			
 
				-                                          <span>{'请选择'+item.name+'：'}</span>
			
 
				-                                        </td>
			
 
				-                                        <td>
			
 
				-                                          {item.details.map((ii,ind)=>{
			
 
				-                                            return <div className={style["chooseItem"]}>
			
 
				-                                                    <Radio label={ii.detailName}
			
 
				-                                                            // isSelect={radioVal[i]==ii.detailName}
			
 
				-                                                            isSelect={ii.state == 1}
			
 
				-                                                            handleClick={this.handleForRadio.bind(this,ii,v,i)}>
			
 
				-                                                    </Radio>
			
 
				-                                                  </div>
			
 
				-                                          })}
			
 
				-                                        </td>
			
 
				-                                        
			
 
				                                       </tr>
			
 
				                                     }
			
 
				                                 })}
			
 
				                                 </table>
			
 
				                                 <div className={style["forMulBtn"]} onClick={this.calcuFormula.bind(this,it,j, v, i)}>计算</div>
			
 
				                                 <table>
			
 
				-                                  {it.content.result && Array.isArray(it.content.result) &&it.content.result.map((itemResult, resultIndex) => {
			
 
				+                                  {cres && Array.isArray(cres) &&cres.map((itemResult, resultIndex) => {
			
 
				                                     return <tr>
			
 
				                                         <td>
			
 
				                                             <span>{itemResult.name+'：'}</span>
			
@@ -405,7 +418,7 @@ class ChronicInfo extends React.Component{
 
				                                   })}
			
 
				                                 </table>
			
 
				                                 
			
 
				-                            </MiniToast>
			
 
				+                            </MiniToast>}
			
 
				                           </div>
			
 
				                         }else if(it.type==3){
			
 
				                           return <div className={style["marTop"]}>
			
@@ -414,13 +427,8 @@ class ChronicInfo extends React.Component{
 
				                               <i onClick={this.showOption.bind(this,v.id)} className={style["blue"]}>{possible[v.id]?possible[v.id]:'请选择'}</i>
			
 
				                               <img src={level1} />
			
 
				                             </span>
			
 
				-                            {indexs[i]&&indexs[i].includes(j)?<span className={style["addResult"]}>
			
 
				-                                  <img src={added} />
			
 
				-                                  已加入
			
 
				-                                </span>:<span className={style["listResult"]} onClick={()=>this.handleAddAssessItem(v,i,j)}>
			
 
				-                                  <img src={add} />
			
 
				-                                  加入病历记录
			
 
				-                                </span>
			
 
				+                            {
			
 
				+                              this.getAddBtnState(possible[v.id],v,i,j)
			
 
				                             }
			
 
				                             <MiniToast title='结果选择'
			
 
				                                 icon={checkIcon}
			
@@ -461,7 +469,7 @@ class ChronicInfo extends React.Component{
 
				       <span className={style['print']} onClick={this.onPrint}><img src={printIcon} alt=""/>打印</span>
			
 
				       <span className={style['okBtn']} onClick={()=>this.closeTable()}>确定</span>
			
 
				     </div>;
			
 
				-    const {chronicMagItem,tableList,saveAssessInfos,chronicDesease,formulaResult,showHide,calcuFormula} = this.props;
			
 
				+    const {chronicMagItem,tableList,saveAssessInfos,chronicDesease,formulaResult,showHide} = this.props;
			
 
				     const {showAssess,isAssessConfirm,tableName,tableId,parentId,parentIndex,isRecommendConfirm,showRecommend,radioVal,possible} = this.state;
			
 
				     return <div className={style["tips"]} style={{marginBottom:'15px'}}>
			
 
				               <div className={`${style["tips-title"]} ${style["chronic"]}`}>
			
@@ -494,15 +502,17 @@ class ChronicInfo extends React.Component{
 
				               <div className={style["content"]}> 
			
 
				                   {this.getDetail()}
			
 
				               </div>
			
 
				-              <ConfirmModal visible={showHide&&showHide.showList} noFooter='true' title='全部量表' close={this.close} titleBg="#DFEAFE" icon={allTableIcon} height={400} width={400}>
			
 
				+              <ConfirmModal visible={showHide&&showHide.showList} noFooter='true' title='全部量表' close={this.close} titleBg="#DFEAFE" icon={allTableIcon} height={450} width={450}>
			
 
				                       <ul className={style['toast-cont']}>
			
 
				                         {tableList&&tableList.map((v,i)=>{
			
 
				                           return <li>
			
 
				-                          <span>
			
 
				-                            <i onClick={this.handleListClick.bind(this,v)}>{'【'+v.name+'】'}</i>
			
 
				-                            {/*{formulaResult&&formulaResult[v.id]?<i>{'结果：'+formulaResult[v.id].text}</i>:''}*/}
			
 
				-                            {formulaResult&&formulaResult[v.id]?<i className={style['res']}>{'结果：'}{formulaResult[v.id].calcalculate&&formulaResult[v.id].calcalculate.result.value+' '+ (formulaResult[v.id].calcalculate.result.text?formulaResult[v.id].calcalculate.result.text:'')}</i>:''}
			
 
				-                          </span>
			
 
				+                            <span className={style["scaleName"]}>
			
 
				+                              <i onClick={this.handleListClick.bind(this,v)}>{'【'+v.name+'】'}</i>
			
 
				+                              {formulaResult&&formulaResult[v.id]?<i className={style['res']}>{'结果：'}{formulaResult[v.id].calcalculate&&formulaResult[v.id].calcalculate.result.value+' '+ (formulaResult[v.id].calcalculate.result.text?formulaResult[v.id].calcalculate.result.text:'')}</i>:''}
			
 
				+                            </span>
			
 
				+                            {
			
 
				+                              this.getAddBtnState(formulaResult&&formulaResult[v.id],v,i)
			
 
				+                            }
			
 
				                           </li>
			
 
				                         })}
			
 
				                       </ul>
			
@@ -525,7 +535,7 @@ class ChronicInfo extends React.Component{
 
				                               handleSaveCalcu={this.handleSaveCalcu}
			
 
				                               closeAssess={this.showAssessFn}
			
 
				                               showScaleFn={this.showTable.bind(this)}
			
 
				-                              calcuFormula={calcuFormula}
			
 
				+                              showListScale={this.handleListClick.bind(this)}
			
 
				                               radioVal={radioVal}
			
 
				                               possible={possible}
			
 
				                               isAssessConfirm={isAssessConfirm}></AssessResult>
			
@@ -541,7 +551,6 @@ class ChronicInfo extends React.Component{
 
				                               closeAssess={this.showRecommendFn}
			
 
				                               isRecommend={true}
			
 
				                               showScaleFn={this.showTable.bind(this)}
			
 
				-                              calcuFormula={calcuFormula}
			
 
				                               radioVal={radioVal}
			
 
				                               possible={possible}
			
 
				                               isAssessConfirm={isRecommendConfirm}></AssessResult>
			
--- a/src/components/ChronicInfo/index.less
+++ b/src/components/ChronicInfo/index.less
@@ -70,20 +70,8 @@
 
				           display: inline-block;
			
 
				           width: 73%;
			
 
				         }
			
 
				-        .listResult,.addResult{
			
 
				-          .btnCom;
			
 
				-          float: right;
			
 
				-          display: inline-block;
			
 
				-          width: 99px;
			
 
				-          height: 26px;
			
 
				-          line-height: 26px;
			
 
				-          border: 1px solid #EAEDF1;
			
 
				-          font-size: 12px;
			
 
				-          img{
			
 
				-            vertical-align: middle;
			
 
				-            width: 12px;
			
 
				-            margin:-3px 3px 0 0;
			
 
				-          }
			
 
				+         .listResult{
			
 
				+          .add-record;
			
 
				         }
			
 
				         .addResult{
			
 
				           color: #3B9ED0;
			
--- a/src/components/DiagnosticList/index.jsx
+++ b/src/components/DiagnosticList/index.jsx
@@ -13,6 +13,7 @@ import iconRadioDefault from '@common/images/icon-radio-default.png'
 
				 import iconRadioActive from '@common/images/icon-radio-active.png'
			
 
				 import tableIcon from '@common/images/table.png';
			
 
				 import { delFollowUp } from '../../store/actions/treat';
			
 
				+import { CONFIRM_TYPE } from "@store/types/typeConfig";
			
 
				 
			
 
				 class DiagnosticList extends Component {
			
 
				     constructor(props) {
			
@@ -21,7 +22,8 @@ class DiagnosticList extends Component {
 
				             visible: false,
			
 
				             delItem: {},
			
 
				             treatTitle: '',
			
 
				-            activeHistory: -1
			
 
				+            activeHistory: -1,
			
 
				+            sign:-1
			
 
				         }
			
 
				         this.deleteItem = this.deleteItem.bind(this);
			
 
				         this.cancel = this.cancel.bind(this);
			
@@ -81,7 +83,7 @@ class DiagnosticList extends Component {
 
				         // item.treatIndex = index
			
 
				         const  { showTreat, getTreatResult } = this.props;
			
 
				         getTreatResult && getTreatResult(item);
			
 
				-        showTreat && showTreat();
			
 
				+        // showTreat && showTreat();//添加loading，移到async-actions中
			
 
				         this.setState({
			
 
				             treatTitle: item.name
			
 
				         })
			
@@ -103,7 +105,7 @@ class DiagnosticList extends Component {
 
				               showHistoryCaseModal && showHistoryCaseModal();
			
 
				             }else{
			
 
				               if(typeConfig==0){
			
 
				-                Notify.info("暂无历史病例，已默认展示慢病相关内容");
			
 
				+                Notify.info("暂无历史病历，已默认展示慢病相关内容");
			
 
				                 const timer = setTimeout(function(){
			
 
				                   autoFillModules && autoFillModules();
			
 
				                   clearTimeout(timer);
			
@@ -122,6 +124,7 @@ class DiagnosticList extends Component {
 
				     }
			
 
				     referCase() {
			
 
				         const { hideHistoryCaseModal, items ,autoFillModules,typeConfig} = this.props
			
 
				+        const {sign} = this.state;
			
 
				         hideHistoryCaseModal && hideHistoryCaseModal()
			
 
				         if (this.state.activeHistory === -1 && typeConfig==0) {//没有选择历史病例直接点确定
			
 
				             Notify.info("未选择历史病历，已默认展示慢病相关内容");
			
@@ -134,18 +137,22 @@ class DiagnosticList extends Component {
 
				         let baseList = store.getState();
			
 
				         
			
 
				         let baseObj = items[this.state.activeHistory];
			
 
				-  
			
 
				-        // store.dispatch({type: CONFIRM_TYPE, confirmType: baseObj.sign});
			
 
				+        // 切换模式
			
 
				+        if(sign != typeConfig){
			
 
				+          store.dispatch({type: CONFIRM_TYPE, confirmType: baseObj.sign});
			
 
				+        }
			
 
				         pushAllDataList(baseObj.sign,'push',baseObj,'history')       //引用
			
 
				         this.props.getBilling();
			
 
				         this.setState({
			
 
				-            activeHistory: -1
			
 
				+            activeHistory: -1,
			
 
				+            sign:-1
			
 
				         })
			
 
				     }
			
 
				     closeHistoryCaseModal() {
			
 
				         const { hideHistoryCaseModal ,autoFillModules,typeConfig} = this.props
			
 
				         this.setState({
			
 
				-            activeHistory: -1
			
 
				+            activeHistory: -1,
			
 
				+            sign:-1
			
 
				         })
			
 
				         hideHistoryCaseModal && hideHistoryCaseModal()
			
 
				         if(typeConfig==0){//智能推送模式才自动填充
			
@@ -156,7 +163,8 @@ class DiagnosticList extends Component {
 
				         const { handleQuoteClick } = this.props
			
 
				         // handleQuoteClick && handleQuoteClick(item)
			
 
				         this.setState({
			
 
				-            activeHistory: index
			
 
				+            activeHistory: index,
			
 
				+            sign:item.sign
			
 
				         })
			
 
				     }
			
 
				     getHistoryCase() {
			
--- a/src/components/DiagnosticList/index.less
+++ b/src/components/DiagnosticList/index.less
@@ -56,6 +56,7 @@
 
				     position: relative;
			
 
				     color:#000;
			
 
				     font-weight: bold;
			
 
				+    cursor: pointer;
			
 
				 }
			
 
				 
			
 
				 .diag-up, .diag-down {
			
--- a/src/components/HistoryCaseContainer/HistoryList/index.jsx
+++ b/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):[]}
			
--- a/src/components/HistoryCaseContainer/index.jsx
+++ b/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}
			
--- a/src/components/InfoTitle/index.jsx
+++ b/src/components/InfoTitle/index.jsx
@@ -10,6 +10,7 @@ import { initItemList,setInitHistory } from '@store/async-actions/historyTemplat
 
				 import HistoryCases from '@containers/HistoryCases';
			
 
				 import $ from 'jquery';
			
 
				 import Notify from '@commonComp/Notify';
			
 
				+import {MODI_LOADING} from '@store/types/homePage.js';
			
 
				 class InfoTitle extends Component {
			
 
				     constructor(props){
			
 
				         super(props);
			
@@ -19,15 +20,19 @@ class InfoTitle extends Component {
 
				         this.showHistoryBox = this.showHistoryBox.bind(this)
			
 
				     }
			
 
				     showHistoryBox(){
			
 
				+        const {showLoading,hideLoading}=this.props;
			
 
				+        showLoading();
			
 
				         // store.dispatch(initItemList());
			
 
				         // store.dispatch(showHistory(true))
			
 
				         initItemList().then((res)=>{
			
 
				             const result = res.data;
			
 
				             if(result.code==0 && result.data){
			
 
				+                hideLoading();
			
 
				                 store.dispatch(setInitHistory(result.data));
			
 
				-                store.dispatch(showHistory(true))
			
 
				+                store.dispatch(showHistory(true));
			
 
				             }else{
			
 
				-                Notify.info("暂无历史病例");
			
 
				+                hideLoading();
			
 
				+                Notify.info("暂无历史病历");
			
 
				             }
			
 
				         })
			
 
				     }
			
@@ -66,9 +71,20 @@ function mapStateToProps(state) {
 
				   }
			
 
				 }
			
 
				 
			
 
				+function mapDispatchToProps(dispatch){
			
 
				+    return{
			
 
				+        showLoading(){
			
 
				+            dispatch({type:MODI_LOADING,flag:true});
			
 
				+        },
			
 
				+        hideLoading(){
			
 
				+            dispatch({type:MODI_LOADING,flag:false});
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+
			
 
				 const InfoTitleCont = connect(
			
 
				   mapStateToProps,
			
 
				-  null
			
 
				+  mapDispatchToProps
			
 
				 )(InfoTitle);
			
 
				 
			
 
				 
			
--- a/src/components/NumberDrop/index.jsx
+++ b/src/components/NumberDrop/index.jsx
@@ -39,7 +39,7 @@ class NumberDrop extends Component{
 
				     this.handleNumFocus = this.handleNumFocus.bind(this);
			
 
				     this.handleBlur = this.handleBlur.bind(this);
			
 
				     this.changeToEdit = this.changeToEdit.bind(this);
			
 
				-    //this.handleKeyDowm = this.handleKeyDowm.bind(this);
			
 
				+    // this.handleKeyDowm = this.handleKeyDowm.bind(this);
			
 
				     this.beyondArea = this.beyondArea.bind(this);
			
 
				   }
			
 
				   select(text){        //选中键盘上数字事件
			
@@ -191,17 +191,17 @@ class NumberDrop extends Component{
 
				     const {handleHide} = this.props;
			
 
				     handleHide&&handleHide();
			
 
				   }
			
 
				-  /*handleKeyDowm(e){
			
 
				-    handleEnter();
			
 
				+  // handleKeyDowm(e){
			
 
				+    // handleEnter();
			
 
				     //只能输入数字
			
 
				-    const key = e.key;
			
 
				+    /*const key = e.key;
			
 
				     const ctrlOn = e.ctrlKey;
			
 
				     const isCopyPaste = ctrlOn&&(key=='v'||key=='c');
			
 
				     if((!/[0-9|.|～|\/]/.test(key)&&key.length==1&&!isCopyPaste)){
			
 
				       e.preventDefault();
			
 
				       return false;
			
 
				-    }
			
 
				-  }*/
			
 
				+    }*/
			
 
				+  // }
			
 
				   getClasses(){         //整个标签是否有值的状态
			
 
				     const {hideTag,placeholder,value,isImports} = this.props;
			
 
				     const $span = this.$span.current;
			
--- a/src/components/PreviewBody/index.jsx
+++ b/src/components/PreviewBody/index.jsx
@@ -75,7 +75,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);
			
@@ -118,7 +118,7 @@ class PreviewBody extends Component {
 
				           </tr>
			
 
				         </table>
			
 
				         <p className={style.docName}>医生签名：<span>{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) }} className={style.printBtn} style={{
			
 
				           display: show ? 'inline-block' : 'none',
			
 
				         }}>打印</div>
			
--- a/src/components/PushItems/DetailsModal/index.jsx
+++ b/src/components/PushItems/DetailsModal/index.jsx
@@ -40,7 +40,7 @@ class DetailsModal extends Component {
 
				         const scrollTop = $('#detailsContent').scrollTop()
			
 
				         let divHeight = 0;
			
 
				         for (let i = 0; i < tipsDetails.introduceDetailList.length; i++) {
			
 
				-            divHeight = divHeight + parseInt($('#' + tipsDetails.introduceDetailList[i].title).css('height'))
			
 
				+            divHeight = divHeight + parseInt($('#' + tipsDetails.introduceDetailList[i].title).css('height')) -5
			
 
				             if(divHeight > scrollTop) {
			
 
				                 this.setState({
			
 
				                     currentIndex: i
			
@@ -53,44 +53,48 @@ class DetailsModal extends Component {
 
				     render() {
			
 
				         const {showTipsDetails, tipsDetails} = this.props;
			
 
				         const { currentIndex } = this.state
			
 
				-        const domNode = document.getElementById('root');
			
 
				-        return showTipsDetails && ReactDOM.createPortal(
			
 
				-          <div className={styles['details-wrapper']}>
			
 
				-           <div className={styles['details-content-wrapper']} id="detailsContentWrap">
			
 
				-                <h1 id="detailsContentTitle" className={`${styles['details-content-name']} drag-title`} >{tipsDetails && tipsDetails.tagName} <img className={styles['details-close']} onClick={this.hideTips} src={close} /></h1>
			
 
				-                <div className={styles['details-content']} id= 'detailsContent' onScroll={this.handleScrollModal.bind(this, tipsDetails)}>
			
 
				-                    {tipsDetails && tipsDetails.introduceDetailList && tipsDetails.introduceDetailList.map((item, index) => {
			
 
				-                        return (<div id={item.title}>
			
 
				-                            <div className={styles['details-content-title-box']} >
			
 
				-                                <span className={styles['details-content-title-name']}>{item.title}</span>
			
 
				-                                <div className={styles['details-content-title-line']}></div>
			
 
				-                            </div>
			
 
				-                            <div dangerouslySetInnerHTML ={{__html: item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)}}></div>
			
 
				-                        </div>)
			
 
				-                    })}
			
 
				-                    
			
 
				-                </div>
			
 
				-                <div className={styles['content-menu-box']}>
			
 
				-                    <div className={styles['content-menu']}>
			
 
				-                        {tipsDetails && tipsDetails.introduceDetailList && tipsDetails.introduceDetailList.map((item, index) => {
			
 
				-                                return (<div>
			
 
				-                                    <div className={styles['details-menu-title-box']}>
			
 
				-                                        {index === 0 ? '' : <div className={styles['details-content-menu-line']}></div>}
			
 
				-                                        <span onClick={this.handleClickMenu.bind(this, index, item, tipsDetails)} className={styles['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
			
 
				-                                            <span className={styles['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
			
 
				-                                        </span>
			
 
				+      return <NewPortal visible = {showTipsDetails}>
			
 
				+
			
 
				+                <div className={styles['details-wrapper']}>
			
 
				+                    <div className={styles['details-content-wrapper']} id="detailsContentWrap">
			
 
				+                        <h1 id="detailsContentTitle" className={`${styles['details-content-name']} drag-title`} >{tipsDetails && tipsDetails.tagName} <img className={styles['details-close']} onClick={this.hideTips} src={close} /></h1>
			
 
				+                        <div className={styles['details-content']} id= 'detailsContent' onScroll={this.handleScrollModal.bind(this, tipsDetails)}>
			
 
				+                            {tipsDetails && tipsDetails.introduceDetailList && tipsDetails.introduceDetailList.map((item, index) => {
			
 
				+                                return (<div id={item.title}>
			
 
				+                                    <div className={styles['details-content-title-box']} >
			
 
				+                                        <span className={styles['details-content-title-name']}>{item.title}</span>
			
 
				+                                        <div className={styles['details-content-title-line']}></div>
			
 
				                                     </div>
			
 
				+                                    <div dangerouslySetInnerHTML ={{__html: item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)}}></div>
			
 
				                                 </div>)
			
 
				                             })}
			
 
				+                            
			
 
				+                        </div>
			
 
				+                        <div className={styles['content-menu-box']}>
			
 
				+                            <div className={styles['content-menu']}>
			
 
				+                                {tipsDetails && tipsDetails.introduceDetailList && tipsDetails.introduceDetailList.map((item, index) => {
			
 
				+                                        return (<div>
			
 
				+                                            <div className={styles['details-menu-title-box']}>
			
 
				+                                                {index === 0 ? '' : <div className={styles['details-content-menu-line']}></div>}
			
 
				+                                                <span onClick={this.handleClickMenu.bind(this, index, item, tipsDetails)} className={styles['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
			
 
				+                                                    <span className={styles['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
			
 
				+                                                </span>
			
 
				+                                            </div>
			
 
				+                                        </div>)
			
 
				+                                    })}
			
 
				+                            </div>
			
 
				+                        </div>
			
 
				+                            
			
 
				+                    </div>
			
 
				+                    <div className={styles['details-mask']} onClick={this.hideTips}>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-               
			
 
				-           </div>
			
 
				-           <div className={styles['details-mask']} onClick={this.hideTips}>
			
 
				-           </div>
			
 
				-        </div>,
			
 
				-          domNode
			
 
				-      )
			
 
				+
			
 
				+
			
 
				+      </NewPortal>
			
 
				+      
			
 
				+      
			
 
				+      
			
 
				     }
			
 
				 }
			
 
				 
			
--- a/src/components/PushItems/DetailsModal/index.less
+++ b/src/components/PushItems/DetailsModal/index.less
@@ -54,6 +54,7 @@
 
				 .details-close {
			
 
				     position: absolute;
			
 
				     right: 0;
			
 
				+    cursor: pointer;
			
 
				 }
			
 
				 .details-content {
			
 
				     position: relative;
			
@@ -64,12 +65,19 @@
 
				 .content-menu-box {
			
 
				     position: absolute;
			
 
				     top: 50px;
			
 
				-    right: -20px;
			
 
				-    width: 200px;
			
 
				+    right: 20px;
			
 
				+    width: 160px;
			
 
				     height: 80%;
			
 
				+    overflow: hidden;
			
 
				+    
			
 
				+}
			
 
				+.content-menu-wrapper {
			
 
				+    width: 200px;
			
 
				+    height: 100%;
			
 
				     overflow-y: auto;
			
 
				 }
			
 
				 .content-menu {
			
 
				+    
			
 
				     background: #eee;
			
 
				     border: 1px solid #eee;
			
 
				     width: 160px;
			
--- a/src/components/PushItems/index.jsx
+++ b/src/components/PushItems/index.jsx
@@ -410,7 +410,7 @@ class PushItems extends Component {
 
				               </div>
			
 
				             </div>
			
 
				             {/*{chronicPushItems&&chronicPushItems.length>0?<ChronicInfo data={chronicPushItems}></ChronicInfo>:''}*/}
			
 
				-            {<ChronicInfo data={chronicPushItems}></ChronicInfo>}
			
 
				+            {<ChronicInfo></ChronicInfo>}
			
 
				             <div className={style["tips"]}>
			
 
				               <h1>
			
 
				                 <img src={tipsImg} />
			
--- a/src/components/PushItems/index.less
+++ b/src/components/PushItems/index.less
@@ -16,8 +16,9 @@
 
				     .title{
			
 
				       color:#fff;
			
 
				       font-size: 14px;
			
 
				+      font-weight: bold;
			
 
				       float: left;
			
 
				-      margin: 10px 10px 0 0;
			
 
				+      margin: 10px 0px 0 0;
			
 
				       img {
			
 
				         float: left;
			
 
				         margin: 1px 2px 0 20px;
			
@@ -27,7 +28,7 @@
 
				     }
			
 
				     .vigilantContent {
			
 
				       float:left;
			
 
				-      width: 340px;
			
 
				+      padding: 0 0 0 15px;
			
 
				       span {
			
 
				         font-size: 14px;
			
 
				         color: #fff;
			
@@ -150,6 +151,7 @@
 
				               line-height: 14px;
			
 
				               display: inline-block;
			
 
				               margin: 6px;
			
 
				+              cursor: pointer;
			
 
				               input[type='checkbox']{
			
 
				                 float: left;
			
 
				                 width: 14px;
			
@@ -165,7 +167,10 @@
 
				               input[type=checkbox]:checked{
			
 
				                 background: url("../../common/images/checked.png")no-repeat center;
			
 
				                 background-size: 12px 12px;
			
 
				-             }
			
 
				+              }
			
 
				+              label {
			
 
				+                cursor: pointer;
			
 
				+              }
			
 
				             }
			
 
				           }
			
 
				         }
			
--- a/src/components/ScaleTableHis/index.jsx
+++ b/src/components/ScaleTableHis/index.jsx
@@ -27,8 +27,6 @@ class ScaleTableHis extends React.Component{
 
				   }
			
 
				 
			
 
				   getContent(datas){
			
 
				-    const {title,formulaResult,data} = this.props;
			
 
				-    // const datas = valueData&&valueData.group?valueData:mocks.newData;
			
 
				     let content =  datas&&datas.group&&datas.group.map((v,i)=>{
			
 
				                 return <div className={style['group']}>
			
 
				                   <p className={style['groupName']}>{v.groupName}</p>
			
@@ -36,7 +34,7 @@ class ScaleTableHis extends React.Component{
 
				                     return <div>
			
 
				                       {it.row.map((item,index)=>{
			
 
				                         if(item.controlType==0){
			
 
				-                          return <div className={style['block']} style={{border:it.required==1&&!item.isSelect&&start?'1px solid #f00':'none'}}>
			
 
				+                          return <div className={style['block']}>
			
 
				                               <p className={style['miniName']}>{item.name}</p>
			
 
				                               {item.details&&item.details.map((vv,ii)=>{
			
 
				                                 return <div className={style['item']}>
			
@@ -83,7 +81,7 @@ class ScaleTableHis extends React.Component{
 
				   }
			
 
				 
			
 
				   render(){
			
 
				-    const {title,data,result} = this.props;console.log(this.props)
			
 
				+    const {title,data,result} = this.props;
			
 
				     const scale = data && this.filterScale(data);
			
 
				     const datas = scale && scale.content && JSON.parse(scale.content);
			
 
				     const scaleResult = datas; //量表计算结果
			
@@ -100,7 +98,7 @@ class ScaleTableHis extends React.Component{
 
				                   {this.getContent(datas)}
			
 
				                   {datas&&datas.Calc==1?<div className={style['total']}>
			
 
				                     <span>总分：</span>
			
 
				-                    <span>{result&&result.calcalculate&&result.calcalculate.result&&result.calcalculate.result.value +' '+ result.calcalculate.result.text||''}</span>
			
 
				+                    <span>{result&&result.calcalculate&&result.calcalculate.result&&result.calcalculate.result.value +' '+ (result.calcalculate.result.text||'')}</span>
			
 
				                   </div>:''}
			
 
				                 </div>
			
 
				               }
			
--- a/src/components/Treat/AdverseReactions/index.jsx
+++ b/src/components/Treat/AdverseReactions/index.jsx
@@ -19,9 +19,6 @@ class AdverseReactions extends Component {
 
				         this.props.changeReact(it, index);
			
 
				     }
			
 
				     handleMouseEnterDrug(index, item) {
			
 
				-        const drugNameWidth = parseInt($('#'+item.id)[0].offsetWidth)
			
 
				-        const imgLeft = drugNameWidth/2-8
			
 
				-        $('#'+item.id).find('img').css('left', imgLeft)
			
 
				         this.setState({
			
 
				             currentIndex: index,
			
 
				         })
			
@@ -61,26 +58,27 @@ class AdverseReactions extends Component {
 
				                     <span className={style['last-treat-name-box']}
			
 
				                         
			
 
				                     >   
			
 
				-                        <span   id={item.id} 
			
 
				+                        <span   
			
 
				                                 className={style['last-treat-big-name-box']} 
			
 
				                                 onMouseEnter={this.handleMouseEnterDrug.bind(this, index, item)}
			
 
				                                 onMouseLeave = {this.handleMouseLeaveDrug}
			
 
				                         >
			
 
				-                            {item.tagName}:
			
 
				-                            {<img className={style['info-img']}  
			
 
				-                                style ={currentIndex === index  ? {display: "inline-block"} : {display: "none"}}
			
 
				-                                src={currentIndex === index ?(hasEnterImg ? info3 : info2 ): info2} 
			
 
				-                                onMouseEnter={this.handleMouseEnterImg.bind(this)}
			
 
				-                                onMouseLeave = {this.handleMouseLeaveImg}
			
 
				-                                onClick={() =>{this.setDrugInfo(item);showDrugInfo();}}/>}
			
 
				-                        
			
 
				+                            <span className={style['last-treat-big-name']} >{item.tagName}:
			
 
				+                                {<img className={style['info-img']}  
			
 
				+                                    style ={currentIndex === index  ? {display: "inline-block"} : {display: "none"}}
			
 
				+                                    src={currentIndex === index ?(hasEnterImg ? info3 : info2 ): info2} 
			
 
				+                                    onMouseEnter={this.handleMouseEnterImg.bind(this)}
			
 
				+                                    onMouseLeave = {this.handleMouseLeaveImg}
			
 
				+                                    onClick={() =>{this.setDrugInfo(item);showDrugInfo();}}/>}
			
 
				+                            </span>
			
 
				                         </span>
			
 
				                         
			
 
				                     </span>
			
 
				                         {item.details.map((it, idx) => {
			
 
				-                            return <span key={item.id + it.name}>
			
 
				-                                <input type="checkbox" checked={it.value == 1} id={item.id + it.name} onChange={this.changeReact.bind(this, it, index)}/>
			
 
				+                            return <span className={style['adverse-reactions-name']} key={item.id + it.name}>
			
 
				+                                <input type="checkbox" checked={it.select} id={item.id + it.name} onChange={this.changeReact.bind(this, it, index)}/>
			
 
				                                 <label for={item.id + it.name}> {it.name} </label>
			
 
				+                                {it.value==1 && <span className={style['adverse-reactions-recommend']}>(智能推荐)</span>}
			
 
				                             </span>
			
 
				                         })}
			
 
				                     </div>)
			
--- a/src/components/Treat/AdverseReactions/index.less
+++ b/src/components/Treat/AdverseReactions/index.less
@@ -35,11 +35,26 @@
 
				 .info-img {
			
 
				     position: absolute;
			
 
				     width: 15px;
			
 
				-    position: absolute;
			
 
				-    top: -8px;
			
 
				+    top: -15px;
			
 
				+    left: 50%;
			
 
				+    margin-left: -8px;
			
 
				 }
			
 
				 .last-treat-big-name-box {
			
 
				     display: inline-block;
			
 
				     
			
 
				 }
			
 
				+.last-treat-big-name {
			
 
				+    position: relative;
			
 
				+}
			
 
				+.adverse-reactions-recommend {
			
 
				+    cursor: pointer;
			
 
				+    color: #3B9ED0;
			
 
				+}
			
 
				+.adverse-reactions-name {
			
 
				+    margin-right: 10px;
			
 
				+    input, label {
			
 
				+        cursor: pointer;
			
 
				+    }
			
 
				+    
			
 
				+}
			
 
				 
			
--- a/src/components/Treat/DrugTreat/index.jsx
+++ b/src/components/Treat/DrugTreat/index.jsx
@@ -28,9 +28,6 @@ class DrugTreat extends Component {
 
				         selectDrug && selectDrug(index,ii);
			
 
				     }
			
 
				     handleMouseEnterDrug(ii, index, it) {
			
 
				-        const drugNameWidth = parseInt($('#'+it.medicitionName)[0].offsetWidth)
			
 
				-        const imgLeft = drugNameWidth/2-10
			
 
				-        $('#'+it.medicitionName).find('img').css('left', imgLeft)
			
 
				         this.setState({
			
 
				             currentIndex: index,
			
 
				             currentImg: ii
			
@@ -99,7 +96,6 @@ class DrugTreat extends Component {
 
				                                         {ii === 0 ? '' : ', '}
			
 
				                                         <span onMouseEnter={this.handleMouseEnterDrug.bind(this, ii , index, it)}
			
 
				                                               onMouseLeave = {this.handleMouseLeaveDrug}
			
 
				-                                              id={it.medicitionName}
			
 
				                                               className={style['drug-name-wrapper']} 
			
 
				                                         >
			
 
				                                             <span className={style['drug-name']}  
			
--- a/src/components/Treat/DrugTreat/index.less
+++ b/src/components/Treat/DrugTreat/index.less
@@ -35,6 +35,8 @@
 
				     width: 15px;
			
 
				     position: absolute;
			
 
				     top: -15px;
			
 
				+    left: 50%;
			
 
				+    margin-left: -7px;
			
 
				 }
			
 
				 .info-flag {
			
 
				     display: inline-block;
			
--- a/src/components/Treat/index.less
+++ b/src/components/Treat/index.less
@@ -12,6 +12,7 @@
 
				   z-index:9999;
			
 
				   top: 0;
			
 
				   right: 0;
			
 
				+  cursor: pointer;
			
 
				 }
			
 
				 .treat-mask {
			
 
				     position: fixed;
			
--- a/src/components/TreatDesc/DrugInfo/index.jsx
+++ b/src/components/TreatDesc/DrugInfo/index.jsx
@@ -37,7 +37,7 @@ class DrugInfo extends Component {
 
				         const scrollTop = $('#drugDesc').scrollTop()
			
 
				         let divHeight = 60; //标题高度为60px
			
 
				         for (let i = 0; i < drugDesc.length; i++) {
			
 
				-            divHeight = divHeight + parseInt($('#' + drugDesc[i].title.trim()).css('height'))
			
 
				+            divHeight = divHeight + parseInt($('#' + drugDesc[i].title.trim()).css('height')) -5
			
 
				             if(divHeight > scrollTop) {
			
 
				                 this.setState({
			
 
				                     currentIndex: i
			
@@ -55,9 +55,9 @@ class DrugInfo extends Component {
 
				         const { currentIndex } = this.state
			
 
				         return (<div className={style['drug-info-wrapper']} id="drugWrapper">
			
 
				                 <img src={close} onClick={hideDrugInfo} className={style['close-drug-desc']}/>
			
 
				-                <h3 onMouseDown={this.setDragBox} id="drugTitle" className={style['drug-title']}>{drugInfo.title}说明书  </h3>
			
 
				+                <h3 onMouseDown={this.setDragBox} id="drugTitle" className={style['drug-title']}>{drugInfo.tagType == 8 ? drugInfo.title+'说明书' : drugInfo.tagType == 10 ? drugInfo.title+ '说明': ''}</h3>
			
 
				                 { drugInfo && drugInfo.drugDesc.length > 0 && <div className={style['drug-desc-wrapper']} id='drugDesc' onScroll={this.handleScrollModal.bind(this,  drugInfo.drugDesc)}>
			
 
				-                    <div className={style['drug-title1']} >{drugInfo.title}说明书</div>
			
 
				+                    <div className={style['drug-title1']} >{drugInfo.tagType == 8 ? drugInfo.title+'说明书' : drugInfo.tagType == 10 ? drugInfo.title+ '说明': ''}</div>
			
 
				                     {drugInfo.drugDesc.map((item, index) =>{
			
 
				                         return <div className={style['drug-desc-item']} id={item.title.trim()}>
			
 
				                             <div className={style['drug-desc-title']} >{item.title.trim()}</div> 
			
@@ -83,7 +83,7 @@ class DrugInfo extends Component {
 
				                 </div> }
			
 
				                 { !drugInfo || (drugInfo && drugInfo.drugDesc.length === 0) && <div className={style['drug-desc-wrapper']}>
			
 
				                     <div>
			
 
				-                        该药品暂无说明
			
 
				+                        {drugInfo.tagType == 8 ? '该药品暂无说明' : drugInfo.tagType == 10 ?'该不良反应暂无说明': ''}
			
 
				                     </div>
			
 
				                 </div> }
			
 
				         </div>)
			
--- a/src/components/TreatDesc/DrugInfo/index.less
+++ b/src/components/TreatDesc/DrugInfo/index.less
@@ -39,6 +39,7 @@
 
				     top: 0;
			
 
				     z-index: 9999;
			
 
				     width: 40px;
			
 
				+    cursor: pointer;
			
 
				 }
			
 
				 .drug-desc-item {
			
 
				     zoom: 1;
			
--- a/src/components/TreatDesc/img/packUp.png
+++ b/src/components/TreatDesc/img/packUp.png
--- a/src/components/TreatDesc/index.jsx
+++ b/src/components/TreatDesc/index.jsx
@@ -6,7 +6,7 @@ import info from './img/info.png';
 
				 import info1 from './img/info1.png';
			
 
				 import info2 from './img/info2.png';
			
 
				 import info3 from './img/info3.png';
			
 
				-
			
 
				+import packUp from './img/packUp.png';
			
 
				 
			
 
				 class TreatDesc extends Component {
			
 
				     constructor(props){
			
@@ -26,11 +26,11 @@ class TreatDesc extends Component {
 
				 
			
 
				     handleMouseEnterDrug( index, item) {
			
 
				         // console.log('item', item)
			
 
				-        const drugNameWidth = parseInt($('#'+item.medicitionName)[0].offsetWidth)
			
 
				+        // const drugNameWidth = parseInt($('#'+item.medicitionName)[0].offsetWidth)
			
 
				         
			
 
				-        const imgLeft = drugNameWidth/2-10
			
 
				+        // const imgLeft = drugNameWidth/2-10
			
 
				         // console.log('imgLeft', imgLeft)
			
 
				-        $('#'+item.medicitionName).find('img').css('left', imgLeft)
			
 
				+        // $('#'+item.medicitionName).find('img').css('left', imgLeft)
			
 
				        
			
 
				         this.setState({
			
 
				             currentIndex: index,
			
@@ -78,7 +78,7 @@ class TreatDesc extends Component {
 
				                     
			
 
				                 </div> } */}
			
 
				                 { otherDrugIndex > -1 && <div  className={style['similar-drug']}>
			
 
				-                    <h3 className={style['drug-desc-title']}><span className={style['drug-desc-class-title']} title={'同类药物(' + treatment[otherDrugIndex].drugsName + ')'}>同类药物({treatment[otherDrugIndex].bigdrugsName})</span>  <img src={close} onClick={this.hideTreatDesc} className={style['close-drug-desc']} /></h3>
			
 
				+                    <h3 className={style['drug-desc-title']}><span className={style['drug-desc-class-title']} title={'同类药物(' + treatment[otherDrugIndex].bigdrugsName + ')'}>同类药物({treatment[otherDrugIndex].bigdrugsName})</span>  <img src={packUp} onClick={this.hideTreatDesc} className={style['close-drug-desc']} /></h3>
			
 
				                     {treatment[otherDrugIndex].medicitionsList.map((item, index) =>{
			
 
				                         return (<span >
			
 
				                         {index === 0 ? '' : ', '}     
			
--- a/src/components/TreatDesc/index.less
+++ b/src/components/TreatDesc/index.less
@@ -31,6 +31,7 @@
 
				 .close-drug-desc {
			
 
				     position: absolute;
			
 
				     right: 0px;
			
 
				+    cursor: pointer;
			
 
				 }
			
 
				 .similar-drug-box {
			
 
				     display: none;
			
@@ -60,10 +61,10 @@
 
				 }
			
 
				 .info-img {
			
 
				     width: 15px;
			
 
				-    margin: 0 3px -1px;
			
 
				-    cursor: pointer;
			
 
				     position: absolute;
			
 
				-    top: -10px;
			
 
				+    top: -15px;
			
 
				+    left: 50%;
			
 
				+    margin-left: -7px;
			
 
				 }
			
 
				 .info-flag {
			
 
				     display: inline-block;
			
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -37,6 +37,8 @@ export default {
 
				       age:"岁",
			
 
				     },
			
 
				     chartDismen:'year',   //评估图表默认维度：近1年year，近6个月sixMonth,近1个月month,近1周week
			
 
				+    chartSymbols:['emptyCircle' , 'rect', 'arrow', 'triangle', 'diamond','circle', 'pin', 'roundRect'],
			
 
				+    chartColors:['#E84C47','#B947E8', '#47B0E8', '#4774E8', '#6C4EF9','#63DEC2', '#DDD81D','#EF592B'],
			
 
				     showCheckNum:16,        //查体默认展开非自由文本标签的个数
			
 
				     radioOptionPer:'（）',     //单选项输入占位符
			
 
				     textReg:new RegExp("([\u4E00-\uFA29]|[\uE7C7-\uE7F3]|[a-zA-Z0-9])"), //包含中英文或数字
			
--- a/src/containers/AdviceContainer.js
+++ b/src/containers/AdviceContainer.js
@@ -10,7 +10,8 @@ function mapStateToProps(state) {
 
				         adviceInput: state.pushMessage.advice.adviceInput,
			
 
				         isFirstMainDiag:  state.treat.isFirstMainDiag,
			
 
				         followUp: state.pushMessage.advice.followUp,
			
 
				-        hasFollowUp: state.treat.hasFollowUp
			
 
				+        hasFollowUp: state.treat.hasFollowUp,
			
 
				+        typeConfig: state.typeConfig.typeConfig
			
 
				     })
			
 
				 }
			
 
				 
			
--- a/src/containers/AssessResult.js
+++ b/src/containers/AssessResult.js
@@ -4,9 +4,8 @@ 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} from '@types/assessResult';
			
 
				-import store from '@store';
			
 
				-import {SET_SCALE_INFO} from "../store/types/pushMessage";
			
 
				+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 {parseChartData,deepClone} from '@utils/tools';
			
 
				 
			
 
				 /***
			
 
				  * 管理评估逻辑：
			
@@ -23,6 +22,7 @@ function mapStateToProps(state) {
 
				   return {
			
 
				     data:assessResult.data,
			
 
				     indexData:assessResult.indexData,
			
 
				+    indexNames:assessResult.indexNames,
			
 
				     update:assessResult.update,     //评估数据更新
			
 
				     update1:assessResult.update1,       //加入记录更新
			
 
				     timeTypes:assessResult.indexTimeTypes,    //图表切换的维度
			
@@ -32,10 +32,11 @@ function mapStateToProps(state) {
 
				     chooseSelecteds:assessResult.chooseSelecteds,    //已选中的选项
			
 
				     wholeAssessText:assessResult.wholeAssessText,     //整体评估补充说明
			
 
				     scaleInfo: pushMessage.scaleInfo,//量表内容
			
 
				-    scaleUpdate:pushMessage.scaleUpdate,
			
 
				     chronicPushItems: pushMessage.chronicPushItems, //慢病右侧推送
			
 
				     formulaResult:pushMessage.formulaResult,       //量表计算结果
			
 
				-    calcuResult:pushMessage.calcuResult,      //评估弹窗可能结果计算结果
			
 
				+    calcuResult:assessResult.calcuResult,      //评估弹窗可能结果计算结果
			
 
				+    calcuValues:assessResult.calcuValues,      //计算公式填的值
			
 
				+    wholeScaleItems:assessResult.wholeScaleItems,     //全部量表中已加入病例的量表
			
 
				   }
			
 
				 }
			
 
				 
			
@@ -88,25 +89,16 @@ function mapDispatchToProps(dispatch) {
 
				         type:CLEAR_INDEX_DATA
			
 
				       })
			
 
				     },
			
 
				+    saveCalcuResult(data){
			
 
				+      dispatch({
			
 
				+        type: SET_CHRONIC_CALCU_RESULT,
			
 
				+        data:deepClone(data)
			
 
				+      })
			
 
				+    }
			
 
				   }
			
 
				 }
			
 
				 
			
 
				-function parseChartData(indexData){
			
 
				-  let arr=[],obj={},temp={};
			
 
				-  let nameArr=[],nameObj={};  //暂弃
			
 
				-  if(!indexData){
			
 
				-    return [];
			
 
				-  }
			
 
				-  indexData.itemIndexData.map((it)=>{
			
 
				-    temp=indexData.indexConfigData.find((i)=>{return it.itemName==i.indexUnique});
			
 
				-    arr=obj[temp.indexDesc]||[];
			
 
				-    nameArr=nameObj[temp.indexDesc]||[];
			
 
				-    obj[temp.indexDesc]=[...arr,it];
			
 
				-    nameObj[temp.indexDesc]=[...nameArr,it.itemName];
			
 
				-  });
			
 
				-  //nameObj,obj;
			
 
				-  return obj;
			
 
				-}
			
 
				+
			
 
				 const AssessResultContainer = connect(mapStateToProps, mapDispatchToProps)(AssessResult);
			
 
				 
			
 
				 export default AssessResultContainer;
			
--- a/src/containers/AssessResultHis.js
+++ b/src/containers/AssessResultHis.js
@@ -6,6 +6,7 @@ import {billing} from '@store/async-actions/pushMessage';
 
				 import {getAssessHis,getIndexData} from '@store/async-actions/fetchModules';
			
 
				 import {SET_ASSESS_DATA,SET_INDEX_DATA} from '@types/assessResult';
			
 
				 import {SET_ASSESS_HISTORY_DATA,SET_ASSESS_HISTORY_LOADING} from '@types/assessResultHis';
			
 
				+import {parseChartData} from '@utils/tools';
			
 
				 
			
 
				 /***
			
 
				  * 管理评估逻辑：
			
@@ -22,6 +23,7 @@ function mapStateToProps(state) {
 
				   return {
			
 
				     list:assessResultHis,    //已获取到的历史评估列表
			
 
				     indexData:assessResult.indexData,
			
 
				+    indexNames:assessResult.indexNames,
			
 
				     loading:assessResultHis.loading,
			
 
				     timeTypes:assessResult.indexTimeTypes,    //图表切换的维度
			
 
				   }
			
@@ -76,22 +78,6 @@ function mapDispatchToProps(dispatch) {
 
				   }
			
 
				 }
			
 
				 
			
 
				-function parseChartData(indexData){
			
 
				-  let arr=[],obj={},temp={};
			
 
				-  let nameArr=[],nameObj={};  //暂弃
			
 
				-  if(!indexData){
			
 
				-    return [];
			
 
				-  }
			
 
				-  indexData.itemIndexData.map((it)=>{
			
 
				-    temp=indexData.indexConfigData.find((i)=>{return it.itemName==i.indexUnique});
			
 
				-    arr=obj[temp.orderNo]||[];
			
 
				-    nameArr=nameObj[temp.orderNo]||[];
			
 
				-    obj[temp.orderNo]=[...arr,it];
			
 
				-    nameObj[temp.orderNo]=[...nameArr,it.itemName];
			
 
				-  });
			
 
				-  //nameObj,obj;
			
 
				-  return obj;
			
 
				-}
			
 
				 const AssessResultHisContainer = connect(mapStateToProps, mapDispatchToProps)(AssessResultHis);
			
 
				 
			
 
				 export default AssessResultHisContainer;
			
--- a/src/containers/AssistCheck.js
+++ b/src/containers/AssistCheck.js
@@ -8,7 +8,7 @@ import { getSearchList,getInstroduce } from '@store/async-actions/assistCheck';
 
				 import {ISREAD} from '@store/types/homePage.js';
			
 
				 import {billing} from '@store/async-actions/pushMessage';
			
 
				 
			
 
				-function mapStateToProps(state) {//console.log(state)
			
 
				+function mapStateToProps(state) {
			
 
				     return {
			
 
				         list:state.assistCheck.list,
			
 
				         assistLabel:state.assistCheck.assistLabel,
			
--- a/src/containers/CheckBody.js
+++ b/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){
			
--- a/src/containers/ChronicInfo.js
+++ b/src/containers/ChronicInfo.js
@@ -2,7 +2,7 @@ import {connect} from 'react-redux';
 
				 import ChronicInfo from '../components/ChronicInfo';
			
 
				 import {SHOW_TABLE_LIST,HIDE_TABLE_LIST, SET_CHRONIC_PUSHS} from '@store/types/pushMessage';
			
 
				 import {getTableList,getScaleInfo,getTips} from '../store/async-actions/pushMessage';
			
 
				-import {ADD_ASSESS_ITEMS,SET_SAVE_ASSESS_DATA,SET_CHRONIC_CALCU_RESULT} from "@types/assessResult";
			
 
				+import {ADD_ASSESS_ITEMS,SET_SAVE_ASSESS_DATA,SET_CHRONIC_CALCU_RESULT,ADD_WHOLE_SCALE_ITEMS,SET_CALCU_VALUES} from "@types/assessResult";
			
 
				 import {saveMessage} from "../store/async-actions/print";
			
 
				 import {saveClickNum} from '@store/async-actions/homePage';
			
 
				 import { getFormulaResult } from '@store/async-actions/fetchModules'
			
@@ -13,7 +13,7 @@ function mapStateToProps(state){
 
				   const {pushMessage,assessResult} = state;
			
 
				   return{
			
 
				     chronicMagItem: state.diagnosticList.chronicMagItem,//慢病疾病
			
 
				-    chronicPushItems: pushMessage.chronicPushItems, //慢病右侧推送
			
 
				+    data:pushMessage.chronicPushItems,     //慢病右侧推送
			
 
				     tableList: pushMessage.tableList,
			
 
				     showList: pushMessage.showList,
			
 
				     showHide: pushMessage.showHide,
			
@@ -23,6 +23,9 @@ function mapStateToProps(state){
 
				     formulaResult:pushMessage.formulaResult, //量表信息
			
 
				     indexs:assessResult.wholeIndexs,
			
 
				     wholeResults:assessResult.wholeResults,     //整体评估可能结果
			
 
				+    calcuResult:assessResult.calcuResult,      //计算公式结果
			
 
				+    calcuValues:assessResult.calcuValues,      //计算公式填的值
			
 
				+    wholeScaleItems:assessResult.wholeScaleItems,     //全部量表中已加入病例的量表
			
 
				   }
			
 
				 }
			
 
				 
			
@@ -52,6 +55,13 @@ function mapDispatchToProps(dispatch){
 
				         subIndex:i
			
 
				       })
			
 
				     },
			
 
				+    addScaleItems(obj,i){
			
 
				+      dispatch({
			
 
				+        type:ADD_WHOLE_SCALE_ITEMS,
			
 
				+        data:obj,
			
 
				+        index:i
			
 
				+      })
			
 
				+    },
			
 
				     //保存管理评估
			
 
				     saveAssessInfos(obj,flg,noSave){     //noSave未true则不调页面保存接口
			
 
				       dispatch(Object.assign({},obj,{type:SET_SAVE_ASSESS_DATA}));
			
@@ -69,31 +79,25 @@ function mapDispatchToProps(dispatch){
 
				       })
			
 
				     },
			
 
				     //设置量表推送内容
			
 
				-    setChronicPush(data) {
			
 
				+    setChronicPush(data,id,calcuItem) {
			
 
				       dispatch({
			
 
				         type: SET_CHRONIC_PUSHS,
			
 
				         data: data
			
 
				-      })
			
 
				+      });
			
 
				+      dispatch({
			
 
				+        type:SET_CALCU_VALUES,
			
 
				+        data:calcuItem,
			
 
				+        id
			
 
				+      });
			
 
				     },
			
 
				     // 计算公式计算
			
 
				     calcuFormula(item) {
			
 
				-      // dispatch(getFormulaResult(item))
			
 
				-      const {param,chronicPushItems} = item;
			
 
				+      const {param} = item;
			
 
				       getFormulaResult(param).then((res)=>{
			
 
				         if(+res.data.code==0){
			
 
				-          const data = chronicPushItems;
			
 
				           const result = res.data.data.result;
			
 
				-          data[param.ppIndex].details[param.pIndex].content.result =  result;
			
 
				-          /*if(item.isPop){
			
 
				-            dispatch({
			
 
				-              type:SET_CHRONIC_CALCU_RESULT,
			
 
				-              data:deepClone(result),
			
 
				-              id:item.param.disId
			
 
				-            });
			
 
				-          }*/
			
 
				           dispatch({
			
 
				-            type: SET_CHRONIC_PUSHS,
			
 
				-            data: deepClone(data),
			
 
				+            type: SET_CHRONIC_CALCU_RESULT,
			
 
				             result:deepClone(result),
			
 
				             id:item.param.disId
			
 
				           })
			
--- a/src/containers/DiagnosticList.js
+++ b/src/containers/DiagnosticList.js
@@ -10,6 +10,7 @@ import { showHistory,sortHistory,activeHistory,visibleHistory } from '@store/act
 
				 import {CURRENT_CHRONIC} from '@store/types/currentIll';
			
 
				 import {autoFillModules} from '@store/async-actions/fetchModules';
			
 
				 import { initItemList } from '@store/async-actions/historyTemplates';
			
 
				+import {MODI_LOADING} from '@store/types/homePage.js';
			
 
				 
			
 
				 function mapStateToProps(state) {
			
 
				     const {diagnosticList} = state;
			
@@ -77,7 +78,8 @@ function mapDispatchToProps(dispatch) {
 
				             })
			
 
				         },
			
 
				         getTreatResult: (item) => {
			
 
				-            dispatch(getTreatResult(item))
			
 
				+            dispatch({type:MODI_LOADING,flag:true});
			
 
				+            dispatch(getTreatResult(item));
			
 
				         },
			
 
				         getTips: (diagItem) => {
			
 
				             dispatch(getTips(diagItem))
			
--- a/src/containers/OperationContainer.js
+++ b/src/containers/OperationContainer.js
@@ -11,6 +11,7 @@ import {
 
				 import {saveMessage,clearMessages} from "../store/async-actions/print";
			
 
				 import {saveTemplateDetail} from '@store/async-actions/tabTemplate';
			
 
				 import {saveClickNum,getInitModules} from '@store/async-actions/homePage';
			
 
				+import {getOtherHisRecord} from '@store/async-actions/fetchModules';
			
 
				 
			
 
				 // function mapStateToProps({print}) {
			
 
				 function mapStateToProps(state) {
			
@@ -51,6 +52,7 @@ function mapDispatchToProps(dispatch) {
 
				         },
			
 
				         clear: (flag) => {
			
 
				             clearMessages();
			
 
				+            dispatch(getOtherHisRecord());      //清除后重新获取其他史记录
			
 
				             // 清除时如果是慢病模板则重新获取模板
			
 
				             if(flag){
			
 
				                 dispatch(getInitModules);
			
--- a/src/containers/PushItemsContainer.js
+++ b/src/containers/PushItemsContainer.js
@@ -15,7 +15,7 @@ function mapStateToProps(state) {
 
				         questionId: diagnosticList.clickDiag,
			
 
				         tableList: pushMessage.tableList,
			
 
				         showList: pushMessage.showList,
			
 
				-        chronicPushItems: pushMessage.chronicPushItems,
			
 
				+        //chronicPushItems: pushMessage.chronicPushItems,
			
 
				     }
			
 
				 }
			
 
				 
			
--- a/src/store/actions/checkBody.js
+++ b/src/store/actions/checkBody.js
@@ -424,7 +424,11 @@ export function setInputLabel(state,action){
 
				       item.value=text;
			
 
				     }
			
 
				   }
			
 
				-  res.saveText[i] = prefix+text+suffix;//console.log(res)
			
 
				+  if(text){
			
 
				+    res.saveText[i] = prefix+text+suffix;
			
 
				+  }else{//删除完要清空
			
 
				+    res.saveText[i] = "";
			
 
				+  }
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/currentIll.js
+++ b/src/store/actions/currentIll.js
@@ -95,6 +95,7 @@ export const fillChronicModule = (state,action)=>{
 
				   let moduleData = JSON.parse(JSON.stringify(res.moduleData));//现病史模板
			
 
				   res.data = fullfillText(moduleData).newArr;
			
 
				   res.saveText = fullfillText(res.data).saveText;
			
 
				+  res.editClear = false; //现病史框不可编辑
			
 
				   res.update=Math.random();
			
 
				   return res;
			
 
				 }
			
@@ -862,7 +863,11 @@ export function setInputLabel(state,action){
 
				       item.value=text;
			
 
				     }
			
 
				   }
			
 
				-  res.saveText[i] = prefix+text+suffix;
			
 
				+  if(text){
			
 
				+    res.saveText[i] = prefix+text+suffix;
			
 
				+  }else{//删除完要清空
			
 
				+    res.saveText[i] = "";
			
 
				+  }
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/mainSuit.js
+++ b/src/store/actions/mainSuit.js
@@ -712,7 +712,11 @@ export function setInputLabel(state,action){
 
				       item.value=text;
			
 
				     }
			
 
				   }
			
 
				-  res.saveText[i] = prefix+text+suffix;//console.log(res)
			
 
				+  if(text){
			
 
				+    res.saveText[i] = prefix+text+suffix;
			
 
				+  }else{//删除完要清空
			
 
				+    res.saveText[i] = "";
			
 
				+  }
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/otherHistory.js
+++ b/src/store/actions/otherHistory.js
@@ -215,7 +215,11 @@ export function setOtherInput(state,action){
 
				   if(res.data[i]){
			
 
				     res.data[i].value=text;
			
 
				   }
			
 
				-  res.saveText[i] = prefix+text+suffix;
			
 
				+  if(text){
			
 
				+    res.saveText[i] = prefix+text+suffix;
			
 
				+  }else{//删除完要清空
			
 
				+    res.saveText[i] = "";
			
 
				+  }
			
 
				   res.update = Math.random();
			
 
				   return res;
			
 
				 }
			
--- a/src/store/actions/pushMessage.js
+++ b/src/store/actions/pushMessage.js
@@ -38,24 +38,39 @@ function getAdviceStr(advice) {
 
				 	const commontreatment = advice.commontreatment
			
 
				 	const scheme = advice.scheme || '';
			
 
				 	const adviceInput = advice.adviceInput || '';
			
 
				-	// const assay = advice.assay || '';
			
 
				-	// const check = advice.check || '';
			
 
				+	const assay = advice.assay || '';
			
 
				+	const check = advice.check || '';
			
 
				+	const followUp = advice.followUp || '';
			
 
				 	let AdviceStr = advice.AdviceStr || '';
			
 
				+
			
 
				+	if(assay || check) {
			
 
				+		AdviceStr = assay + check  +'; ' + AdviceStr;
			
 
				+	}
			
 
				+	if(commontreatment)  { 
			
 
				+		AdviceStr = AdviceStr + commontreatment + ';';
			
 
				+	}	
			
 
				+	if(followUp) {
			
 
				+		AdviceStr = AdviceStr + '回访时间：'+followUp + '后回访，不适随诊' + ';';
			
 
				+	}
			
 
				 	for (let i = 0; i < scheme.length; i++) {
			
 
				 		for (let j = 0; j < scheme[i].treatment.length; j++) {
			
 
				 			if(scheme[i].treatment[j].treatmentStr === '') {
			
 
				 				AdviceStr = AdviceStr + scheme[i].treatment[j].treatmentStr
			
 
				 			} else {
			
 
				-				AdviceStr = AdviceStr.substring(1, AdviceStr.length) + ', ' + scheme[i].treatment[j].treatmentStr
			
 
				+				AdviceStr = AdviceStr  + scheme[i].treatment[j].treatmentStr + ', '
			
 
				 			}
			
 
				 		}
			
 
				 	}
			
 
				-	if(commontreatment)  { 
			
 
				-		AdviceStr = commontreatment +'; ' + AdviceStr;
			
 
				-	}	
			
 
				+	if(AdviceStr.slice(AdviceStr.length-2) == ', ') {
			
 
				+		AdviceStr = AdviceStr.slice(0, AdviceStr.length-2)
			
 
				+	}
			
 
				+	// if(commontreatment)  { 
			
 
				+	// 	AdviceStr = commontreatment +'; ' + AdviceStr;
			
 
				+	// }	
			
 
				 	if(adviceInput)  { 
			
 
				 		AdviceStr = AdviceStr +'; ' + adviceInput;
			
 
				 	}	
			
 
				+	
			
 
				 	return AdviceStr;
			
 
				 }
			
 
				 
			
@@ -98,7 +113,7 @@ export const addScheme = (state, action) => {
 
				 	 //将同类药添加到一起
			
 
				 	for (let i = 0; i < scheme[RepeatIndex].treatment.length; i++) {
			
 
				 		for (let j = 0; j < treatment.length; j++) {
			
 
				-			if (scheme[RepeatIndex].treatment[i].id === treatment[j].id && scheme[RepeatIndex].treatment[i].bigdrugsName === treatment[j].bigdrugsName) {
			
 
				+			if (scheme[RepeatIndex].treatment[i].id === treatment[j].id && scheme[RepeatIndex].treatment[i].bigdrugsName === treatment[j].bigdrugsName && scheme[RepeatIndex].treatment[i].subdrugsName === treatment[j].subdrugsName) {
			
 
				 				for(let z = 0; z < treatment[j].medicitionsList.length; z++) {
			
 
				 					if(treatment[j].medicitionsList[z].selected) {
			
 
				 						if(scheme[RepeatIndex].treatment[i].treatmentStr !== '') {
			
--- a/src/store/actions/treat.js
+++ b/src/store/actions/treat.js
@@ -11,6 +11,7 @@ export const hideTreat = (state, action) => {
 
				     return res
			
 
				 }
			
 
				 
			
 
				+//关闭弹窗时清除部分治疗方案
			
 
				 export const clearTreat = (state, action) => {
			
 
				     const res = Object.assign({}, state);
			
 
				     res.generalTreat = '';
			
@@ -19,9 +20,27 @@ export const clearTreat = (state, action) => {
 
				     res.treatment = [];
			
 
				     res.adversReactionList=[];
			
 
				     res.hasFollowUp = false;
			
 
				+    res.followUp = '';
			
 
				     return res
			
 
				 }
			
 
				 
			
 
				+//清除全部治疗方案
			
 
				+export const clearAllTreat = (state, action) => {
			
 
				+    const res = Object.assign({}, state);
			
 
				+    res.generalTreat = '';
			
 
				+    res.surgeryTreat = '';
			
 
				+    res.drugHistory = {};
			
 
				+    res.treatment = [];
			
 
				+    res.adversReactionList=[];
			
 
				+    res.hasFollowUp = false;
			
 
				+    res.followUp = '';
			
 
				+    res.followUpList = [];
			
 
				+    res.adversReactionList = [];
			
 
				+    res.allAdversReactionList = [];
			
 
				+    return res
			
 
				+}
			
 
				+
			
 
				+
			
 
				 export const setTreatment = (state, action) => {
			
 
				     const res = Object.assign({}, state);
			
 
				     res.treatment = action.treatment;
			
@@ -56,10 +75,11 @@ export const setOtherDrug = (state, action) => {
 
				 //药品说明
			
 
				 export const setDrugInfo = (state, action) => {
			
 
				     const res = JSON.parse(JSON.stringify(state));
			
 
				-    const instroduce = action.instroduce;
			
 
				+    const {instroduce, name, tagType} = action;
			
 
				     res.drugInfo = {};
			
 
				-    res.drugInfo.title = action.name;
			
 
				+    res.drugInfo.title = name;
			
 
				     res.drugInfo.drugDesc = instroduce;
			
 
				+    res.drugInfo.tagType = tagType
			
 
				     return res
			
 
				 }
			
 
				 
			
@@ -147,7 +167,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.value = item.value == 0 ? 1 : 0
			
 
				+        item.select = !item.select
			
 
				       }
			
 
				       return item
			
 
				     })
			
--- a/src/store/async-actions/fetchModules.js
+++ b/src/store/async-actions/fetchModules.js
@@ -9,6 +9,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',
			
@@ -153,6 +154,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;
			
@@ -162,6 +164,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,
			
@@ -227,16 +230,18 @@ export function saveMode(mode){
 
				 
			
 
				 //慢病-获取管理评估
			
 
				 export function getAssessData(){
			
 
				-  return (dispatch,getStore)=>{
			
 
				-    const {patInfo} = getStore();
			
 
				+  return ()=>{
			
 
				+    const emrData = getEMRParams();
			
 
				     const param = {
			
 
				       diseaseId:21773,
			
 
				       disType:1,
			
 
				       diag:'糖尿病',
			
 
				+      diseaseName:'糖尿病',
			
 
				       featureType:11,
			
 
				-      lis:[],
			
 
				-      sex:patInfo.message.sex,
			
 
				-      age:patInfo.message.patientAge
			
 
				+      lis:emrData.lis,
			
 
				+      sex:emrData.sex,
			
 
				+      age:emrData.age,
			
 
				+      symptom:emrData.current + emrData.main
			
 
				     };
			
 
				     return json(api.getAssess,param);
			
 
				   }
			
@@ -258,7 +263,7 @@ export function getIndexData(range){
 
				     const param = {
			
 
				       diseaseId:21773,
			
 
				       startTime:range[0],
			
 
				-      endTime:range[1],
			
 
				+      endTime:range[1]+" 23:23:59",
			
 
				       patientId:patInfo.message.patientId,
			
 
				     };
			
 
				     return json(api.getIndexData,param);
			
--- a/src/store/async-actions/patInfo.js
+++ b/src/store/async-actions/patInfo.js
@@ -62,7 +62,7 @@ export const initHistoryDetails = (dispatch) => {
 
				                 dispatch({type:MODI_LOADING,flag:false});
			
 
				             } else {
			
 
				                 dispatch({type:MODI_LOADING,flag:false});
			
 
				-                console.log(res)
			
 
				+                // console.log(res)
			
 
				             }
			
 
				         })
			
 
				     }
			
--- a/src/store/async-actions/print.js
+++ b/src/store/async-actions/print.js
@@ -144,7 +144,10 @@ function getEvaluations(base,pushMessage){
 
				       wholeIndexs:base.wholeIndexs,
			
 
				       scaleInfo:pushMessage.scaleInfo,
			
 
				       scaleResult:pushMessage.formulaResult,
			
 
				-      wholeResults:base.wholeResults
			
 
				+      wholeResults:base.wholeResults,
			
 
				+      calcuResult:base.calcuResult,
			
 
				+      calcuValues:base.calcuValues,
			
 
				+      scaleItems:base.wholeScaleItems,
			
 
				     };
			
 
				 }
			
 
				 
			
--- a/src/store/async-actions/pushMessage.js
+++ b/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)=>{
			
--- a/src/store/async-actions/treat.js
+++ b/src/store/async-actions/treat.js
@@ -1,11 +1,13 @@
 
				 import { json } from "@utils/ajax";
			
 
				-import { SET_TREAT } from '@store/types/diagnosticList';
			
 
				-import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR} from '@store/types/diagnosticList';
			
 
				+// import { SET_TREAT } from '@store/types/diagnosticList';
			
 
				+import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR,SET_TREAT} from '@store/types/diagnosticList';
			
 
				 import { SET_COMMONTREATMENT } from '@store/types/pushMessage'
			
 
				 import { SET_DRUG_INFO, SET_TREATMENT, SET_TREAT_INFO, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST, IS_FIRST_MAIN_DIAG, SET_ADVERSE_REACTIONS, SET_ALL_ADVERSE_REACTIONS, SET_FOLLOW_UP, DEL_FOLLOW_UP, SET_ALL_FOLLOW_UP } from '@store/types/treat';
			
 
				 import {storageLocal,getEMRParams} from '@utils/tools';
			
 
				 import { isAddMainSuit } from '@store/async-actions/diagnosticList';
			
 
				 import { SAVE_FOLLOW_UP } from "@store/types/pushMessage";
			
 
				+import {MODI_LOADING} from '@store/types/homePage.js';
			
 
				+import { SHOW_TREAT} from '@store/types/treat.js';
			
 
				 
			
 
				 const api={
			
 
				     push:'/push/pushInner',
			
@@ -194,6 +196,8 @@ export const getTreatResult = (item) =>{
 
				 //获取治疗方案
			
 
				 function getTreatment(item, dispatch, state,url,params, isChronic) {
			
 
				     json(url, params).then((data) =>{
			
 
				+        dispatch({type:MODI_LOADING,flag:false});
			
 
				+        dispatch({type: SHOW_TREAT})
			
 
				         let treat;
			
 
				         if(data.data.data) {
			
 
				              treat = data.data.data.treat || {}
			
@@ -215,7 +219,13 @@ function getTreatment(item, dispatch, state,url,params, isChronic) {
 
				                             for (let j = 0; j < adverseReactions.length; j++) { //判断不良反应是否有相同的不良反应，如果有，替换
			
 
				                                 for(let z = 0; z < allAdversReactionList[i].adversReactionList.length; z++) {
			
 
				                                     if(adverseReactions[j].id == allAdversReactionList[i].adversReactionList[z].id) {
			
 
				-                                        adverseReactions[j] = allAdversReactionList[i].adversReactionList[z]
			
 
				+                                        for(let x = 0; x < allAdversReactionList[i].adversReactionList[z].details.length; x++) {
			
 
				+                                            for(let y = 0; y < adverseReactions[j].details.length; y++) {//判断每一项是否选择过
			
 
				+                                                if(allAdversReactionList[i].adversReactionList[z].details[x].name == adverseReactions[j].details[y].name && allAdversReactionList[i].adversReactionList[z].details[x].select) {
			
 
				+                                                    adverseReactions[j].details[y].select = allAdversReactionList[i].adversReactionList[z].details[x].select
			
 
				+                                                }
			
 
				+                                            }
			
 
				+                                        }
			
 
				                                     }
			
 
				                                 }
			
 
				                             }
			
@@ -314,13 +324,15 @@ export const getInstroduce = (item, type, position)=>{
 
				                     dispatch({
			
 
				                         type: SET_DRUG_INFO,
			
 
				                         instroduce: data.data.data.introduceDetailList,
			
 
				-                        name: type ==8 ?item.medicitionName : type == 10 ? item.tagName : ''
			
 
				+                        name: type ==8 ?item.medicitionName : type == 10 ? item.tagName : '',
			
 
				+                        tagType: type
			
 
				                     })
			
 
				                 } else {
			
 
				                     dispatch({
			
 
				                         type: SET_DRUG_INFO,
			
 
				                         instroduce: [],
			
 
				-                        name: item.medicitionName
			
 
				+                        name: type ==8 ?item.medicitionName : type == 10 ? item.tagName : '',
			
 
				+                        tagType: type
			
 
				                     })
			
 
				                 }
			
 
				                 
			
@@ -384,7 +396,6 @@ export const commonTreatAddToAdvice = () => {
 
				                 type: SET_COMMONTREATMENT,
			
 
				                 commontreatment: state.treat.treatItem.treat.commonTreatment.text
			
 
				             })
			
 
				-            console.log('state.treat.followUp', state.treat.followUp)
			
 
				             dispatch({
			
 
				                 type: SAVE_FOLLOW_UP,
			
 
				                 followUp: state.treat.followUp
			
--- a/src/store/reducers/assessResult.js
+++ b/src/store/reducers/assessResult.js
@@ -1,10 +1,11 @@
 
				 import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_SAVE_ASSESS_DATA,SET_INDEX_SUB_TYPE,ADD_ASSESS_ITEMS,
			
 
				-  REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA,SET_CHRONIC_CALCU_RESULT} from '@types/assessResult';
			
 
				+  REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA,SET_CHRONIC_CALCU_RESULT,ADD_WHOLE_SCALE_ITEMS,SET_CALCU_VALUES} from '@types/assessResult';
			
 
				 import config from "@config";
			
 
				 
			
 
				 const init = {
			
 
				   data:[],        //评估模块数据
			
 
				   indexData:{},     //评估图表数据
			
 
				+  indexNames:{},
			
 
				   indexTimeTypes:{},    //单个图表选中的维度
			
 
				   wholeAssess:[],     //整体评估数据
			
 
				   wholeIndexs:{},     //已加入的评估数据的index,加入按钮状态用
			
@@ -14,7 +15,9 @@ const init = {
 
				     possible:{},
			
 
				     radioVal:{}
			
 
				   },    //可能结果
			
 
				-  calcuResult:{}
			
 
				+  calcuResult:{},       //计算公式结果
			
 
				+  calcuValues:{},       //计算公式填的值
			
 
				+  wholeScaleItems:[],   //全部量表中添加的整体评估项
			
 
				 };
			
 
				 export default (state=init,action)=>{
			
 
				   const res = Object.assign({},state);
			
@@ -24,8 +27,9 @@ export default (state=init,action)=>{
 
				       res.data = action.data;
			
 
				       return res;
			
 
				     case SET_INDEX_DATA:
			
 
				-      res.indexData[range[0]+range[1]] = data;
			
 
				-      Object.keys(data).map((i)=>{
			
 
				+      res.indexData[range[0]+range[1]] = data.obj;
			
 
				+      res.indexNames[range[0]+range[1]] = data.nameObj;
			
 
				+      Object.keys(data.obj||{}).map((i)=>{
			
 
				         if(getNew){
			
 
				           res.indexTimeTypes[pindex]=Object.assign({},res.indexTimeTypes[pindex],{[i]:config.chartDismen});
			
 
				         }else{
			
@@ -53,9 +57,10 @@ export default (state=init,action)=>{
 
				     case SET_SAVE_ASSESS_DATA:
			
 
				       res.wholeIndexs = action.wholeAssessItems||{};
			
 
				       res.wholeResults = action.wholeResults||{};
			
 
				-      //res.indexTimeTypes = action.chartTimeTypes;
			
 
				+      res.wholeScaleItems = action.wholeScaleItems||[];
			
 
				       res.wholeAssessText = action.wholeAssessText||'';
			
 
				       res.chooseSelecteds = action.chooseSelecteds||{};
			
 
				+      res.calcuResult = action.calcuResult||{};
			
 
				       return res;
			
 
				     //case CLEAR_ASSESS_DATA:
			
 
				     case ADD_ASSESS_ITEMS:
			
@@ -64,6 +69,10 @@ export default (state=init,action)=>{
 
				       res.wholeIndexs[action.index] = arr?[...arr,action.subIndex]:[action.subIndex];
			
 
				       res.update1 = Math.random();   //对象更新,与其他字段名不同因为绑定在pushItems,避免不必要的渲染
			
 
				       return res;
			
 
				+    case ADD_WHOLE_SCALE_ITEMS:
			
 
				+      res.wholeScaleItems[action.index] = action.data;
			
 
				+      res.update1 = Math.random();
			
 
				+      return res;
			
 
				     case REMOVE_ASSESS_ITEMS:
			
 
				       const {index,pIndex} = action;
			
 
				       const temp =[...res.wholeIndexs[pIndex]];
			
@@ -71,7 +80,15 @@ export default (state=init,action)=>{
 
				       //res.wholeAssess[pIndex].details[index].add=false;
			
 
				       return res;
			
 
				     case SET_CHRONIC_CALCU_RESULT:
			
 
				-      res.calcuResult[action.id] = action.data;
			
 
				+      if(action.id){
			
 
				+        res.calcuResult[action.id] = action.result;
			
 
				+      }else{
			
 
				+        res.calcuResult = action.data;
			
 
				+      }
			
 
				+      res.update1= Math.random();
			
 
				+      return res;
			
 
				+    case SET_CALCU_VALUES:
			
 
				+      res.calcuValues[action.id] = action.data;
			
 
				       return res;
			
 
				     default:
			
 
				       return res;
			
--- a/src/store/reducers/pushMessage.js
+++ b/src/store/reducers/pushMessage.js
@@ -16,19 +16,13 @@ const initState = {
 
				   check: [ //辅检
			
 
				   ],
			
 
				   tips: {},
			
 
				-  advice: {
			
 
				-    // assay: '', 
			
 
				-    // check: '',
			
 
				-    // scheme: [],
			
 
				-    // adviceStr: '' 
			
 
				-  },
			
 
				+  advice: {},
			
 
				   AdviceStr: '',
			
 
				   tmpFlg:'',
			
 
				   tableList:[],
			
 
				   formulaResult:{},
			
 
				   scaleInfo:{},
			
 
				   showHide:{},
			
 
				-  calcuResult:{}
			
 
				 };
			
 
				 export default function(state = initState, action) {
			
 
				   let res = Object.assign({},state);
			
@@ -44,7 +38,7 @@ export default function(state = initState, action) {
 
				     case SET_TIPS: 
			
 
				       return setTips(state, action);
			
 
				     case SET_TIPS_DETAILS:
			
 
				-      return setTipsDetails(state,action)
			
 
				+      return setTipsDetails(state,action);
			
 
				     case SET_CHANGE_ADVICE_TREATMENT:
			
 
				       return setChangeAdviceTreatment(state, action);
			
 
				     case SET_CHANGE_ADVICE_ASSAY: 
			
@@ -77,9 +71,6 @@ export default function(state = initState, action) {
 
				       return res;
			
 
				     case SET_CHRONIC_PUSHS:
			
 
				       res.chronicPushItems = action.data;
			
 
				-      if(action.id){
			
 
				-        res.calcuResult[action.id] = action.result;
			
 
				-      }
			
 
				       return res;
			
 
				     case SET_SCALE_INFO://量表内容-量表id
			
 
				       res.scaleInfo = Object.assign({},res.scaleInfo,{[action.id]:action.data});
			
--- a/src/store/reducers/treat.js
+++ b/src/store/reducers/treat.js
@@ -1,5 +1,12 @@
 
				-import { SELECT_DRUG, SET_TREAT_INFO, SET_OTHER_DRUG, SET_DRUG_INFO, CLEAR_DRUG_INFO,SHOW_TREAT, HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO, SET_GENERAL_TREAT, SET_TREATMENT, SET_SURGERY_TREAT, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST,IS_FIRST_MAIN_DIAG,CLEAR_FIRST_MAIN_DIAG ,SET_ADVERSE_REACTIONS, SET_ALL_ADVERSE_REACTIONS,CHANGE_REACT, DEL_REACT, SET_FOLLOW_UP, DEL_FOLLOW_UP, SET_ALL_FOLLOW_UP } from '../types/treat'
			
 
				-import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, setRecommendBasic, setDrugInfoList, isFirstMainDiag, clearFirstMainDiag, setAdverseReactions, setALLAdverseReactions, changeReact ,delReact, setFollwUp, delFollowUp, setAllFollowUp } from '../actions/treat'
			
 
				+import { SELECT_DRUG, SET_TREAT_INFO, SET_OTHER_DRUG, SET_DRUG_INFO, CLEAR_DRUG_INFO,SHOW_TREAT, 
			
 
				+        HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO, SET_GENERAL_TREAT, SET_TREATMENT, 
			
 
				+        SET_SURGERY_TREAT, SET_RECOMMEND_BASIC, SET_DRUG_INFO_LIST,IS_FIRST_MAIN_DIAG,CLEAR_FIRST_MAIN_DIAG ,
			
 
				+        SET_ADVERSE_REACTIONS, SET_ALL_ADVERSE_REACTIONS,CHANGE_REACT, DEL_REACT, SET_FOLLOW_UP, 
			
 
				+        DEL_FOLLOW_UP, SET_ALL_FOLLOW_UP, CLEAR_ALL_TREAT } from '../types/treat'
			
 
				+import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, 
			
 
				+        clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, 
			
 
				+        setRecommendBasic, setDrugInfoList, isFirstMainDiag, clearFirstMainDiag, setAdverseReactions, 
			
 
				+        setALLAdverseReactions, changeReact ,delReact, setFollwUp, delFollowUp, setAllFollowUp, clearAllTreat } from '../actions/treat'
			
 
				 const initState = {
			
 
				     show: false, //治疗方案显示隐藏
			
 
				     showDrugInfo: false, //药品信息显示隐藏
			
@@ -319,6 +326,8 @@ export default function(state=initState, action){
 
				             return delFollowUp(state, action);
			
 
				         case SET_ALL_FOLLOW_UP: 
			
 
				             return setAllFollowUp(state, action);
			
 
				+        case CLEAR_ALL_TREAT: 
			
 
				+            return clearAllTreat(state, action);
			
 
				         default:
			
 
				             return state
			
 
				     }
			
--- a/src/store/types/assessResult.js
+++ b/src/store/types/assessResult.js
@@ -5,4 +5,6 @@ export const SET_INDEX_SUB_TYPE = 'SET_INDEX_SUB_TYPE';   //保存单个图表
 
				 export const ADD_ASSESS_ITEMS = 'ADD_ASSESS_ITEMS';     //加入评估
			
 
				 export const REMOVE_ASSESS_ITEMS = 'REMOVE_ASSESS_ITEMS';  //整体评估删除
			
 
				 export const CLEAR_INDEX_DATA = 'CLEAR_INDEX_DATA';     //删除图表数据
			
 
				-export const SET_CHRONIC_CALCU_RESULT = 'SET_CHRONIC_CALCU_RESULT';   //保存评估中计算结果
			
 
				+export const SET_CHRONIC_CALCU_RESULT = 'SET_CHRONIC_CALCU_RESULT';   //保存评估中计算结果
			
 
				+export const ADD_WHOLE_SCALE_ITEMS  = 'ADD_WHOLE_SCALE_ITEMS';    //从全部量表中添加的整体评估
			
 
				+export const SET_CALCU_VALUES = 'SET_CALCU_VALUES';  //保存计算公式数据
			
--- a/src/store/types/treat.js
+++ b/src/store/types/treat.js
@@ -4,7 +4,8 @@ export const SET_DRUG_INFO = 'SET_DRUG_INFO'; //设置药品说明
 
				 export const CLEAR_DRUG_INFO = 'CLEAR_DRUG_INFO'; //清除药品说明
			
 
				 export const SHOW_TREAT = 'SHOW_TREAT';
			
 
				 export const HIDE_TREAT = 'HIDE_TREAT';
			
 
				-export const CLEAR_TREAT = 'CLEAR_TREAT'; //清除治疗方案内容
			
 
				+export const CLEAR_TREAT = 'CLEAR_TREAT'; //关闭时清除推送过来治疗方案内容
			
 
				+export const CLEAR_ALL_TREAT = 'CLEAR_ALL_TREAT'; //关闭时清除推送过来治疗方案内容
			
 
				 export const SHOW_DRUG_INFO = 'SHOW_DRUG_INFO';
			
 
				 export const HIDE_DRUG_INFO = 'HIDE_DRUG_INFO';
			
 
				 export const SET_GENERAL_TREAT = 'SET_GENERAL_TREAT'; //设置一般治疗
			
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -8,7 +8,7 @@ import {clearAllLabel,addLabel} from '@store/actions/inspect';
 
				 import {CLEAR_ALL_DIAG} from '@store/types/diagnosticList';
			
 
				 import {CLEAR_ALL_PUSH_MESSAGE, SET_TIPS} from '@store/types/pushMessage';
			
 
				 import {ISREAD, SETREADDITEMS} from "../store/types/homePage";
			
 
				-import {CLEAR_FIRST_MAIN_DIAG} from "../store/types/treat";
			
 
				+import {CLEAR_FIRST_MAIN_DIAG, CLEAR_ALL_TREAT} from "../store/types/treat";
			
 
				 import {tabChange} from '@store/actions/tabTemplate';
			
 
				 import config from '@config/index.js';
			
 
				 
			
@@ -269,6 +269,9 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
 
				           type:CLEAR_FIRST_MAIN_DIAG,
			
 
				           flag:true
			
 
				         });
			
 
				+        store.dispatch({
			
 
				+          type: CLEAR_ALL_TREAT,
			
 
				+        })
			
 
				         storageLocal.remove('emrParam');
			
 
				        // Notify.success('页面已清空')
			
 
				     }else{
			
@@ -917,6 +920,23 @@ function readyKeepHistory(){
 
				     return 3;
			
 
				   }
			
 
				 }
			
 
				+//评估图表数据转换
			
 
				+function parseChartData(indexData){
			
 
				+  let arr=[],obj={},temp={};
			
 
				+  let nameArr=[],nameObj={};
			
 
				+  if(!indexData){
			
 
				+    return [];
			
 
				+  }
			
 
				+  indexData.itemIndexData.map((it)=>{
			
 
				+    temp=indexData.indexConfigData.find((i)=>{return it.itemName==i.indexUnique});
			
 
				+    arr=obj[temp.indexDesc]||[];
			
 
				+    nameArr=nameObj[temp.indexDesc]||[];
			
 
				+    obj[temp.indexDesc]=[...arr,it];
			
 
				+    nameObj[temp.indexDesc]=[...nameArr,it.itemName];
			
 
				+  });
			
 
				+  //nameObj,obj;
			
 
				+  return {nameObj,obj};
			
 
				+}
			
 
				 //函数类工具,对函数进行操作 返回函数
			
 
				 //延时操作
			
 
				 function debounce(func, delay) {
			
@@ -1151,4 +1171,5 @@ module.exports = {
 
				     getCurrentDate,
			
 
				     ifOtherClear,
			
 
				     readyKeepHistory,
			
 
				+    parseChartData,
			
 
				 };