Squashed commit of the following:

commit 01290a66bab66b77e22a906c52ea04c6c18d49f8
Merge: a3b0f48 27eb150
Author: liucf <liucf@zjlantone.com>
Date:   Tue Apr 30 13:12:01 2019 +0800

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

commit a3b0f488434b5012ca9025b082cb720687e3393b
Author: liucf <liucf@zjlantone.com>
Date:   Tue Apr 30 13:11:52 2019 +0800

    历史病例点击颜色修改，主诉共用诊断历史病例

commit 27eb15092f711bc754d6a869baaa0ae9600bfec7
Merge: 1c16cce 29169ab
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Apr 30 11:39:23 2019 +0800

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

commit 1c16cce4bd94bb18a4fad453d0baabcf46c04757
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Apr 30 11:19:47 2019 +0800

    开单项显示到医嘱

commit 5b09301416bcec54d7af0cee7dfa846a1e72ad23
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Apr 30 11:19:37 2019 +0800

    修改核心指标静态信息类型

commit 29169ab80ae62aae61d7081a615691ba25999a31
Author: liucf <liucf@zjlantone.com>
Date:   Tue Apr 30 11:03:41 2019 +0800

    慢病bug修改

commit 757123ddc349b5857e812c358913517c4ae1a2f4
Merge: 05acdd4 7534d10
Author: Luolei <16657115156@163.com>
Date:   Mon Apr 29 15:00:48 2019 +0800

    Merge branch 'Chronic-ll' into ChronicMag

commit 7534d1002b2449b7826a8e405924dd5c0d8c8409
Author: Luolei <16657115156@163.com>
Date:   Mon Apr 29 14:57:13 2019 +0800

    彈窗可移動添加

commit 05acdd4c1baa4957fbaf9f8fb1881c9412166f58
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 14:44:50 2019 +0800

    量表计算无结果提示

commit 84c5a28777a7f268d0e7a77298ecff1d8192bb3a
Merge: 09481b6 dd9204c
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:47:46 2019 +0800

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

commit 09481b6bdaea5b66ccfac950d432f92f7b7776d7
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:47:19 2019 +0800

    评估容错

commit dd9204c919b350dbd69f437dfc404b3edbdf9117
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 29 13:31:49 2019 +0800

    治疗方案是否存在判断条件

commit f32a03ee9c77b50dfe4389e3682a7044c5b0b5de
Merge: 0fcb618 6b6ff32
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 29 13:22:24 2019 +0800

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

commit 69fd5d61fd0a592b8f83c5fb3fb2a54768f89f41
Merge: 6a23ae1 d3f6e01
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:22:06 2019 +0800

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

commit 6a23ae1ae9fd07ed2e8200041ae72612455e4477
Merge: a3fb1eb 19fbb89
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:21:58 2019 +0800

    Merge branch 'dev/new1' into ChronicMag

commit 0fcb6186e5139904bf19ad5b44bb3ec6bff67c45
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 29 13:21:55 2019 +0800

    不良反应静态知识

commit a3fb1eba78caa297475c85f948326dc0d0d88c88
Merge: 7bcef57 6b6ff32
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:18:17 2019 +0800

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

commit 7bcef571328c906461251340e933ecef9bea2a7a
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 29 13:18:07 2019 +0800

    查体无模板报错bug修改

commit 6b6ff326a1434a3222e67ee1193fdc52541137e0
Author: liucf <liucf@zjlantone.com>
Date:   Mon Apr 29 11:35:58 2019 +0800

    Squashed commit of the following:

    commit 6332a2a78617b9399cb8584a3ae3a7492c5d230d
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon Apr 29 11:27:20 2019 +0800

        历史病例接口无数据时逻辑处理

    commit bf091afd13dc29e7d123357f81dd23adfb141d97
    Author: liucf <liucf@zjlantone.com>
    Date:   Sun Apr 28 13:37:18 2019 +0800

        合并chronicMag分支

    commit ad43cd7703c9abd9218d39bc5ca2ecbc55c83565
    Author: liucf <liucf@zjlantone.com>
    Date:   Sun Apr 28 13:19:13 2019 +0800

        合并远程分支

    commit 1a61bc8860afd4be87a796593aa98daf25f38021
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 15:34:04 2019 +0800

        右侧推送量表根据id展示结果，去掉index

    commit e9bb69c1eb062e1c8a3d7d75db2552ddd62fba3d
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 14:21:35 2019 +0800

        合并远程分支

    commit 2b2d2395be20378bd90ece24d9364985a8ae4444
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 14:06:36 2019 +0800

        量表容错处理

    commit ac70fb283eec5b0601898a419eea43e07053be3d
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 13:25:44 2019 +0800

        合并远程分支

    commit f7c7a75edba7282049d51d0f9dae1ff3aeba9f7b
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 11:42:05 2019 +0800

        解决量表计算时页面更新问题

    commit 269d9cfbed90b980935e3f949a2e75246308519e
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Apr 26 09:57:50 2019 +0800

        合并远程分支

    commit b0d8e931c7d945c53c5454e30e4a0f59e278f48b
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Apr 25 20:19:19 2019 +0800

        慢病诊断入口

    commit a5cb935038e2e63699d1f2f250322b759635eb82
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Apr 25 16:50:03 2019 +0800

        分组小计结果处理

    # Conflicts:
    #	src/components/DiagnosticList/index.jsx
    #	src/components/ScaleTable/index.jsx
    #	src/containers/AssessResult.js
    #	src/containers/DiagnosticList.js
    #	src/containers/MainSuit.js

