右侧推送慢病模块样式、静态知识弹窗、核心指标选择弹窗、量表弹窗

Squashed commit of the following:

commit e2651490d648ea61364593b6d16b4dc46d799c22
Author: Luolei <16657115156@163.com>
Date:   Tue Apr 2 18:40:18 2019 +0800

    辅检信息提示

commit 7ac42a2a1e0aed9450ff4f64a7bd87417f02264a
Author: Luolei <16657115156@163.com>
Date:   Tue Apr 2 14:59:48 2019 +0800

    化验提示信息显示到右侧

commit dc93b297500f2728d4ae88ffceec5f827e3156c4
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 1 09:40:37 2019 +0800

    选中图标

commit 97626efc1c829ffc134ba3d621c07a518fe12e74
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Mar 28 17:17:22 2019 +0800

    慢病入口引用历史病历

commit 55bcaa92c76fa99decfa9eb33495872308e434bc
Merge: bdf7ba6 a36bddc
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Mar 28 11:50:13 2019 +0800

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

commit a36bddc6cc617e2ba21c1b8236e93f279de4bab5
Merge: e7eb93c 8da3904
Author: Luolei <16657115156@163.com>
Date:   Thu Mar 28 11:10:12 2019 +0800

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

commit bdf7ba61e692893e7beca4bff6fd96286f0792c0
Merge: 729195f 8da3904
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Mar 28 10:36:45 2019 +0800

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

commit 729195f888a5ef75a5a1a29e3f3d277802ade16f
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Mar 28 10:36:37 2019 +0800

    慢病入口

commit 8da3904ff5b246f36ec36b6b12cac607c775c998
Merge: 7472b67 cb129f4
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 19:28:56 2019 +0800

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

commit 7472b6771f133331ae3e7ad9ad1bac30586c9254
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 19:28:35 2019 +0800

    诊断下拉框样式

commit cb129f4387019b64cf9599d723ce14ccfbf7972b
Merge: ad39ae7 110ddb8
Author: liucf <liucf@zjlantone.com>
Date:   Wed Mar 27 19:19:14 2019 +0800

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

    # Conflicts:
    #	src/components/DiagnosticItem/index.jsx

commit 110ddb881e835a0f4fb356cf80c99bf51c0d895a
Merge: 0523358 dcc0a57
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 18:44:47 2019 +0800

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

commit dcc0a578db4cf2139940ac63df2457fd1cabfd8a
Merge: 80efa80 6dd5a34
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 17:43:30 2019 +0800

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

    # Conflicts:
    #	src/config/index.js

commit 80efa802c476cb6e95b9039b77ab5520b0b021b9
Merge: 46babe5 04817be
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 17:42:12 2019 +0800

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

commit 46babe5f7cb0318b2f6e11c15390dff778dcae54
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 17:42:04 2019 +0800

    合并错误修改

commit 6dd5a34dc7fc1261c914b1a24ec155b09b202630
Author: liucf <liucf@zjlantone.com>
Date:   Wed Mar 27 17:42:00 2019 +0800

    文本模式下主诉禁止回车；杂音类型处理函数调整

commit 7dd410121ec7f9ea76eaf92912a9e50467b9baed
Merge: a01a46f b0fe21c
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 17:40:17 2019 +0800

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

commit a01a46f1479ef4dd0396288871c83061c4424fab
Merge: be04abe 91bbb09
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 17:40:09 2019 +0800

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

    # Conflicts:
    #	src/utils/tools.js

commit 91bbb09b55489c7349b0847cc4091e34c623ead6
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 17:38:29 2019 +0800

    查体隐藏区域有默认选中默认全部显示

commit e7eb93c592bbd5c976e75a724971fcb86774c86b
Author: Luolei <16657115156@163.com>
Date:   Wed Mar 27 17:31:30 2019 +0800

    诊断样式和化验辅检统一

commit 04817be42c03339da6c147cd4cd50c95b676bb83
Author: Luolei <16657115156@163.com>
Date:   Wed Mar 27 17:16:07 2019 +0800

    诊断聚焦到可视区域

