Squashed commit of the following:

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/DiagResultSearch/index.less
#	src/components/DiagnosticList/index.jsx
#	src/components/DiagnosticList/index.less
#	src/containers/DiagnosticList.js
#	src/store/actions/diagnosticList.js
#	src/store/async-actions/diagnosticList.js
#	src/store/reducers/diagnosticList.js
#	src/store/types/diagnosticList.js

src/components/DiagResultSearch/index.less

@@ -41,14 +41,16 @@
 // }
 
 .search-result {
-    max-height: 266px;
+    overflow-y: auto;
+    max-height: 225px;
+    min-height: 80px;
     overflow-y: auto;
 }
 
 .search-result-item {
     padding: 0 30px;
-    height: 44px;
-    line-height: 44px;
+    height: 36px;
+    line-height: 36px;
     cursor: pointer;
 }
 

src/components/DiagnosticList/index.jsx

@@ -22,6 +22,9 @@ class DiagnosticList extends Component {
         this.handleClickDiag = this.handleClickDiag.bind(this);
         this.referRecord = this.referRecord.bind(this);
         this.noReferRecord = this.noReferRecord.bind(this);
+        this.getHistoryCase = this.getHistoryCase.bind(this);
+        this.closeHistoryCaseModal = this.closeHistoryCaseModal.bind(this);
+        this.referCase = this.referCase.bind(this);
     }
 
     componentWillReceiveProps(nextprops) {
@@ -78,18 +81,33 @@ class DiagnosticList extends Component {
         getTips && getTips(item);
     }
     referRecord() {
-        const { hideReferRecord } = this.props
+        const { hideReferRecord, showHistoryCaseModal } = this.props
         hideReferRecord && hideReferRecord()
+        showHistoryCaseModal && showHistoryCaseModal()
+
     }
     noReferRecord() {
         const { hideReferRecord } = this.props
         hideReferRecord && hideReferRecord()
     }
+    referCase() {
+        const { hideHistoryCaseModal } = this.props
+        hideHistoryCaseModal && hideHistoryCaseModal()
+    }
+    closeHistoryCaseModal() {
+        const { hideHistoryCaseModal } = this.props
+        hideHistoryCaseModal && hideHistoryCaseModal()
+    }
+    getHistoryCase() {
+        return (<div className={style['history-info']}>
+
+        </div>)
+    }
     
     
 
     render(){
-        const { list, treatment, showReferRecord } = this.props
+        const { list, treatment, showReferRecord, showHistoryCase } = this.props
         const { visible, treatTitle } = this.state
         const lastIndex = list.length -1;
         return(
@@ -123,6 +141,10 @@ class DiagnosticList extends Component {
                     <ConfirmModal visible={showReferRecord} 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}>
+                        {this.getHistoryCase}
+                        <div className={style['confirm-history']}><span className={style['confirm-history-btn']} onClick={this.referCase}>确定</span></div>
+                    </ConfirmModal>
                 </div>
                
             

src/components/DiagnosticList/index.less

@@ -108,4 +108,17 @@
     line-height: 16px;
     text-align: center;
     padding: 10px 30px;
+}
+.confirm-history {
+    height: 50px;
+    position: relative;
+}
+.confirm-history-btn {
+    border: 1px solid #000;
+    padding: 5px 10px;
+    position: absolute;
+    right: 15px;
+}
+.history-info {
+
 }

src/containers/DiagnosticList.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import DiagnosticList from '@components/DiagnosticList';
-import { ADD_DIAGNOSTIC,  DEL_DIAGNOSTIC, UP_DIAGNOSTIC, DOWN_DIAGNOSTIC, GET_DIAGNOSTIC_STR, GET_IS_FIRST, HIDE_REFER_RECORD } from '@store/types/diagnosticList'; 
+import { ADD_DIAGNOSTIC,  DEL_DIAGNOSTIC, UP_DIAGNOSTIC, DOWN_DIAGNOSTIC, GET_DIAGNOSTIC_STR, GET_IS_FIRST, HIDE_REFER_RECORD, SHOW_HISTORY_CASE,HIDE_HISTORY_CASE } from '@store/types/diagnosticList'; 
 import { getTreatResult } from '@store/async-actions/treat';
 import { SHOW_TREAT } from '../store/types/treat';
 import {billing, getTips} from '../store/async-actions/pushMessage';
@@ -15,6 +15,7 @@ function mapStateToProps(state) {
         isFirst: state.diagnosticList.isFirst,
         diagnosticStr: state.diagnosticList.diagnosticStr,
         showReferRecord: state.diagnosticList.showReferRecord,
+        showHistoryCase: state.diagnosticList.showHistoryCase,
     }
 }
 
@@ -68,7 +69,18 @@ function mapDispatchToProps(dispatch) {
             dispatch({
                 type: HIDE_REFER_RECORD
             })
+        },
+        showHistoryCaseModal: ()=> {
+            dispatch({
+                type: SHOW_HISTORY_CASE
+            })
+        },
+        hideHistoryCaseModal: ()=> {
+            dispatch({
+                type: HIDE_HISTORY_CASE
+            })
         }
+        
     }
 }
 