commit 082b60e12126a46c18d088188c87e308061064d7
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Sun Apr 28 17:22:07 2019 +0800

    修改右侧推送滚动条

src/components/Advice/index.jsx

@@ -83,11 +83,11 @@ class Advice extends Component{
 
     return  <div className={`${'mainsuit-box'} ${style['main-suit']}`}>
       <ItemBox title='医嘱' editable={false} border={true} marginTop="10px">
-        {/* <div className={style['billing']}>
+        <div className={style['billing']}>
           {advice.assay && advice.assay.length > 0 || advice.check && advice.check.length > 0 ? <h1>开单项目</h1> : ''}
             {advice.assay && <span className={style['treat-input']}> {advice.assay}</span>}
             {advice.check && <span className={style['treat-input']}> {advice.check}</span>}
-        </div> */}
+        </div>
         {advice.commontreatment && advice.commontreatment.length > 0 &&<div className={style['billing']}  >
           {advice.commontreatment && advice.commontreatment.length > 0 && <h1>一般治疗</h1>}
             {/* {advice.commontreatment && <div className={style['treat-input']}  onInput={this.handleComTreatInput}  contentEditable={true} style = {{outline: 'none'}}></div>} */}

src/components/ChronicInfo/index.jsx

@@ -457,7 +457,7 @@ class ChronicInfo extends React.Component{
     return list;
   }
 
-  render(){console.log('chronic更新')
+  render(){
     const footer = <div className={style['footer']}>
       <span className={style['print']} onClick={this.onPrint}><img src={printIcon} alt=""/>打印</span>
       <span className={style['okBtn']} onClick={()=>this.handleSaveAssess()}>确定</span>

src/components/CopyRight/index.jsx

@@ -60,7 +60,6 @@ class CopyRight extends Component {
   render() {
     const { number, date, content, copyVisible, disVisible, disContent, hasNewVersion } = this.props.copyRight;
     const { showCopyModal, closeCopyModal, showDisclatmerModal, closeDisclatmerModal } = this;
-    console.log(disVisible,77777)
     const copyContent = content&&content.map(item => {
       return (
         <div className={style['message']}>

src/components/DiagnosticList/index.jsx

@@ -141,7 +141,6 @@ class DiagnosticList extends Component {
         autoFillModules && autoFillModules();
     }
     handleQuoteClick(item, index) {
-        console.log('asadsd', item)
         const { handleQuoteClick } = this.props
         // handleQuoteClick && handleQuoteClick(item)
         this.setState({
@@ -152,7 +151,7 @@ class DiagnosticList extends Component {
         const { items } = this.props
         return (<div className={style['history-info']}>
             {items.map((item, index) => {
-                return<div onClick={this.handleQuoteClick.bind(this, item, index)} style={this.state.activeHistory === index ? {color: '#abcdef'} : ''}>
+                return<div onClick={this.handleQuoteClick.bind(this, item, index)} style={this.state.activeHistory === index ? {color: '#3B9ED0'} : ''}>
                     <img src={this.state.activeHistory === index ? iconRadioActive : iconRadioDefault}/>{item.diagnose}
                 </div>
             })}

src/components/MainSuit/index.jsx

@@ -35,8 +35,6 @@ class MainSuit extends Component{
       overFlag:false,
       tmpScroll:0,
       tmpTop:0,
-      activeHistory: -1,
-      showHistoryCase:false
     };
     this.toggleEditable = this.toggleEditable.bind(this);
     this.handleFocus = this.handleFocus.bind(this);
@@ -45,11 +43,6 @@ class MainSuit extends Component{
     this.handleChange = this.handleChange.bind(this);
     this.handleClick = this.handleClick.bind(this);
     this.handleBlur = this.handleBlur.bind(this);
-    this.referRecord = this.referRecord.bind(this);
-    this.noReferRecord = this.noReferRecord.bind(this);
-    this.referCase = this.referCase.bind(this);
-    this.closeHistoryCaseModal = this.closeHistoryCaseModal.bind(this);
-    this.handleQuoteClick = this.handleQuoteClick.bind(this);
   }
   componentWillReceiveProps(nextProps){
     this.setState({boxLeft:nextProps.boxLeft})
@@ -280,83 +273,10 @@ class MainSuit extends Component{
       },config.delayTime-200); 
   }
 
-  // 慢病
-  referRecord() {//是否引用历史病例弹窗--是
-    const { chronicDesease,closeHisBox ,autoFillModules} = this.props;
-    const that = this;
-    closeHisBox&&closeHisBox();//关闭
-    initItemList(chronicDesease).then((res)=>{
-      const result = res.data;
-      if(result.code==0 && result.data){
-          store.dispatch(setInitHistory(result.data));
-          that.setState({
-            showHistoryCase:true
-          })
-      }else{
-        Notify.info("暂无历史病例，默认引用通用模板");
-        const timer = setTimeout(function(){
-          autoFillModules && autoFillModules();
-          clearTimeout(timer);
-        },1000)  
-      }
-    })
-    // this.setState({
-    //   showHistoryCase:true
-    // })
-    // store.dispatch(initItemList(chronicDesease));
-  }
-  noReferRecord() {//否
-    const {closeHisBox,autoFillModules} = this.props;
-    closeHisBox&&closeHisBox();
-    autoFillModules && autoFillModules()
-  }
-  referCase() {
-        const { items ,pureSaveChronic} = this.props
-        this.setState({
-          showHistoryCase:false
-        })
-        if (this.state.activeHistory === -1) {
-            return
-        }
-        // let baseList = store.getState(); 
-        let baseObj = items[this.state.activeHistory];
-        pushAllDataList(baseObj.sign,'push',baseObj,'history')       //引用
-        pureSaveChronic && pureSaveChronic({name:'糖尿病',id:21773}); //储存慢病疾病
-        this.props.getBilling();
-        this.setState({
-            activeHistory: -1
-        })
-    }
-  closeHistoryCaseModal() {//关闭病例列表
-    const {autoFillMoudles} = this.props;
-      this.setState({
-        activeHistory: -1,
-        showHistoryCase:false
-      })
-     // 不引用病例直接分发模板进行填充 
-     autoFillMoudles&&autoFillMoudles();
-  }
-  handleQuoteClick(item, index) {
-      console.log('asadsd', item)
-      this.setState({
-          activeHistory: index
-      })
-  }
-  getHistoryCase() {
-        const { items } = this.props
-        return (<div className={style['history-info']}>
-            {items.map((item, index) => {
-                return<div onClick={this.handleQuoteClick.bind(this, item, index)} style={this.state.activeHistory === index ? {color: '#abcdef'} : ''}>
-                    <img src={this.state.activeHistory === index ? iconRadioActive : iconRadioDefault}/>{item.diagnose}
-                </div>
-            })}
-        </div>)
-    }
-
 
   render(){
     const {type,CommonSymptoms,searchData,fetchPushInfos,isRead,totalHide,handleInput,fuzhen,saveText,editClear,datas,commSymHide,boxLeft,boxTop,showHisBox} = this.props;
-    const {showModule,show,symptom,search,showHistoryCase} = this.state;
+    const {showModule,show,symptom,search} = this.state;
     const symptomFlag = CommonSymptoms.length>0 ? true : false;
     const searchFlag = searchData.length>0 ? true : false;
     const boxTop1 = datas.length>0?boxTop:45;
@@ -380,13 +300,6 @@ class MainSuit extends Component{
       </ItemBox>
       {/*没有推送结果就不显示*/}
       {symptomFlag && !searchFlag ? <CommonSymptom data={CommonSymptoms} show={!totalHide&&symptom} onSelect={this.handleSelect} /> : ( searchFlag ? <SearchDrop data={searchData} show={!commSymHide} onSelect={this.handleSearchSelect} left={boxLeft1} top={boxTop1} mainEmpty={datas.length==0?true:false}/>:"")}
-      <ConfirmModal visible={showHisBox} okText='是' cancelText='否' confirm={this.referRecord}  cancel={this.noReferRecord} close={this.noReferRecord}>
-          <div className={style['confirm-info']}>是否引用往期病历</div> 
-      </ConfirmModal>
-      <ConfirmModal visible={showHistoryCase} noFooter='true' title='请选择历史病历' close={this.closeHistoryCaseModal} titleBg="#DFEAFE" icon={tableIcon} height={300}>
-        {this.getHistoryCase()}
-        <div className={style['confirm-history']}><span className={style['confirm-history-btn']} onClick={this.referCase}>确定</span></div>
-    </ConfirmModal>
     </div>
   }
 }

src/containers/MainSuit.js

@@ -14,6 +14,7 @@ import {Notify} from '@commonComp';
 import {getInitModules} from '@store/async-actions/homePage.js';
 import {CURRENT_CHRONIC} from '@store/types/currentIll';
 import {SET} from '@types/checkBody';
+import {SHOW_REFER_RECORD} from '@store/types/diagnosticList';
 
 function mapStateToProps(state) {//console.log(11,state);
   return {
@@ -203,7 +204,8 @@ function mapDispatchToProps(dispatch) {
         // 模板回来关闭；loading
         dispatch({type:MODI_LOADING,flag:false});
         // 弹窗是否引用历史病例？
-        dispatch({type:SHOW_HISTORY_BOX});
+        // dispatch({type:SHOW_HISTORY_BOX});
+        dispatch({type:SHOW_REFER_RECORD});
 
       },
       pureSaveChronic(item){//引用病例时储存

src/store/actions/pushMessage.js

@@ -201,33 +201,33 @@ export const addBilling = (state, action) => {
 		item.checked = false
 		return item
 	})
-	// res.advice.assay = res.advice.assay || '';
-	// res.advice.check = res.advice.check || '';
-	// for (let i = 0; i < assay.length; i++) {
-	// 	if ( res.advice.assay === '') { //如果最后一个，则不需要逗号
-	// 		res.advice.assay = res.advice.assay + assay[i].name
-	// 	} else {
-	// 		if( i === 0 && res.advice.check !== '') {
-	// 			res.advice.assay = res.advice.assay  +  assay[i].name
-	// 		} else {
-	// 			res.advice.assay = res.advice.assay + ', ' + assay[i].name
-	// 		}
-	// 	}
+	res.advice.assay = res.advice.assay || '';
+	res.advice.check = res.advice.check || '';
+	for (let i = 0; i < assay.length; i++) {
+		if ( res.advice.assay === '') { //如果最后一个，则不需要逗号
+			res.advice.assay = res.advice.assay + assay[i].name
+		} else {
+			if( i === 0 && res.advice.check !== '') {
+				res.advice.assay = res.advice.assay  +  assay[i].name
+			} else {
+				res.advice.assay = res.advice.assay + ', ' + assay[i].name
+			}
+		}
 		
-	// }
-	// for (let i = 0; i < check.length; i++) {
-	// 	if ( res.advice.check === '') { //如果最后一个，则不需要逗号
-	// 		res.advice.check = res.advice.check + check[i].name
-	// 	} else {
-	// 		res.advice.check = res.advice.check + ', '+ check[i].name 
-	// 	}
-	// }
-	// if(res.advice.assay  && res.advice.check !== '') {
-	// 		if(res.advice.assay.substring(res.advice.assay.length-2,res.advice.assay.length-1) !== ',') {
-	// 			res.advice.assay = res.advice.assay + ', '
-	// 		} 
-	// }
-	// res.AdviceStr = getAdviceStr(res.advice)
+	}
+	for (let i = 0; i < check.length; i++) {
+		if ( res.advice.check === '') { //如果最后一个，则不需要逗号
+			res.advice.check = res.advice.check + check[i].name
+		} else {
+			res.advice.check = res.advice.check + ', '+ check[i].name 
+		}
+	}
+	if(res.advice.assay  && res.advice.check !== '') {
+			if(res.advice.assay.substring(res.advice.assay.length-2,res.advice.assay.length-1) !== ',') {
+				res.advice.assay = res.advice.assay + ', '
+			} 
+	}
+	res.AdviceStr = getAdviceStr(res.advice)
 	return res;
 }
 export const clearAllPushMessage = (state, action) => {

src/store/async-actions/pushMessage.js

@@ -115,7 +115,6 @@ export const getTipsDetails = () => {
 
         //弹窗显示
         const url ='/introduceInfo/getByQuestionId'
-        
         const params = {
             type: state.diagnosticList.clickDiag.type,
             questionId: state.diagnosticList.clickDiag.id,