commit 0523358a9fd9c6aa5412e4060a1e43ee105dd9e6
Merge: cb5fb93 2ac4cce
Author: Luolei <16657115156@163.com>
Date:   Wed Mar 27 16:55:09 2019 +0800

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

commit cb5fb93cdfd275f66dd4bde58cd74c93ed00d564
Author: Luolei <16657115156@163.com>
Date:   Wed Mar 27 16:55:01 2019 +0800

    添加化验辅检常用标签

commit 62cdafb432eb9bb78911ebb34642f16aaa32af43
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 16:07:56 2019 +0800

    查体显示隐藏规则优化

commit 2ac4cce91f3b5174aebc4c8c18a515a167625e24
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Mar 27 15:58:31 2019 +0800

    判断是否走慢病

commit f6dc83837e0878d20fc18fa793fb45e424820c88
Author: liucf <liucf@zjlantone.com>
Date:   Wed Mar 27 13:15:29 2019 +0800

    智能模式下主诉手动输入的症状移植到现病史

commit 68f8f4ff8dcd7933a3fb4942e99792fe74681bc8
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 13:10:37 2019 +0800

    杂音单选列连接不显示bug修改

commit f44c8fa4aaa10365799cc1ecf9cd9c0591a23bf7
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 11:15:06 2019 +0800

    数字组件双击编辑bug

commit 0ef45eeb0c62ce30665c54d24f9d55d3134a39f6
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 10:59:27 2019 +0800

    模板连续标点处理

# Conflicts:
#	src/components/AddAssistCheck/index.jsx
#	src/components/AddInspect/index.jsx
#	src/components/AssistCheck/index.jsx
#	src/components/DiagResultSearch/index.less
#	src/components/DiagnosticList/index.jsx
#	src/components/Inspect/index.jsx
#	src/containers/DiagnosticList.js
#	src/containers/Inspect.js
#	src/store/reducers/pushMessage.js

src/components/AddAssistCheck/index.jsx