src/store/actions/diagnosticList.js

@@ -85,7 +85,7 @@ export const setClickDiag = (state, action) => {
 
 export const setChronicMagItem = (state, action) => {
     const res = Object.assign({}, state);
-    res.chronicMagItem = action.chronicMagItem;
+    res.chronicMagItem = action.chronicMagItem
     return res;
 }
 
@@ -99,4 +99,15 @@ export const hideReferRecord = (state, action) => {
     const res = Object.assign({}, state);
     res.showReferRecord = false
     return res;
+}
+
+export const showHistoryCase = (state, action) => {
+    const res = Object.assign({}, state);
+    res.showHistoryCase = true
+    return res;
+}
+export const hideHistoryCase = (state, action) => {
+    const res = Object.assign({}, state);
+    res.showHistoryCase = false
+    return res;
 }

src/store/async-actions/diagnosticList.js

@@ -58,7 +58,7 @@ export const isChronicMag = (item) => {
                     }
                  });
              } else {
-                // console.log(999,chronicList)
+                console.log(999,chronicList)
                 for(let i=0; i<chronicList.length; i++){
                     if(chronicList[i].id==item.id&&chronicList[i].name==item.name){
                         //弹窗提示 “是否引用往期病例”？--往期病例接口、弹窗、引用

src/store/reducers/diagnosticList.js

@@ -1,7 +1,8 @@
 import { ADD_DIAGNOSTIC,  DEL_DIAGNOSTIC, UP_DIAGNOSTIC, DOWN_DIAGNOSTIC, SET_TREAT, GET_DIAGNOSTIC_STR, SET_DIAG_TO_MAINSUIT, 
-            GET_IS_FIRST,CLEAR_ALL_DIAG, SET_CLICK_DIAG ,CLEAR_DIAGNOSE, SET_CHRONIC_MAG_ITEM, SHOW_REFER_RECORD, HIDE_REFER_RECORD} from '../types/diagnosticList';
+            GET_IS_FIRST,CLEAR_ALL_DIAG, SET_CLICK_DIAG ,CLEAR_DIAGNOSE, SET_CHRONIC_MAG_ITEM, SHOW_REFER_RECORD, HIDE_REFER_RECORD, 
+            SHOW_HISTORY_CASE,  HIDE_HISTORY_CASE} from '../types/diagnosticList';
 import { addDiagnostic,  delDiagnostic, upDiagnostic, downDiagnostic, setTreat, getDiagnosticStr, setDiagToMainSuit, 
-        getIsFirst,clearAllDiag, setClickDiag, setChronicMagItem, showReferRecord, hideReferRecord} from '../actions/diagnosticList';
+        getIsFirst,clearAllDiag, setClickDiag, setChronicMagItem, showReferRecord, hideReferRecord, showHistoryCase, hideHistoryCase} from '../actions/diagnosticList';
 
 const initState = {
     isFirst: true,
@@ -66,6 +67,10 @@ export default function (state=initState, action) {
             return showReferRecord(state, action);
         case HIDE_REFER_RECORD: 
         return hideReferRecord(state, action);
+        case SHOW_HISTORY_CASE: 
+            return showHistoryCase(state, action);
+        case HIDE_HISTORY_CASE: 
+        return hideHistoryCase(state, action);
         case CLEAR_DIAGNOSE: 
             res.mainSuitStr = "";
             return res;

src/store/types/diagnosticList.js

@@ -13,5 +13,7 @@ export const CLEAR_DIAGNOSE = 'CLEAR_DIAGNOSE' //
 export const SET_CHRONIC_MAG_ITEM = 'SET_CHRONIC_MAG_ITEM'  //设置慢病信息
 export const SHOW_REFER_RECORD = 'SHOW_REFER_RECORD'  //显示引用历史病历弹窗
 export const HIDE_REFER_RECORD = 'HIDE_REFER_RECORD'  //隐藏引用历史病历弹窗
+export const SHOW_HISTORY_CASE = 'SHOW_HISTORY_CASE'  //显示历史病历列表弹窗
+export const HIDE_HISTORY_CASE = 'HIDE_HISTORY_CASE'  //隐藏历史病历列表弹窗