@@ -123,12 +123,17 @@ class AddAssistCheck extends React.Component {
     </ul>
   }
   getAssistLabel() {
-    const { assistLabel, handleChangeAssistValue, handleChangeDate, isRead, handlePush, winWidth } = this.props;
+    const { assistLabel, handleChangeAssistValue, handleChangeDate, isRead, handlePush, winWidth,getInfomation } = this.props;
     return <ul className={styles.labelWrap} id="datePick">
       {
         assistLabel.map((item, idx) => {
           return (<li key={item.id} className={styles.assistLists}>
-            <span className={styles.assistName} style={{ width: winWidth < 1200 ? '120px' : 'auto' }}>{item.name}：</span>
+            <span className={styles.assistName} style={{ width: winWidth < 1200 ? '120px' : 'auto' }}>
+              <span className={styles.tagSpan}>
+                {item.name}：
+                <span className={styles.imgInfo} onClick={()=>getInfomation(item.questionId,item.name)}></span>
+              </span>
+            </span>
             <div className={styles.textareaWrap}>
               <Textarea value={item.value} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
             </div>

src/components/AddInspect/SlideExcel/index.jsx

@@ -31,17 +31,26 @@ class SlideExcel extends Component {
     })
   }
   render() {
-    const {items,item,idx,dateTime} = this.props;
+    const {items,item,idx,dateTime,getInfomation} = this.props;
     const {show} = this.state;
     return (
       <li className={styles.excelDataLis} style={{border:items.lisExcelRes.length-1 == idx? 0:''}}>
           <span className={styles.excelDataTitle}>
-              {item.menus}
+              <span className={styles.tagSpan}>
+                {item.menus}
+                <span className={styles.imgInfo} onClick={()=>getInfomation('',item.lisExcelItem[0].uniquemealName)}></span>
+              </span>
           </span>
           <table className={styles.table}>
              {  show ? (item.lisExcelItem && item.lisExcelItem.map((value,idx)=>{
+                console.log(value,788778)
                   return <tr>
-                      <td style={{width:'30%'}}>{value.itemName}</td>
+                      <td style={{width:'30%'}}>
+                        <span className={styles.tagSpan}>
+                          {value.itemName}
+                          <span className={styles.imgInfo} onClick={()=>getInfomation('',value.uniqueName || '')}></span>
+                        </span>
+                      </td>
                       <td style={{width:'20%'}}><span className={value.type == 1?'red':null}>{value.value}</span> {value.unit}</td>
                       <td style={{width:'25%'}}>
                           {normalVal(value.min,value.max)}
@@ -51,7 +60,12 @@ class SlideExcel extends Component {
                 })):(item.lisExcelItem && item.lisExcelItem.map((value,idx)=>{
                   if(idx < 4){
                     return <tr>
-                        <td style={{width:'30%'}}>{value.itemName}</td>
+                        <td style={{width:'30%'}}>
+                          <span className={styles.tagSpan}>
+                            {value.itemName}
+                            <span className={styles.imgInfo} onClick={()=>getInfomation('',value.uniqueName || '')}></span>
+                          </span>
+                        </td>
                         <td style={{width:'20%'}}><span className={value.type == 1?'red':null}>{value.value}</span> {value.unit}</td>
                         <td style={{width:'25%'}}>
                             {normalVal(value.min,value.max)}

src/components/AddInspect/SlideExcel/index.less

@@ -142,4 +142,31 @@
   .num {
     color: @blue;
   }
+}
+.imgInfo {
+  position: relative;
+}
+.imgInfo {
+  width: 15px;
+  height: 17px;
+  border-bottom: 0 none !important;
+  background: url('../img/info2.png') no-repeat center center;
+  background-size: 100% auto; 
+  position: absolute;
+  top: -10px;
+  left: 50%;
+  margin-left: -8px;
+  display: none;
+}
+.imgInfo:hover {
+  background: url('../img/info3.png') no-repeat center center;
+  background-size: 100% auto; 
+}
+.tagSpan {
+  position: relative;
+}
+.tagSpan:hover {
+  .imgInfo {
+    display: block;
+  }
 }

src/components/AddInspect/SlideSelect/index.jsx

@@ -6,6 +6,7 @@ import slideUp from "@common/images/slide-up.png";
 import slideDown from "@common/images/slide-down.png";
 import date1 from '../img/date1.png';
 import close from '../img/close.png';
+
 class SlideSelect extends Component {
   constructor(props) {
     super(props);
@@ -34,7 +35,7 @@ class SlideSelect extends Component {
     })
   }
   render() {
-    const {handleConfirm,changeActivePart,handleDelClick,getItemList,date,item,idx,handleFillShow,showDetails,handleLabelSub,showFill,changeShowFill,handlePush,dateTime,currentIdx,currentData,fillActive,handleShowDate,handleChangeDate} = this.props;
+    const {getInfomation,handleConfirm,changeActivePart,handleDelClick,getItemList,date,item,idx,handleFillShow,showDetails,handleLabelSub,showFill,changeShowFill,handlePush,dateTime,currentIdx,currentData,fillActive,handleShowDate,handleChangeDate} = this.props;
     const {show} = this.state;
     let numPlus = 0,numPlus1 = 0;
     return (
@@ -43,28 +44,39 @@ class SlideSelect extends Component {
             // 标签，血常规。。
             item.show ?
             <p className={styles.staticTagActive}>
-                <span data-flg="current" style={{color:"#000"}} onClick={(e) => { handleLabelSub(e, item.questionId,idx); handleFillShow(e,idx) }}>{item.name}</span>
+                <span className={styles.tagSpan} data-flg="current" style={{color:"#000"}} onClick={(e) => { handleLabelSub(e, item.questionId,idx); handleFillShow(e,idx) }}>
+                  {item.name}
+                  <span className={styles.imgInfo} onClick={()=>getInfomation(item.questionId,item.name)}></span>
+                </span>
             </p>:
-            <p>
-                <i data-flg="current" onClick={(e) => { handleLabelSub(e,item.questionId,idx); handleFillShow(e,idx) }}>{item.name}</i>
+            <p >
+                <i className={styles.tagSpan} data-flg="current" onClick={(e) => { handleLabelSub(e,item.questionId,idx); handleFillShow(e,idx) }}>
+                  {item.name}
+                  <span className={styles.imgInfo} onClick={()=>getInfomation(item.questionId,item.name)}></span>
+                </i>
             </p>
         }
         
         {
           item.details && item.details.map((val)=>{
             if(val.value && val.value != ''){
-                numPlus = ++numPlus
-              }
-            })
-          }
+              numPlus = ++numPlus
+            }
+          })
+        }
         {
-            item.show ? 
+            item.show ?
                 <table className={styles.table}>
                     {
                         show?(item.details.map((val)=>{
                             if(val.value && val.value != ''){
                                 return <tr>
-                                    <td style={{width:'30%'}}>{val.name}</td>
+                                    <td style={{width:'30%'}}>
+                                      <span className={styles.tagSpan}>
+                                        {val.name}
+                                        <span className={styles.imgInfo} onClick={()=>getInfomation(val.id)}></span>                                        
+                                      </span>
+                                    </td>
                                     {showDetails(val)}
                                     <td style={{width:'25%'}}>
                                         {normalVal(val.minValue,val.maxValue)}
@@ -77,7 +89,12 @@ class SlideSelect extends Component {
                               ++numPlus1;
                               if(numPlus1 < 5){
                                 return <tr>
-                                    <td style={{width:'30%'}}>{val.name}</td>
+                                    <td style={{width:'30%'}}>
+                                      <span className={styles.tagSpan}>
+                                        {val.name}
+                                        <span className={styles.imgInfo} onClick={()=>getInfomation(val.id)}></span>
+                                      </span>
+                                    </td>
                                     {showDetails(val)}
                                     <td style={{width:'25%'}}>
                                         {normalVal(val.minValue,val.maxValue)}

src/components/AddInspect/SlideSelect/index.less

@@ -151,4 +151,31 @@
   .num {
     color: @blue;
   }
+}
+.imgInfo {
+  position: relative;
+}
+.imgInfo {
+  width: 15px;
+  height: 17px;
+  border-bottom: 0 none !important;
+  background: url('../img/info2.png') no-repeat center center;
+  background-size: 100% auto; 
+  position: absolute;
+  top: -10px;
+  left: 50%;
+  margin-left: -8px;
+  display: none;
+}
+.imgInfo:hover {
+  background: url('../img/info3.png') no-repeat center center;
+  background-size: 100% auto; 
+}
+.tagSpan {
+  position: relative;
+}
+.tagSpan:hover {
+  .imgInfo {
+    display: block;
+  }
 }

src/components/AddInspect/index.jsx

@@ -284,7 +284,7 @@ class Inspect extends React.Component {
     }
   }
   render() {
-    const { handleChangeValue, list, labelList, delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
+    const { getInfomation,handleChangeValue, list, labelList, delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
     const { toastText, visible, tmpId, tmpIdx } = this.state;
     return (
       <div className={styles.wrapper}>
@@ -302,6 +302,7 @@ class Inspect extends React.Component {
                           item={item}
                           idx={idx}
                           dateTime={this.state.dateTime}
+                          getInfomation={getInfomation}
                         ></SlideExcel>
                       })
                     }
@@ -333,6 +334,7 @@ class Inspect extends React.Component {
                   changeActivePart={this.changeActivePart}
                   handleDelClick={this.handleDelClick}
                   handleConfirm={handleConfirm}
+                  getInfomation={getInfomation}
                 ></SlideSelect>
               })
             }

src/components/AssistCheck/index.jsx

@@ -10,7 +10,7 @@ class AssistCheck extends React.Component {
     }
 
     render(){
-        const {list,assistLabel,handleChangeValue,handleSign,fetchPushInfos,handleDelAssist,handleChangeAssistValue,handleChangeDate,isRead,winWidth,assistList} = this.props;
+        const {list,getInfomation,assistLabel,handleChangeValue,handleSign,fetchPushInfos,handleDelAssist,handleChangeAssistValue,handleChangeDate,isRead,winWidth,assistList} = this.props;
         return (
             <div className={styles.wrapper}>
                 <div className={styles.top}>
@@ -36,6 +36,7 @@ class AssistCheck extends React.Component {
                             handleChangeDate={handleChangeDate}
                             isRead={isRead}
                             winWidth={winWidth}
+                            getInfomation={getInfomation}
                             assistList={assistList}
                         >
 

src/components/DiagResultSearch/index.less

@@ -44,7 +44,6 @@
     overflow-y: auto;
     max-height: 225px;
     min-height: 80px;
-    overflow-y: auto;
 }
 
 .search-result-item {

src/components/DiagnosticList/index.jsx

@@ -6,6 +6,10 @@ import diagDown from './img/diagDown.png'
 import {ConfirmModal, Message} from '@commonComp';
 import Notify from '@commonComp/Notify';
 import Treat from '@containers/Treat'
+import store from '@store';
+import { pushAllDataList } from '@utils/tools';
+import iconRadioDefault from '@common/images/icon-radio-default.png'
+import iconRadioActive from '@common/images/icon-radio-active.png'
 
 class DiagnosticList extends Component {
     constructor(props) {
@@ -13,7 +17,8 @@ class DiagnosticList extends Component {
         this.state = {
             visible: false,
             delItem: {},
-            treatTitle: ''
+            treatTitle: '',
+            activeHistory: -1
         }
         this.deleteItem = this.deleteItem.bind(this);
         this.cancel = this.cancel.bind(this);
@@ -91,16 +96,45 @@ class DiagnosticList extends Component {
         hideReferRecord && hideReferRecord()
     }
     referCase() {
-        const { hideHistoryCaseModal } = this.props
+        const { hideHistoryCaseModal, items } = this.props
         hideHistoryCaseModal && hideHistoryCaseModal()
+        if (this.state.activeHistory === -1) {
+            return
+        }
+        let baseList = store.getState();
+        
+        let baseObj = items[this.state.activeHistory];
+  
+        // store.dispatch({type: CONFIRM_TYPE, confirmType: baseObj.sign});
+        pushAllDataList(baseObj.sign,'push',baseObj,'history')       //引用
+        store.dispatch(billing())
+        this.setState({
+            activeHistory: -1
+        })
     }
     closeHistoryCaseModal() {
         const { hideHistoryCaseModal } = this.props
+        this.setState({
+            activeHistory: -1
+        })
         hideHistoryCaseModal && hideHistoryCaseModal()
     }
+    handleQuoteClick(item, index) {
+        console.log('asadsd', item)
+        const { handleQuoteClick } = this.props
+        // handleQuoteClick && handleQuoteClick(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>)
     }
     
@@ -142,7 +176,7 @@ class DiagnosticList extends Component {
                         <div className={style['confirm-info']}>是否引用往期病历</div> 
                     </ConfirmModal>
                     <ConfirmModal visible={showHistoryCase} noFooter='true' title='请选择历史病历' close={this.closeHistoryCaseModal}>
-                        {this.getHistoryCase}
+                        {this.getHistoryCase()}
                         <div className={style['confirm-history']}><span className={style['confirm-history-btn']} onClick={this.referCase}>确定</span></div>
                     </ConfirmModal>
                 </div>

src/components/Inspect/index.jsx

@@ -141,7 +141,7 @@ class Inspect extends React.Component {
         </ul>
     }
     render() {
-        const {fetchPushInfos, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList,delPartItem,inspectList } = this.props;
+        const {fetchPushInfos,getInfomation, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList,delPartItem,inspectList } = this.props;
         const {ieVersion,isIE} = this.state;
         return (
             <div className={styles.wrapper} >
@@ -178,6 +178,7 @@ class Inspect extends React.Component {
                             labelListActive={labelListActive}
                             delPartItem={delPartItem}
                             inspectList={inspectList}
+                            getInfomation={getInfomation}
                         >
                         </AddInspect>
                     </div>

src/components/PushItems/index.less

@@ -213,16 +213,20 @@
         font-weight: normal;
         width: 42px;
         height: 20px;
-        border: 1px solid #3B9ED0;
+        border: 1px solid #262626;
         border-radius: 4px;
         text-align: center;
         font-size: 12px;
-        color: #3B9ED0;
+        // color: #3B9ED0;
+        color: #262626;
         line-height: 18px;
         margin: 0 0 -2px 10px;
         cursor: pointer;
       }
     }
+    .chronic{
+      background: rgba(242,150,91,0.1);
+    }
     .content{
       font-size: 14px;
       padding:6px 15px;
@@ -264,6 +268,94 @@
         color: #979797;
         text-align: center;
       }
+      .list{
+        border-bottom: 1px solid #EAEDF1;
+        padding-bottom: 10px;
+        position: relative;
+        .infoPic{
+          vertical-align: middle;
+          margin: 0 5px;
+        }
+        >p{
+          margin-top: 10px;
+        }
+        .listName{
+          color:#3B9ED0;
+        }
+        .listResult{
+          float: right;
+          color: #000012;
+          i{
+            color: #F98F24;
+          }
+          img{
+            vertical-align: middle;
+          }
+        }
+        .infoBox{
+          position: absolute;
+          top:27px;
+          width: 388px;
+          background: #fff;
+          z-index: 66;
+          border: 1px solid #EAEDF1;
+          box-shadow: 0 5px 10px 0 rgba(0,0,0,0.10);
+          .infoTitle{
+            height: 40px;
+            line-height: 40px;
+            padding-left: 18px;
+            border-bottom: 1px solid #EAEDF1;
+            img{
+              vertical-align: middle;
+              float: right;
+            }
+          }
+          .infoCon{
+            padding: 15px 26px 25px;
+          }
+        }
+      }
+      .mainList{
+        .listBtn{
+          display: inline-block;
+          width: 96px;
+          height: 26px;
+          line-height: 26px;
+          text-align: center;
+          border: 1px solid #EAEDF1;
+          border-radius: 4px;
+        }
+        .listResult{
+          line-height: 26px;
+          i{
+            cursor: pointer;
+          }
+        }
+        .mainBox{
+          top: 65px;
+          .infoOption{
+            padding: 20px 0;
+          }
+          .infoConBtn{
+            text-align: right;
+            border-top: 1px solid #EAEDF1;
+            padding-top: 10px;
+            span{
+              color:#3B9ED0;
+              display: inline-block;
+              width: 66px;
+              height: 32px;
+              line-height: 32px;
+              text-align: center;
+              border: 1px solid #3B9ED0;
+              border-radius: 4px;
+            }
+          }
+        }
+      }
+      .list:last-child{
+        border-bottom:none;
+      }
     }
   }
   .modal {
@@ -391,16 +483,62 @@
 
 .toast-title{
   position: absolute;
-  top: 27px;
+  top: 17px;
   font-size: 16px;
-  border-bottom: 1px solid #666;
-  width: 94%;
+  // border-bottom: 1px solid #666;
+  width: 87%;
   height: 25px;
 }
 .toast-cont{
   line-height: 24px;
   font-size: 14px;
-  margin-top: 15px;
+  // margin-top: 15px;
   height: 222px;
   overflow-y: auto;
+  border-top: 1px solid #979797;
+  padding: 10px 0 0 10px;
+  li{
+    margin-top: 10px;
+    cursor: pointer;
+  }
+}
+.tableBox{
+  // max-height: 700px;
+  height: 690px;
+  border-top: 1px solid #979797;
+  overflow-y: auto;
+  h1{
+    font-size: 16px;
+    font-weight: bold;
+    margin: 20px 0;
+    text-align: center;
+  }
+}
+.table{
+  width: 100%;
+  margin: 10px 0 10px;
+  tr{
+    border-bottom: 1px solid #979797;
+    td{
+      vertical-align: middle;
+      padding: 7px 0;
+    }
+  }
 }
+.tableBtn{
+    // position: absolute;
+    text-align: right;
+    color:#000;
+    padding: 15px 10px 0 0;
+    .confirmBtn{
+      display: inline-block;
+      color:#fff;
+      width: 80px;
+      height: 32px;
+      line-height: 32px;
+      border-radius: 4px;
+      background: #3B9ED0;
+      margin-left: 25px;
+      text-align: center;
+    }
+  }

src/containers/AssistCheck.js

@@ -4,7 +4,7 @@ import {
 } from 'react-redux';
 import AssistCheck from '@components/AssistCheck';
 import { assistLable,delAssistLabel,changeAssistVal,changeDate } from '@store/actions/assistCheck';
-import { getSearchList } from '@store/async-actions/assistCheck';
+import { getSearchList,getInstroduce } from '@store/async-actions/assistCheck';
 import {ISREAD} from '@store/types/homePage.js';
 import {billing} from '@store/async-actions/pushMessage';
 
@@ -20,6 +20,9 @@ function mapStateToProps(state) {//console.log(state.assistCheck)
 
 function mapDispatchToProps(dispatch, store) {
     return {
+        getInfomation(id,name){
+            dispatch(getInstroduce(id,name))
+        },
         handleChangeValue(val) {
             dispatch(getSearchList(val))
         },

src/containers/DiagnosticList.js

@@ -5,6 +5,9 @@ import { ADD_DIAGNOSTIC,  DEL_DIAGNOSTIC, UP_DIAGNOSTIC, DOWN_DIAGNOSTIC, GET_DI
 import { getTreatResult } from '@store/async-actions/treat';
 import { SHOW_TREAT } from '../store/types/treat';
 import {billing, getTips} from '../store/async-actions/pushMessage';
+import {keepPushData} from '@store/actions/tabTemplate';
+import { showHistory,sortHistory,activeHistory,visibleHistory } from '@store/actions/historyTemplates'
+
 
 
 
@@ -16,6 +19,7 @@ function mapStateToProps(state) {
         diagnosticStr: state.diagnosticList.diagnosticStr,
         showReferRecord: state.diagnosticList.showReferRecord,
         showHistoryCase: state.diagnosticList.showHistoryCase,
+        items:state.historyTemplates.items,
     }
 }
 
@@ -79,7 +83,14 @@ function mapDispatchToProps(dispatch) {
             dispatch({
                 type: HIDE_HISTORY_CASE
             })
-        }
+        },
+        handleQuoteClick(data){
+            
+            dispatch(keepPushData(data,'his'))      //历史病历引用
+            // dispatch(activeHistory(idx))
+            dispatch(visibleHistory(true))
+           
+        },
         
     }
 }

src/containers/Inspect.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import {connect} from 'react-redux';
 import Inspect from '@components/Inspect';
-import {getSearchList,getSublableList} from '@store/async-actions/inspect';
+import {getSearchList,getSublableList,getInstroduce } from '@store/async-actions/inspect';
 import {setLabel,fillActived,fillActiveDetail,checkValueIsChange,delExcelLis,clearLabel,delPartItem} from '@store/actions/inspect';
 import {billing} from '@store/async-actions/pushMessage';
 function mapStateToProps(state) {
@@ -20,6 +20,10 @@ function mapDispatchToProps(dispatch, store) {
         handleChangeValue(val){
             dispatch(getSearchList(val))
         },
+        getInfomation(id,name){
+            console.log(id,name)
+            dispatch(getInstroduce(id,name))
+        },
         handleSign(id,idx,type){
             dispatch(setLabel(idx,type))
             dispatch(getSublableList(id))
@@ -37,7 +41,6 @@ function mapDispatchToProps(dispatch, store) {
             dispatch(checkValueIsChange(idx,time,arr))
         },
         changeActivePart(idx,value){
-            console.log(idx,value)
             dispatch(fillActiveDetail(idx,value))
         },
         handleCloseExcel(idx){

src/mock/chronicTable.js

@@ -0,0 +1,88 @@
+module.exports = {
+  data:{
+    "title":[
+        {
+            "name":"临床体格检查",
+            "column":"name"
+        },
+        {
+            "name":"临床症状",
+            "column":"detailName"
+        },
+        {
+            "name":"得分",
+            "column":"score"
+        },
+        {
+            "name":"推荐选项",
+            "column":""
+        }
+    ],
+    "result":[
+        {
+            "min":0,
+            "max":6,
+            "text":"无"
+        },
+        {
+            "min":7,
+            "max":12,
+            "text":"轻度"
+        },
+        {
+            "min":13,
+            "max":29,
+            "text":"中度"
+        },
+        {
+            "min":30,
+            "max":46,
+            "text":"重度"
+        }
+    ],
+    "details":[
+        {
+            "name":"右拇指振动觉",
+            "type":"1:radio,2:checkbox.....",
+            "details":[
+                {
+                    "detailName":"正常",
+                    "score":0,
+                    "state":"0:未选中,1-选中"
+                },
+                {
+                    "detailName":"减退",
+                    "score":1,
+                    "state":0
+                },
+                {
+                    "detailName":"消失",
+                    "score":2,
+                    "state":1
+                }
+            ]
+        },
+        {
+            "name":"左拇指振动觉",
+            "type":"1:radio,2:checkbox.....",
+            "details":[
+                {
+                    "detailName":"正常",
+                    "score":0,
+                    "state":"0:未选中,1-选中"
+                },
+                {
+                    "detailName":"减退",
+                    "score":1,
+                    "state":0
+                },
+                {
+                    "detailName":"消失",
+                    "score":2,
+                    "state":1
+                }
+            ]
+        }
+    ]
+  }
+}

src/store/actions/pushMessage.js

@@ -138,6 +138,7 @@ export const addScheme = (state, action) => {
 export const setTips = (state, action) => {
   const res = Object.assign({}, state)
   res.tips = action.tips;
+  res.tmpFlg = action.tmpFlg
   return res;
 }
 

src/store/async-actions/assistCheck.js

@@ -1,6 +1,7 @@
 import axios from '@utils/ajax';
 import store from '@store';
 import { searchList } from '../actions/assistCheck';
+import { SET_TIPS } from '../types/pushMessage';
 
 
 export const getSearchList = (val) => {
@@ -23,3 +24,23 @@ export const getSearchList = (val) => {
         })
     }
 };
+
+export const getInstroduce = (id,name)=>{    //获取辅检的提示信息
+  return (dispatch, getState) =>{
+      axios.json('/api/icss/introduceInfo/getByQuestionId', {
+        questionId: id?id:'',
+        type: 6,
+        tagName:name?name:'',
+        position: 1
+    })
+    .then((data)=>{
+        dispatch({
+          type: SET_TIPS,
+          tips: data.data.data,
+          tmpFlg:'midPart'
+      })          
+    }).catch((e) => {
+        console.log(e)
+    })
+  }
+}

src/store/async-actions/inspect.js

@@ -2,7 +2,7 @@ import axios from '@utils/ajax';
 import store from '@store';
 
 import { searchList,resetLabel } from '../actions/inspect';
-
+import { SET_TIPS } from '../types/pushMessage';
 
 export const getSearchList = (val) => {
     if(val.trim() == ''){
@@ -49,3 +49,24 @@ export const getSublableList = (id,idx) => {
         })
     }
 };
+
+export const getInstroduce = (id,name)=>{    //获取化验的提示信息
+  console.log(id,name,78878788787)
+  return (dispatch, getState) =>{
+      axios.json('/api/icss/introduceInfo/getByQuestionId', {
+        questionId: id?id:'',
+        type: 5,
+        tagName:name?name:'',
+        position: 1
+    })
+    .then((data)=>{
+        dispatch({
+          type: SET_TIPS,
+          tips: data.data.data,
+          tmpFlg:'midPart'
+      })          
+    }).catch((e) => {
+        console.log(e)
+    })
+  }
+}

src/store/reducers/pushMessage.js

@@ -17,6 +17,7 @@ const initState = {
     // adviceStr: '' 
   },
   AdviceStr: '',
+  tmpFlg:'',
   tableList:[]
 };
 export default function(state = initState, action) {