Browse Source

Squashed commit of the following:

commit 6377bffa3835aaa5e2765f1f3969c1f4d1ab7013
Merge: b050b99 3c3f3c4
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Apr 4 14:48:32 2019 +0800

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

commit 3c3f3c40f2fc197d7895ea4a960e59af4c135e61
Merge: 8fb1414 aafa241
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Apr 4 11:10:43 2019 +0800

    Merge branch 'dev/new1' into ChronicMag

    # Conflicts:
    #	src/components/AddAssistCheck/index.jsx
    #	src/components/AddInspect/index.jsx
    #	src/components/DiagnosticList/index.less
    #	src/containers/CurrentIll.js
    #	src/containers/eleType.js
    #	src/store/async-actions/homePage.js
    #	src/store/async-actions/pushMessage.js
    #	src/store/reducers/homePage.js
    #	src/store/types/homePage.js

commit aafa24107ed915b5eaecb1e7ab1e0bf9f9ba050a
Merge: 3fa415c dca9091
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Apr 4 10:48:07 2019 +0800

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

commit dca90915589d99e6a250bbb6fd398a47ec0f8028
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Apr 4 10:47:00 2019 +0800

    文本模式输入主诉切换智能报错bug修改

commit 3fa415cacdbc317ef676a8feb9374bd7b3762551
Merge: 3f3f14d 428de50
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Apr 4 10:34:21 2019 +0800

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

commit 428de50f825bae715b06034b1f8cc073a467cfc2
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Apr 4 10:26:25 2019 +0800

    查体其他史搜索连续标点标签去重

commit 8fb14145907dd2ebb2f7c8f27a9017359c536c09
Merge: c9fba68 3c07e6b
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Apr 3 19:48:00 2019 +0800

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

commit c9fba6873c3501b61acd8fb131e56b1cab2b772d
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Apr 3 19:46:37 2019 +0800

    文本模式慢病复诊现病史不显示文字模板

commit 3c07e6beada573c93e34c2031d2c61f67439d64a
Merge: c84d208 fb125f3
Author: liucf <liucf@zjlantone.com>
Date:   Wed Apr 3 19:40:33 2019 +0800

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

commit c84d208c92309ed72ccb713760eb02474ba115fe
Author: liucf <liucf@zjlantone.com>
Date:   Wed Apr 3 19:40:23 2019 +0800

    合并lcf分支
    Squashed commit of the following:

    commit 55dcaa25289a9393a787825f1225cb6280369f37
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Apr 3 19:22:06 2019 +0800

        右侧推送慢病模块样式、静态知识弹窗、核心指标选择弹窗、量表弹窗
        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

    commit 9575958843d4bd358edaa0bf8aaaba3c99029473
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Mar 28 17:02:03 2019 +0800

        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

    commit 4926b3f5a793592636be364947f228a5cc704fc9
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Mar 28 16:55:12 2019 +0800

        新增右侧慢病推送模块;量表弹窗

    commit 40a72419db7b120cf955ce3cf1105ed4503f56c9
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Mar 28 10:03:59 2019 +0800

        Squashed commit of the following:

        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 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

            模板连续标点处理

    commit 69ed39b82e649132f776eebecaa09a69f2bf7908
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Mar 27 15:57:28 2019 +0800

        量表列表接口对接

    # Conflicts:
    #	src/components/AddInspect/SlideExcel/index.jsx
    #	src/components/CheckBody/index.jsx
    #	src/components/DiagnosticList/index.jsx
    #	src/containers/Inspect.js
    #	src/store/async-actions/inspect.js
    #	src/store/reducers/pushMessage.js

commit fb125f323ccffa148afa87cd75e86899c491fc27
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Apr 3 19:19:58 2019 +0800

    添加评估入口,样式提取

commit 3f3f14dc8c593b2228eda09a6b6cb416b99ff03e
Merge: 22c3989 b398cbf
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Apr 3 18:20:47 2019 +0800

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

commit b050b9958ac27e2ad92a93e8e6b5528656375313
Merge: 359aed2 ef17678
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Apr 3 18:20:31 2019 +0800

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

commit 22c39898431e90945d75843235c8f768ee5cd742
Merge: cfff8c4 8709f83
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Apr 3 18:17:28 2019 +0800

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

commit ef17678ea60afd4434f66756056a3b94e5efa45a
Merge: 0038e4e 5a8e0aa
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Apr 3 17:38:00 2019 +0800

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

commit 0038e4e58222d8f77b53fd219137acef5ee0428e
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Apr 3 17:37:49 2019 +0800

    查体高亮

commit 5a8e0aadd707a264731cc02a4a1f76d64f9f57df
Merge: 093e522 e54229c
Author: Luolei <16657115156@163.com>
Date:   Wed Apr 3 16:42:35 2019 +0800

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

commit 093e522e5b88d13e7694112d0e9cd539f406a8c1
Author: Luolei <16657115156@163.com>
Date:   Wed Apr 3 16:42:22 2019 +0800

    获取导入化验项信息

commit 8709f83b731c833a925140f6db3150be4efc5415
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Apr 3 15:31:26 2019 +0800

    数字输入范围bug修改

commit 359aed27bb7fba646f89a0c0780ad4cd4e6f0bf6
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Apr 3 14:48:39 2019 +0800

    清除慢病字段

commit e54229ce3e2f90b39fafc544972f7aba2d5a77f9
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Apr 3 14:44:37 2019 +0800

    清除时清除掉慢病字段

commit b398cbfd1e26b5ac1d1e8af2c6ea1d1b98387f14
Merge: 2eb7ce0 cfff8c4
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Apr 3 14:15:19 2019 +0800

    Merge branch 'dev/new1' into dev/zhangxc1

commit 2eb7ce0386923294f8af7df1e728cf020f33b806
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Apr 3 14:14:05 2019 +0800

    修改药品说明书样式

commit 15254c7e6b84797c17df72b06da2f09e60ace82d
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Apr 3 14:13:42 2019 +0800

    关闭治疗方案同时关闭药品说明

commit 4855a7c988a70edaab1a2d44cfbfeebeb7ec90eb
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Apr 3 13:27:08 2019 +0800

    修改辅检化验删除弹框按钮颜色

commit ba8e1129ba1582dfb4549a1c1febb837dd556e48
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Apr 3 13:23:14 2019 +0800

    文本模式光标跳到前面bug修改790

commit 9fbec1c350c817abc2d5b6fd90fb89eb324742df
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Apr 3 11:40:02 2019 +0800

    数字键盘合理范围~/处理

commit cfff8c4b8fa9ddf4c9d5b2dac6d3a6749603f1be
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 19:53:34 2019 +0800

    现病史双击删除文本移位bug修改802

commit 1e4683eb8e937c4b8b4476835ed0cb4917ae330b
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 19:47:14 2019 +0800

    添加血压文本移位bug修改718

commit 589837405b8af27b4c18343b3619b9c9e63da8a3
Merge: 03f7c3e 04a7a3f
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 19:23:33 2019 +0800

    Merge branch 'dev/new1' into dev/otherHis

commit 03f7c3e11149e3d06eec1e7732e3b6da17df14e4
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 19:23:03 2019 +0800

    虚线样式修改

commit f623c337909f376b6fd8c12682e8ec15572d580a
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 19:18:01 2019 +0800

    月经史展开多空自由文本标签bug修改823

commit 40c913d42ccd7dff3bb66ca781d8a7b8bf010b5b
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 19:01:14 2019 +0800

    查体隐藏前一个自由文本输入文字不展开839

commit 04a7a3f41c48cd3542dced1949a3fe34d023b353
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 18:49:07 2019 +0800

    合并后病情变化显示bug修改

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

    辅检信息提示

commit d65fb0408ce4b8dc10d2dc15bfb60a92f98b1e8c
Merge: 4f2324b 79613ad
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 18:38:57 2019 +0800

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

commit 4f2324b9306e60b3fd2f1ce1db97ace13be7f649
Merge: 20e1b1d 409cfc2
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 17:40:38 2019 +0800

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

    # Conflicts:
    #	src/components/CheckBody/index.jsx
    #	src/components/NumberDrop/index.jsx
    #	src/store/actions/checkBody.js
    #	src/utils/config.js
    #	src/utils/tools.js

commit 20e1b1d9cc978207f30efb918f0d0028b7b2d156
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 17:33:38 2019 +0800

    查体收起bug修改741

commit b919668bbb5cb345639bedf6abff3b791552570e
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 15:07:01 2019 +0800

    文本模式关标bug回退

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

    化验提示信息显示到右侧

commit a7604cf05e972cd154372c66d1178fca1b5bd57f
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 14:33:54 2019 +0800

    数字合理值判断,/~未处理

commit 409cfc2518302c950c35d97433200f457f47e646
Author: liucf <liucf@zjlantone.com>
Date:   Tue Apr 2 14:16:50 2019 +0800

    标签后有多个标点符号也可删除标签

commit 3f1b4bbfaadd134d654465b591ba67a0fcbca9c0
Merge: c66b68b 1faf6c1
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Apr 2 13:37:12 2019 +0800

    Merge branch 'dev/new1' into dev/otherHis

commit f26b41b817d368108eb190491bb63823b30e0e47
Author: liucf <liucf@zjlantone.com>
Date:   Tue Apr 2 10:13:43 2019 +0800

    主诉搜索bug修复

commit 79613add9d67b902dfeb1df9269307427fb8b90e
Author: Luolei <16657115156@163.com>
Date:   Mon Apr 1 17:32:34 2019 +0800

    弹窗修改完成

commit c66b68b9e21cb96f6cae48a2dd3c41c4ee2b214b
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 1 16:46:10 2019 +0800

    模板连续标点标签过滤优化

commit 3ea8c23feea0a8da52768b67ace7ccd971582d0b
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 1 15:37:47 2019 +0800

    数字键盘双击值消失bug,无值不提示

commit 1faf6c15c58e028cbaec02c2a9fff426925338a0
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 1 13:45:55 2019 +0800

    appkey验证暂删

commit 09e01cca737e9cde5c549a4b2e718f9d91162753
Author: liucf <liucf@zjlantone.com>
Date:   Mon Apr 1 13:27:17 2019 +0800

    合并new1
    Squashed commit of the following:

    commit 7858d22c6f9ddba8ebe27cff2d374cc347b53eae
    Merge: 89ba72e c854917
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Apr 1 11:50:58 2019 +0800

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

    commit 89ba72ed7bab828becfd5ec46c2221a71ffe426e
    Merge: c1da01f 094f006
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Apr 1 11:47:50 2019 +0800

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

        # Conflicts:
        #	src/utils/tools.js

    commit c1da01f734c2992e02807c0373923d040cbbf8c3
    Merge: 0604b24 a9afb2c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Apr 1 11:45:35 2019 +0800

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

    commit 094f0061c0993048e73be633c8e0c683f3a59042
    Author: Luolei <16657115156@163.com>
    Date:   Mon Apr 1 11:44:52 2019 +0800

        彈窗修改

    commit 0604b24880e153be983ac4c64f9134a24c39ee11
    Merge: a885cfa 1f6e15f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Apr 1 11:44:13 2019 +0800

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

    commit a9afb2c2acb167ad46fd0e51be13173f0cfdaccf
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Apr 1 11:14:20 2019 +0800

        修改消息提示框样式

    commit c61eca8cc42f4409f9393f5070d0f11395bc1f53
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Apr 1 10:19:27 2019 +0800

        修改光标样式

    commit 1f6e15f32b12ccfe7b6aa6dc0c87a7c79a31bd75
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Apr 1 09:56:07 2019 +0800

        数字键盘样式修改

    commit bcd5baf158018d793f7ed68da174a9b0ff807810
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Apr 1 09:44:48 2019 +0800

        双击编辑报错bug修改

    commit 809e0763dafccaa5e44e5349170c88b3c9cffb4d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Apr 1 09:43:48 2019 +0800

        修改输入值不在正常值时提示

    commit 6d5c057697f5922bcedd16700e903ee103fafca9
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 29 11:17:45 2019 +0800

        添加权限appkey

    commit da871643d127a0499bd428e09f3f69a225830907
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 28 18:31:27 2019 +0800

        修改主诊断判断条件

    commit a2ff4128b236a7c94dcea597af58d682d5b12f7e
    Merge: 1608a1b a885cfa
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 28 17:24:06 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit a885cfa59047d4e03b443bfa423ea862305a3283
    Merge: 20a0b4e 6ece03c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 28 17:11:34 2019 +0800

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

    commit 20a0b4ef483156d918e95cd3683613bb77077f0a
    Merge: c4e4aae 867d481
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 28 17:11:23 2019 +0800

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

    commit 867d481042cba444c4e119b96cae2387d728d27d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 28 17:10:29 2019 +0800

        月经史bug修改

    commit 7f10e3a6533ccf94df6f724fcb9933d18af057c3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 28 16:59:02 2019 +0800

        单选组件双击编辑内容加入选项中,限1个

    commit 6ece03c6dd5eef702c64c3ee4d70aa0a018a7d55
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 28 16:35:34 2019 +0800

        模板预览,灰色标签也得显示

    commit c4e4aae5c10154db4173b046bba9bf93c61ec6c9
    Merge: 6da8456 13936fb
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 28 15:36:45 2019 +0800

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

    commit 13936fb5f5a91f22f4c4913c28fe40833f77d779
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 28 15:31:09 2019 +0800

        查体显示区有默认值未收起bug修改(773)

    commit 08d42b7dfc24dc87e4149e3676d74b7b1ebf1c0d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 28 15:00:52 2019 +0800

        查体模板引用显示bug

    commit 6da8456e8c4376aacc3ac5760022534a4f8c7262
    Merge: 9f8241f 57d6b5d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 28 11:50:42 2019 +0800

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

    commit 9f8241f4a2929b42bfea5b5fc6c3eb27856f7b3d
    Merge: 82c143f f678117
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 28 11:50:30 2019 +0800

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

    commit f678117a275e1fac27cddcec1fa09e2a8f7b4a4c
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 28 11:49:02 2019 +0800

        黑色显示

    commit 82c143f8a321b2187dfc37d4a4d9e3b65ee12318
    Merge: dcc0a57 6ca80fb
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 28 11:45:16 2019 +0800

        Merge branch 'dev/otherHis' into dev/new1

    commit bcf167d459439711bf8483016fb82720aa0ac5d0
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 28 11:05:02 2019 +0800

        拖拽弹窗拖拽关闭图标bug

    commit 6cfcd758607d394e5a81b029224b2a91e774916b
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 28 10:50:14 2019 +0800

        保存回读清除,诊断第一次的标记处理

    commit 6ca80fbfa9ca0589e4935d37a2d48bb63ba4882d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 28 10:07:50 2019 +0800

        查体添加血压bug修改,showInCheck相关

    commit 30caaa8bf6ca6a3ac3db9e25ff3863e24235ab6f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 27 20:03:46 2019 +0800

        现病史其他史组合中单列多选事件添加

    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 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 04817be42c03339da6c147cd4cd50c95b676bb83
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 27 17:16:07 2019 +0800

        诊断聚焦到可视区域

    commit 62cdafb432eb9bb78911ebb34642f16aaa32af43
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 27 16:07:56 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

        模板连续标点处理

    commit b0fe21c2b24fb21324d28a68f2b69d410eb5b5ba
    Merge: 61b1e97 be04abe
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 27 10:30:12 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit 61b1e97fa128c2ce2da63c186fb06392265e1c6d
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 27 09:39:17 2019 +0800

        诊断清除不掉的问题

    commit be04abee709d0ed7d4bcde204a3df38afcfcd124
    Merge: 5b68db7 a6b3c12
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 26 20:42:05 2019 +0800

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

        # Conflicts:
        #	src/utils/config.js

    commit a6b3c1207ce5128f98ece5c881848f0022bbc07f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 26 20:41:15 2019 +0800

        月经史删除等bug修改,基本信息mock删除

    commit 1608a1bf2aff618cb9f8ac2cd9c345617ff1460a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 26 20:30:14 2019 +0800

        修改化验和检查第二行最多字数限制

    commit 5b68db70e461839998f547a3d764e2d6fe4f7fda
    Merge: 284c23e 727d8bf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 26 19:22:31 2019 +0800

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

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx

    commit 284c23e57c3692ececad171008347db9aa8e1f01
    Merge: cab14cd 974500d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 26 19:22:12 2019 +0800

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

        # Conflicts:
        #	src/components/Advice/Textarea/index.jsx
        #	src/components/Advice/index.jsx

    commit cab14cdb8be293572157b2bdde94d25fbb60aa59
    Merge: 1345837 19463d6
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 26 19:21:44 2019 +0800

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

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx
        #	src/components/Advice/Textarea/index.jsx
        #	src/components/Advice/index.jsx
        #	src/components/NumberDrop/index.jsx
        #	src/components/NumberUnitDrop/index.jsx

    commit 727d8bfb40ec1b7c0790f9782ad69a34123812d8
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 26 19:09:57 2019 +0800

        点击开单,化验辅检滚动到对应位置

    commit 7bf2694e36e3cd55c620cd9c10012a9d01d91907
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 26 16:17:54 2019 +0800

        弹窗拖拽,化验项灰色显示,右侧推送化验到左侧显示bug,先推送数据有误,待验证

    commit 1345837087781781f36255341328cb38969867a3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 26 15:09:43 2019 +0800

        其他史现病史单选可输入bug修改

    commit 974500d59970e0a9b3da65234252b03317ccff47
    Merge: 5a24b30 5bada51
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 26 14:55:31 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 5a24b30abd8feaa1b1169013dd7d15c4a80b04d3
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 26 14:55:14 2019 +0800

        注释多余部分

    commit 6e51d5cfa5f32d5fa7646a0de85a899e3c4fdd65
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 26 14:49:30 2019 +0800

        数字组件合理值提醒添加

    commit 5bada51ef4e476a71d462cdfcb75aefc67670fd1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 26 10:51:51 2019 +0800

        查体组合中多选事件处理

    commit b43ea5466e6bac571260adaacd80e98d87e0b6df
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 26 10:21:20 2019 +0800

        医嘱输入框问题

    commit d0f2ee6d3f5c637878c3b6017034c7c96189a288
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 26 09:03:57 2019 +0800

        查体组合项中单选带输入事件处理

    commit 685207e1253c961976dd4b0e4d15430b4f124da7
    Merge: a57733c 60ae17f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 25 17:37:58 2019 +0800

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

    commit a57733cca53c935cd5c9641c1df92c76e882291f
    Merge: 68fb53d 08fe818
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 25 17:37:09 2019 +0800

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

    commit 68fb53d7ffe075c3d742a38ff76ee216b1ea73a0
    Merge: d2ea785 ac45e6d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 25 17:35:57 2019 +0800

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

    commit ac45e6d1effcde195a8429810970978655e38e03
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 25 17:32:13 2019 +0800

        推送页容错处理

    commit fecc18d39250728cabb14df2162f63390d877c5a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 25 17:26:56 2019 +0800

        数字键盘第一次点击不上去bug修改

    commit 379340b7bd841aba1a8c93b33ac7feb64aa05ed6
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 25 17:00:50 2019 +0800

        Revert "修改医嘱可编辑部分输入第一次失焦(683)"

        This reverts commit eb2871971cab9dc0c9923f3295b8ae95ca2e7583.

    commit 08fe818e429947607b3107d2d89ef2046e9558f5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 25 16:53:22 2019 +0800

        有无治疗方案判断条件

    commit eb2871971cab9dc0c9923f3295b8ae95ca2e7583
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 25 16:52:55 2019 +0800

        修改医嘱可编辑部分输入第一次失焦(683)

    commit cc42d32f7d66b456e6be7712d2013935a1922a8d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 25 16:38:00 2019 +0800

        参与推送的诊断用,间隔

    commit 60ae17f1603b48940fbf49fe9bf33175fb2890c7
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 22 17:40:39 2019 +0800

        弹窗移动

    commit d2ea785237afd930f4ffbee6affd484844ff260a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 22 16:58:55 2019 +0800

        月经史公式显示重新获取bug修改

    commit 70c7a971a00dc4703ec1f9206feee1218ea11346
    Merge: 336d8c0 805092f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 22 16:55:30 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 336d8c0ab8f57a0e3dbd3b2177de446df40ae936
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 22 16:53:19 2019 +0800

        修改更多同类要药品说明显示方式

    commit 805092f164a9246fe0467e67fed1a812428b19c0
    Merge: ffb5aeb c5675d4
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 22 16:13:17 2019 +0800

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

    commit c5675d42024c0fff14ab5fc1a45f7026423aa34e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 22 16:12:43 2019 +0800

        月经史公式显示bug修改

    commit 3379e747ce5c7ba65f94e4368b0e1708cf6a4e16
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 22 13:36:45 2019 +0800

        有无治疗现病史显示bug修改

    commit ffb5aeb36ca3aaab14473b2f132222b8a0a28262
    Merge: 0292dbd bd5d46e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 22 11:24:20 2019 +0800

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

        # Conflicts:
        #	src/components/AddInspect/SlideExcel/index.jsx
        #	src/components/AddInspect/SlideExcel/index.less
        #	src/components/AddInspect/SlideSelect/index.jsx
        #	src/components/AddInspect/SlideSelect/index.less
        #	src/components/MainSuit/index.jsx

    commit 0292dbd4b645da00761f54542612d254caf34361
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 22 11:20:09 2019 +0800

        化验展开bug

    commit 4a5ec09fbd34f23ea5092690ddb23d9a702e5bf6
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 22 10:56:08 2019 +0800

        文本内容过多预览有问题

    commit f9bf4d5e02d2a59ea3b23c0fc28f64eaa90c0be5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 22 10:49:51 2019 +0800

        一般治疗和医嘱自由输入合为医嘱字符串

    commit 08906fc4e2ac7e8ce9d65efcd25e7341d7e43914
    Merge: 7d7d482 8dee41a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 22 10:39:10 2019 +0800

        Merge branch 'dev/byll' into dev/zhangxc1

    commit 7d7d482fbacfc8bdd17ef47e9254fae7e1e78931
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 22 10:38:16 2019 +0800

        一般治疗添加到医嘱

    commit 8dee41a7789aec5da8688461443f2d36a5a56ac7
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 22 10:26:15 2019 +0800

        医嘱预览

    commit b81aef699bff0965529f4d9efa113b6a9a960956
    Merge: 756d9cd 4cd3adb
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 22 09:45:21 2019 +0800

        Merge branch 'dev/zhangxc1' into dev/byll

    commit 4cd3adb11cd7a4c781055a1c2120d946bcc39dfa
    Merge: a58f922 32af0be
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 22 09:28:24 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit a58f9222a15328736763acfa8e23fc1530604903
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 22 09:26:24 2019 +0800

        治疗方案一般治疗到医嘱

    commit 756d9cdf56f715fb5c4a6e6e389a918ed9967947
    Merge: 2326781 f768487
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 22 09:26:17 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit f7684871a82746657cc256f26a85d4f0a77e5329
    Merge: d57805e 32af0be
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 22 09:25:42 2019 +0800

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

    commit 32af0be3662617155c4b7868b3207be79a22250c
    Merge: 9e9dd56 ec0efcd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 21 20:37:11 2019 +0800

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

    commit d57805edc68a486bdbb39052929dd3c1d5845578
    Merge: 2f1b54b 9e9dd56
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 21 20:17:17 2019 +0800

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

    commit 2f1b54b34ac26f7ec9e7df77a466ce4cd5d3a11c
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 21 20:17:10 2019 +0800

        11

    commit 2326781c5a9c2e770fc5ab266949eb8a1fbc8cbb
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 21 20:08:06 2019 +0800

        光标移动获取搜索框的位置

    commit 9e9dd567f003f0dbfc26c24285a571e92f9e42bf
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Mar 21 20:02:10 2019 +0800

        主诉搜索

    commit 89f91cd6e1acbdfb8dee9e1104ba7c1ce1f5327c
    Merge: 5fdbd2c f7807c6
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 21 19:19:52 2019 +0800

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

    commit 5fdbd2cda6e3e3bb6e60d5b68c9b5ad8ac6ba158
    Merge: 5d405f4 d1d07a2
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 21 19:15:08 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit f7807c61a9d3b2229b2ab3abd89ff22678d6fcb2
    Merge: 5d405f4 d1d07a2
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 21 18:39:48 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit 5d405f426c9906f9b4f80df13a18112c9350f48f
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 21 18:28:29 2019 +0800

        化验展开收起显示条数,预览样式问题

    commit b9fe0874a6ed5276e6eb1a9cf8aa05ddecfcd467
    Merge: bd59ead d1d07a2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 21 17:24:20 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit bd59ead0c212bd2708fb535080ee5579192ae432
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 21 17:23:21 2019 +0800

        一般治疗添加到医嘱(未完成)

    commit ec0efcd32a5efbf9b0afe42116f72b99459e8655
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 21 16:28:42 2019 +0800

        第一次选中数字时placeholder闪一下优化

    commit d1d07a2896d4aed2fe4e29513794bbcf64070d07
    Merge: e159e76 d9c0a8c
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Mar 21 15:50:09 2019 +0800

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

    commit e159e7692759b706e416213f00e743c6e477cd54
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Mar 21 15:50:00 2019 +0800

        主诉失焦关闭搜索下拉;处理现病史搜索tagType=4的标签类型

    commit d9c0a8cad9c2be34c2ba6d47389a80dbeec9d9e1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 21 15:40:57 2019 +0800

        展开收起颜色修改

    commit 359f6b05807e689a022c514ea41c7ddfea10ae9a
    Merge: f519ae2 089fd3b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 21 15:33:55 2019 +0800

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

    commit f519ae201e0c1465445670c99cc49402c362eef7
    Merge: aec6017 52cc12f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 21 15:33:24 2019 +0800

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

    commit aec6017a2c1b036ba40584dc77e659281bfddd1a
    Merge: 1219cc1 731f09d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 21 15:33:15 2019 +0800

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

    commit 731f09d33504ee5c765062320fe2801aa320c5d7
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 21 15:31:57 2019 +0800

        杂音类型伴,有时内容可单选,无都多选

    commit 89338ddbdcb26a2fde295657f1ab463f0a901c80
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 21 13:44:21 2019 +0800

        单选默认选中在组合项中不做效果

    commit 089fd3bc43e82fbbd27307a1ac43009fae30347a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 20 17:11:33 2019 +0800

        推送诊断去除初诊复诊

    commit 5e755215a0ff3918a7f4a29d67701e633dba4161
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 20 16:05:33 2019 +0800

        化验和辅检每个最多显示两行

    commit 9f6a8f17a65ee231ec0650878106a91681ba15d8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 20 16:04:36 2019 +0800

        化验和辅检最多展示两行

    commit 9e54e985da856a971e5ea58f33723321d63a8783
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 20 14:58:06 2019 +0800

        推送页参数名修改对接

    commit 9301b3066d123eaaefad13545d51f9211aea0061
    Merge: 1773e0f 1219cc1
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 19 20:33:01 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 52cc12f179efb99d9334b5af30b83a01bcaaf49b
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 19 19:25:35 2019 +0800

        化验大项的小项超出4条折叠

    commit bb46a43192d8593958254b9fe5ff18b1ac467064
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 19:11:46 2019 +0800

        推送页接口对接,提示信息添加

    commit 1773e0fede0d392f3adf20f58b6dababa0be2bfb
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 19 17:08:00 2019 +0800

        修改警惕类型和药品说明书、疾病详情导航

    commit 57c3360b1f6c9bd0f51c833f88f1bf10a3ac1024
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 13:33:52 2019 +0800

        输入组件光标扩大范围,输入默认宽度修改

    commit 1219cc1236216657024648013516af0a7ef96e95
    Merge: fee6d88 ac9af66
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 11:48:16 2019 +0800

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

    commit ac9af668510ef758e57dc1b723a273325cc3a32c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 11:47:57 2019 +0800

        其他史bug修改

    commit fee6d88ffc5b039b01f085d01023fcd2191dcda1
    Merge: 730d39d ba8fcba
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 11:39:51 2019 +0800

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

    commit 730d39d33ebeeea912a8723516d04246a1a46dcc
    Merge: 14f3ee1 dcb6c21
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 11:39:44 2019 +0800

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

    commit 14f3ee1688093c32291c49aff57b62dab347cd61
    Merge: ca5d351 c923390
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 11:39:38 2019 +0800

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

        # Conflicts:
        #	src/common/components/InlineTag/index.less
        #	src/config/index.js

    commit dcb6c21c1ff17be8846f2691e048dd68aa0a0a21
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 19 11:36:42 2019 +0800

        修改药品说明展示方式

    commit ba8fcba1e44944e9fc2fc5ab3d099a1628070d0c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 11:26:59 2019 +0800

        测试数据删除

    commit 39615bc8b59fb2d6be01a81389715c640e0bb07a
    Merge: fbb30bf ca5d351
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 11:22:39 2019 +0800

        Merge branch 'dev/new1' into dev/otherHis

    commit fbb30bf0dea4f563fad87a5c712b099ef9cfd0ba
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 11:06:33 2019 +0800

        月经史bug修改

    commit ca5d35192c675f047bfc97313f7948e0a6f57516
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 10:36:40 2019 +0800

        单选带输入组件bug修改

    commit 30b06d72c4b966b520a0752d90cc02fc596f3978
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 10:35:11 2019 +0800

        单选带输入组件添加

    commit 760252ca8ce199936e5bf400d9418fcf237cc182
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 19 10:34:42 2019 +0800

        单选带输入组件添加

    commit 7fb607a337fea791cc36581a0228574c5ad49ff3
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 18 17:29:52 2019 +0800

        后台链接地址改变

    commit dbb2dd7eac645f395af6d0bbb06a462688747160
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 18 17:19:57 2019 +0800

        保存历史病例添加参数

    commit 238fbad28172904235ac90038bbda1702e9ab537
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 18 14:07:57 2019 +0800

        输入框输入居中

    commit 3cf7dfd10a8234d832bcb7c6767304795415f609
    Merge: 53e7314 6d846c1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 17:44:37 2019 +0800

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

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx

    commit 53e7314bbc1957fd27a4bc1028196dfa3d543f2a
    Merge: ff755df aac2f52
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 17:42:02 2019 +0800

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

    commit ff755df436696d7d4050d06e694a8e8f53cd9d23
    Merge: d6c5de5 37dad92
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 17:41:57 2019 +0800

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

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

    commit d6c5de52f3f5af2b4fa227d4b569ef699b5fa8b3
    Merge: 51dadc2 eef376a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 17:41:28 2019 +0800

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

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx

    commit 37dad92d558d5a265a6267c5fb55c59121d04f84
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 17:40:20 2019 +0800

        查体更多样式修改

    commit 4e06af3513eb192dd82a017f385d6befdd7249b0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 17:34:11 2019 +0800

        查体隐藏的项目中有填值不能收起

    commit aac2f5275784614c41c76b8bb4e694125f3521b1
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 15 17:02:22 2019 +0800

        推荐检验检查样式

    commit 3fc5065cfe5d5f1160651b74692748bb54a819dd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 16:02:54 2019 +0800

        其他史输入组件光标偏低bug修改

    commit 64f39922723ada4041e20eaf23906941a5834298
    Merge: 64ba4f9 51dadc2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 15:31:16 2019 +0800

        Merge branch 'dev/new1' into dev/otherHis

        # Conflicts:
        #	src/components/CheckBody/index.jsx
        #	src/components/NumberDrop/index.jsx
        #	src/components/PreviewBody/index.jsx
        #	src/utils/tools.js

    commit 20445b1d60b618a1df3dd61452eb63b8d9e6355e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 15 15:24:53 2019 +0800

        修改治疗方案高度

    commit 6d846c1a33925ffa50564f1663abcaab5b922adc
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 15 10:39:36 2019 +0800

        11

    commit 83f935a45069dd3242477163dca12e838fc49f57
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 15 10:38:51 2019 +0800

        右侧推送的化验辅检选中后点击开单添加到左侧化验辅检项

    commit 64ba4f932246434919aab687f12f7d8b5371eaac
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 09:50:59 2019 +0800

        数字键盘前后缀也可唤出键盘

    commit 0e31587fcd90eed228eb4a5b1bb2087d76569881
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 14 17:20:18 2019 +0800

        月经史预览显示公式

    commit cc0c9a0e4e7cabe14711a852b542d44850ee0ca2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 14 17:19:43 2019 +0800

        月经史预览显示公式

    commit 18615edb133af8eb20d1cb57dd774f87e9f1db8e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 14 15:15:30 2019 +0800

        切换模式和历史病历添加点击蒙层关闭

    commit 6545fb5808692e5d60c9db48e551004caba3acff
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 14 15:06:52 2019 +0800

        打印和打印预览添加点击蒙层关闭

    commit f15347c15856c05408b2a0b89aee4bdfa80f7f6b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 14 15:03:52 2019 +0800

        点击蒙层关闭弹窗

    commit 9e3b0ebe727106d9738e20a9cd6d804083b1fc32
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 14 14:58:13 2019 +0800

        推送页修改

    commit 1330f7436bb95bac74e9e5cdc400dccd1ff275e4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 14 14:45:26 2019 +0800

        搜索增加延迟搜索

    commit 8adf0a55f64f4c5ed12faec2d04439f083763a71
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 14 10:31:17 2019 +0800

        查体展开按钮位置修改

    commit 153eef096b744de7022db362bdc3f0d008fe9abb
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 14 10:13:42 2019 +0800

        数字组件允许输入.等黏贴无法判断

    commit 411e1a7f7fe55e3bd804e34fa3cf7c0671b36530
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 20:20:50 2019 +0800

        模板引用后tab跳回辅助信息

    commit a663c7eacef3d35a75967b459ba08c3bfc62e246
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 20:15:15 2019 +0800

        回读后其他史为空标签则使用模板

    commit 673b1be5a2453a3d59989049d1237218bde93e65
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 19:03:30 2019 +0800

        查体展开收起

    commit c72fa79d4935c579c7b1a5525bbbb7e3bc00826e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 18:30:51 2019 +0800

        数字组件优化

    commit 8459b06b5fea0e20171abecb7f47db3d25224bbf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 11:06:46 2019 +0800

        血压类标签添加文字bug修改

    commit 53dcee5e15e14f0b93d238d5e4ab0e24958dfee8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 13 10:30:52 2019 +0800

        修改添加诊断时诊断已存在放在初诊复诊弹窗前面

    commit 35a36ba2d87531ae36960220cbdeafd40176e5a6
    Merge: f476a56 79ce16a
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 6 15:17:41 2019 +0800

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

    commit f476a562e488ad1caf4fae11cff878125a5dabad
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 6 15:14:24 2019 +0800

        搜索位置获取时机

    commit 79ce16ae74ace61be0e166dec94524211907dae4
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 6 15:14:24 2019 +0800

        搜索位置获取时机

    commit 51dadc2c8f557ffade3b899cd65471e3068aa1cc
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 6 11:33:08 2019 +0800

        火狐删除的时候弹窗问题

    commit 8dd1b64c3fb2a3954d4bf608c899397410b1b0c7
    Merge: f5b161a 8dcf624
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 6 09:23:47 2019 +0800

        Merge branch 'IE_test' into dev/new1

    commit f5b161a32f26df4bcf3f4c50016e89d2b6431313
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 17:15:58 2019 +0800

        firefox43补充

    commit cfc1a778fce0a02ffa961ec2ac104fa34435bcdd
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 16:26:09 2019 +0800

        兼容firefox43

    commit 6d0c9f140792de675a8aeacfd2d942a536505b19
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 12:33:06 2019 +0800

        模板保存条件修改,预览时间戳转化

    commit 059b066a9ab174c1e345659e3ddf6fc8d36cc2f5
    Merge: 74f1be7 d5b450f
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 10:54:57 2019 +0800

        Merge branch 'dev/byll' into dev/new1

    commit d5b450ff9b3596643e092e2d76493df81242cc6b
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 10:54:07 2019 +0800

        判断位置调整

    commit 74f1be7217319eb1b8a7472c65934448b8d62367
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Mar 5 10:48:51 2019 +0800

        合并liucf分支
        Squashed commit of the following:

        commit 63303a629178a6c327ae402262dfaf8885b3332d
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Mar 5 10:28:02 2019 +0800

            现病史空模板处理

        commit 9e748c97a82a417812ae6f416f70827867185081
        Merge: 3cf35e1 f353eae
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 16:10:25 2019 +0800

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

            # Conflicts:
            #	src/common/components/Textarea/index.less
            #	src/components/AddAssistCheck/Textarea/index.less

        commit 3cf35e1da1e6a3ef203d27c4875ccc4ba2ea556c
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 16:09:24 2019 +0800

            合并new1
            Squashed commit of the following:

            commit 70e968a78a10c520fa092cd979e0e03475523dc4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 09:25:57 2019 +0800

                修改诊断搜索参数

            commit 77ca8b29d1fc647e6765ebe0330b52ea88bd606f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 18:12:20 2019 +0800

                合并错误修改

            commit a20149638473c75479c56deb365db7c328a558cb
            Merge: cfc64ea 6b7dfbb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 18:08:43 2019 +0800

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

                # Conflicts:
                #	src/store/async-actions/homePage.js

            commit cfc64eaaaf0c98941c04be7b355aa646ecb3c560
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:27:09 2019 +0800

                标点加英问号

            commit 6b7dfbb33bd85d54dff60649f913b2fef6f8ce0c
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 17:24:55 2019 +0800

                bug提交

            commit 35a9c17b604893b2d97c45143128e5ea4d8d15bc
            Merge: 11d0086 a0beff1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:17:00 2019 +0800

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

            commit 11d00865399c3ba8bf5afe096ca3f3856c86be36
            Merge: 4f214b2 422c5cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:16:54 2019 +0800

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

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

            commit 4f214b2a23fd9bacb6671e191f7e42544c7b87af
            Merge: c721d35 9378eb8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:15:36 2019 +0800

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

            commit c721d35ada039c262724106b4b8d0342573e36ec
            Merge: b8f144b 0f0c391
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:15:32 2019 +0800

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

            commit 9378eb8bfca2571b7ed6e83560f2decaded45f2c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 16:55:33 2019 +0800

                其他史selecteds为空bug修改

            commit f6fec4a2b2f25e1b8d89b62601baa63a2cefe968
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 16:38:02 2019 +0800

                修改清空后第一次点击键盘不触发click事件bug

            commit c11b47d06e11c024a17f02b5648a800405d88ff5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 10:28:17 2019 +0800

                其他史文本模式数据bug修改

            commit 422c5cfdfaa0312d65cce2c717de1f1b2f63755b
            Merge: b479e52 b8f144b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 10:25:45 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit b479e52191221be49d4417308014517a821d8d41
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 10:21:39 2019 +0800

                修改诊断搜索

            commit b8f144b7c2c1fb60d208525d29dc1a1a38280edb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 09:44:49 2019 +0800

                去重标点添加

            commit 345ea481613f2fe5beb8aacdc117ce022a60f1b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 09:23:31 2019 +0800

                修改常用药物慎用标识透明度

            commit 0f0c3911304b587351e1d53627a9f1a314f9173a
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 09:08:54 2019 +0800

                11

            commit 58d128cb772f05fbf90974b0187ce2fa91905f76
            Merge: 5ec2c5b 21e2bf6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:55 2019 +0800

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

            commit 5ec2c5be9b99f40fd7322ea4299a8ef5ddbfbf5a
            Merge: e3965b6 f388f66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:51 2019 +0800

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

            commit e3965b6f49b9325a9a6aa6f9e3382d8e6be8b6b9
            Merge: ba2209b b37ea33
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:18 2019 +0800

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

            commit ba2209baa70ce98557956e4ee5e24659537b4e41
            Merge: c7033dc 2fc00bd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:22:41 2019 +0800

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

            commit 2fc00bd2a0c2c83d0b3a763147a5196f36ed2513
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 17:56:22 2019 +0800

                病例滚动条上面不遮挡导入按钮上移

            commit 21e2bf63e19461fc8956c991678d11ada4abad61
            Merge: 56412f4 c7033dc
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 28 15:49:11 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 56412f467c018e2ce22415a54a36be230126b5fe
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 28 15:47:21 2019 +0800

                注释查看药品说明书

            commit 7a306c9f203aa3e7c67a6c2138adbe2602b9aa56
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 15:44:55 2019 +0800

                修改其他史查体杂音类选中bug

            commit f388f660e2062b82ac39984f21bcd1603982f911
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 12:28:02 2019 +0800

                1

            commit c7033dc0fa9b576fd44ad580a70d9dc3c9abbc21
            Merge: 24781b3 9b8aba5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:47 2019 +0800

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

            commit 24781b351a21c98c7f0185b808c6cb2c8459cab8
            Merge: dd471cd 686d0e6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:41 2019 +0800

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

            commit dd471cd31cd4f5e8bee1cc4394afc2d1ec645d27
            Merge: fdfd012 beee05d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:32 2019 +0800

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

            commit fdfd0120716eea088da637b233700b07e6865f53
            Merge: 47805f3 6c7eff1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:16 2019 +0800

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

            commit 6c7eff13a7a93e7e50d569a72155a280973c1053
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 09:59:02 2019 +0800

                excel导入日期时间戳格式转换

            commit 92eb95e4a13cc141cf115fd59ba96eb9c4ad81f8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 09:35:49 2019 +0800

                化验清空只清空数据

            commit 9b8aba56d77ce741849edf60453f395ec7a17959
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 17:00:35 2019 +0800

                清空后其他史杂音类选中状态bug修改

            commit cca4e2b37197823231e6cbe1407b93ab2c1cb49e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:38:03 2019 +0800

                标点补充

            commit 686d0e6888cbe437c6126b079f546c5a7b811ae7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 16:34:13 2019 +0800

                点击开单项到医嘱

            commit 47805f396f0acda35a73a8fbe23a2b290af60a84
            Merge: dbfbe54 0ab03d2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:20:13 2019 +0800

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

            commit dbfbe549b65f8dea75579b10e02d7a4d022929a2
            Merge: ba95b15 24a72ee
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:20:08 2019 +0800

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

            commit ba95b154cd8f0acb6ac3cbdd0f56c2b5cd128a51
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:17:59 2019 +0800

                主诉合并错误修改

            commit 545d910e9331f21ab16be77ab7ac326ad3de580d
            Merge: a261f0c 48728c3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:15:51 2019 +0800

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

                # Conflicts:
                #	src/components/MainSuit/index.jsx
                #	src/components/PreviewBody/index.jsx
                #	src/components/PrintPreview/index.jsx
                #	src/components/TreatDesc/DrugInfo/index.jsx
                #	src/store/actions/diagnosticList.js
                #	src/store/actions/otherHistory.js
                #	src/store/reducers/assistCheck.js
                #	src/store/reducers/otherHistory.js

            commit 6b6082ca9ad86cab359874b6089815719b51d7d4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 16:04:10 2019 +0800

                Revert "第一个诊断为复诊添加到诊断调用推送接口"

                This reverts commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d.

            commit a261f0c60ae06808381dd443b5d8cef42760d953
            Merge: f2cb210 7e81b63
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:58:46 2019 +0800

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

            commit 0ab03d2eba0865ebdda8c8b9eb84e5dea7f07b59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:53:28 2019 +0800

                标点规则:中间连续标点保留第一个,开头去掉,结尾保留第一个,灰色不显示

            commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 15:40:32 2019 +0800

                第一个诊断为复诊添加到诊断调用推送接口

            commit cd02a522c6054deb9ade0fed202338dd1ce9021b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:26:16 2019 +0800

                输入再删除输入不搜索bug修改

            commit e62e0aa6083ed13edbbfc36124ff79363ddaba38
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:16:58 2019 +0800

                推送参数加主诉

            commit 134276afd973d5b5d8e07389cee27eb9391e9247
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:14:00 2019 +0800

                双击编辑状态关闭bug

            commit 769c60daabd81ef48f37f5227e9a55fb205ce5ee
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 14:11:43 2019 +0800

                化验颜色不一致

            commit e3ad8a2d18a21cc770b9c303d92146bbe78e4d8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 14:10:40 2019 +0800

                有选中无殊未灰bug修改

            commit 581c9dbc6f714c5e795a45102cb095cf84738522
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 14:04:07 2019 +0800

                杂音类单选bug修改

            commit 20a3edfe13f4c24c2748758f28bd488aa2ca6ea1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 09:37:07 2019 +0800

                推荐检查项没内容时,开单按钮置灰

            commit 970c4d7db52af55f2e9d39ce3401289683a8f297
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 17:39:35 2019 +0800

                常用药物治疗添加类名置灰状态

            commit 7e81b634b0952dc237048ee99f41364e360cea84
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 17:38:04 2019 +0800

                清除添加化验辅按钮浮动,打印医生名字位置,辅检标题小屏幕换行,模板接口进入页面没有调用问题

            commit f2cb21089d2c321a9cc6b5e666627c6a75e275db
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 17:25:29 2019 +0800

                数字键盘在组合中样式bug修改

            commit dd03327ec3396302fb66f3f60f7b24c0ff730e6c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 16:53:48 2019 +0800

                点击开单聚焦到医嘱

            commit 179d7080d06e284ed973d59c5a76ed3dc6a26daf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 16:43:01 2019 +0800

                重复修改,回退

            commit 7beb5f11bab81ae4535eaf2e61136ab71d06e0aa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 16:41:17 2019 +0800

                修改1024样式bug

            commit 7ad8183615802729dc3bbb6507c864a376e79bb6
            Merge: fca4a15 66e5e26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 16:07:59 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit fca4a15e3ab974f4c684496f43f76afa606a23bc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 16:06:12 2019 +0800

                回读div里的模拟placeholder清空,辅检出现两次,模板列表为空高度问题,火狐div清空还有个换行符去掉

            commit 66e5e26b6541d8923222f43852e56d91252a1c84
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:20:20 2019 +0800

                修改提示信息疾病说明菜单按钮光标形状

            commit ef15ad95e416155b911c474742cf526bbad9b041
            Merge: c051e01 8911ac8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:15:58 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit c051e0198219bc143a535bac13afa3dfcd90696c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:14:39 2019 +0800

                药品说明书多个Id查询

            commit 8911ac8887de34bdef955a59462f260fc2c6962b
            Merge: d31a749 37f085a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 13:19:19 2019 +0800

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

            commit d31a749c48b6f6b1e6725575fd09f84f71ebfd9b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 13:19:06 2019 +0800

                搜索后加标点测回

            commit 30000aad93762077ef746ef683fd2a47c14b3853
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 11:22:11 2019 +0800

                其他史查体搜索的标签后加逗号

            commit 37f085a3d788fd707c76bca36d9cd714f0d03742
            Merge: 9112336 13dce94
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 11:17:23 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 9112336c27d8e2c1c143b75b8d8bf03f85b528f1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 11:16:40 2019 +0800

                修改推送添加到诊断

            commit 13dce94fec6b39d0ddf4d0b0322bd84fadddc860
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 10:14:36 2019 +0800

                1024合并bug修改

            commit d1cb01259d8eab3933cd5166c6e39c6e9ec85516
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 10:12:56 2019 +0800

                同类药判断添加名称判断(有的同类药id为null)

            commit 536ab1e7dc67936fa9a586f8d55ad1c6d2ee60ba
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:41:41 2019 +0800

                修改药品说明书标题宽度

            commit c855d6416f7509f8ac7d6cb437790a11ad8d93d9
            Merge: feceb08 25a000f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:41:03 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 25a000f38ba5cdfb6fdb174c54341f9b058f2dd7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:40:26 2019 +0800

                Revert "修改药品说明书标题宽度"

                This reverts commit 576b54554b36e37ea0eb80e815ad381772b19cc5.

            commit 576b54554b36e37ea0eb80e815ad381772b19cc5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:38:52 2019 +0800

                修改药品说明书标题宽度

            commit 51a04b0d5f4f7124e9ae63240a32ed39b945f50b
            Merge: 644d713 0236d09
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:58 2019 +0800

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

            commit 644d7138c63af93af0e0286644367726d3da2ba0
            Merge: fa1380f c7236c8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:37 2019 +0800

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

            commit c7236c894382e11b0a4051f097643e857bf8f065
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:06 2019 +0800

                两边对齐火狐兼容

            commit fa1380f7bafb00efe15a3c1e487f162f2594a913
            Merge: e0bc863 96ced84
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:12:10 2019 +0800

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

            commit feceb083da47d70c70db09cc69ce6359e907ecb2
            Merge: 0236d09 e0bc863
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 20:10:43 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 0236d096817f2a3b0b04a67a3a44b3394014e267
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 20:01:41 2019 +0800

                药品禁用状态i图标不置灰

            commit 96ced84b7cd01fecf31a546ef58a2375bdfb2e37
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:00:10 2019 +0800

                说明书标题去空格

            commit a073a592d34258a699b123e4dec909cc0c4c73a8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:52:14 2019 +0800

                药品说明书排版

            commit e0bc863cca36de3ab8f8398352f72642780728d9
            Merge: 853319f 3fd13c2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:18:29 2019 +0800

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

            commit 3fd13c27d56310fc94d46f4e14f374a4de4dd8fa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:18:02 2019 +0800

                数字框蓝色背景显示修改

            commit 853319fd0394943edd4945e24701e837f71cf1ac
            Merge: 6211dfd 07d7ab9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:14:47 2019 +0800

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

            commit 07d7ab98655cbe928b1ac037bcd3889e59918dbb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:14:09 2019 +0800

                数字键盘输入优化,bug修改

            commit 6211dfdbb509b4fa4b555899887b119e2333ef41
            Merge: ca9f83c 4c41407
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 18:36:49 2019 +0800

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

            commit ca9f83c2e9296cb408f91cd53cdf7eae22a39993
            Merge: 2897015 d8fc333
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 18:35:58 2019 +0800

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

                # Conflicts:
                #	src/utils/tools.js

            commit d8fc333a180f46d4b4fad31cd39e1362e3b1f206
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 18:17:49 2019 +0800

                火狐placeholder模拟

            commit 4c414071774ef37e1ac57739d72e4b35e8456a8d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 17:43:26 2019 +0800

                双击删除标签时删除后面的标点

            commit 2897015cc3d9fd4bc687c88de707a965d30f1f80
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 17:07:24 2019 +0800

                清空等条件判断

            commit 298014e4aefc250ce60555d316be355b469abad5
            Merge: d8b2728 54ed95b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:55:02 2019 +0800

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

                # Conflicts:
                #	src/components/EMRContainer/index.less
                #	src/components/MainSuit/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/Operation/index.less

            commit d8b2728b1c4484c4327ea2fd1c5be54a87e802f5
            Merge: 827b9fe 6ff3c2f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:49:36 2019 +0800

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

            commit 6ff3c2f91b7a21f20081c4feb7cdbeb0fe94f61b
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 16:46:01 2019 +0800

                性别判断提示位置更改

            commit 827b9feb46ed370019aef767270dc98240a3a60d
            Merge: 3164918 f18aff0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:21:51 2019 +0800

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

            commit f18aff0c73b774231f1894446b877e67f7bf1bcf
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 16:15:52 2019 +0800

                其他史数据判断补充

            commit 3164918c9c57afd13cd89077ee356ed0541458f0
            Merge: a3c6497 0adcc7b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:42:23 2019 +0800

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

            commit 0adcc7bf5f39b10a3c2254cf1633d9ffd05e6073
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 15:40:14 2019 +0800

                数据判断有误

            commit a3c649762af9a4d8b66db4f678e62c708cca301b
            Merge: af35906 fa664ff
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:12:20 2019 +0800

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

                # Conflicts:
                #	src/components/PushContainer/index.less

            commit af359067b1d3c08d5329f89ab0565d9eeaa8d49d
            Merge: 4785b29 c33cd61
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:06:45 2019 +0800

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

            commit c33cd619b6aca13ec5a5fadbe66bfe4b71f5ed81
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 14:51:06 2019 +0800

                双击编辑蓝色边框

            commit 4785b29ea0eb3c58b5f508ddf9e2a65fd5b96247
            Merge: 942579e e665919
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:41:56 2019 +0800

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

                # Conflicts:
                #	src/components/PreviewBody/index.less

            commit e6659190bc72350a2b1848d30d1098aa61f29849
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 13:37:52 2019 +0800

                模板部分滚动条显示出来

            commit 942579e843fef29e00e4764d4acac312a51496ec
            Merge: 2b7ce81 7a014d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:35:56 2019 +0800

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

            commit 7a014d0d797d7e90f88a8d0f939c9845096b0411
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:35:18 2019 +0800

                有糖尿病bug修改

            commit a66f41acdd18acfa5dd6343178571743f1193226
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:32:44 2019 +0800

                其他史查体回读bug修改

            commit fa664ffcfa65bd1438999b0f9e79f99c80f7d531
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 11:30:05 2019 +0800

                删除诊断没有id时(添加名称判断)

            commit 86720794a59da37c8700f72e96740bcdf1906dc8
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 11:27:23 2019 +0800

                bug

            commit 3de2cf0c7fae1a0f1a994ee604f696d1f64c191e
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 11:09:44 2019 +0800

                1024下历史病例显示问题,清空主诉聚焦不在span

            commit 3f9e94c357e549318c1e79a04842a4c477d58974
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 10:03:29 2019 +0800

                pushContainer添加定位信息

            commit ec0a210bc616de96a0ed48df41300fcf95f6b1f3
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 10:02:01 2019 +0800

                预览宽度有误

            commit 2b7ce81ae4a157abf013f3b2f156b5d280f9403e
            Merge: 78fe295 de5b6f2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 09:52:32 2019 +0800

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

                # Conflicts:
                #	src/components/OtherHistory/index.jsx
                #	src/components/PreviewBody/index.jsx

            commit de5b6f2da0953c8bce31d166490d633f5c8d39c4
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:41:50 2019 +0800

                模板男女弹窗样式调整

            commit b2b959689c9b48b7e82b07766b7320952d649dbd
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:25:31 2019 +0800

                弹窗高度动态变化

            commit a2006f9c3a15df6225e8f5664e3f8330e9def1b7
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:22:25 2019 +0800

                弹窗宽度变化

            commit c6d4ec0ba654f8ed6d25c92f592c11fa8dfc0491
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 16:51:25 2019 +0800

                bug

            commit 8bfb380ec8366c43dbd2d3a0078ccc9f13816d62
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 11:10:18 2019 +0800

                连续两个句号处理

            commit fb65e9d6a4af98dcfafc8008963a59e9ef368dbb
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 10:45:55 2019 +0800

                判断是否为空只判断文本不判断结构

            commit 1749ad61e39543920defb0e8be1d7ce61a03a7bb
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 10:34:52 2019 +0800

                男女模板区分

            commit ef798e435a077495c1e84d3ca6893a7e78470119
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 17:28:30 2019 +0800

                模板性别

            commit 78fe295b3e69c7e7720b73ea67d3ffcc347f8554
            Merge: d5b22a1 3abdfe7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:25:11 2019 +0800

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

            commit d5b22a1659068387f4fd1cd0a76d10da296f9511
            Merge: 52a81ab e073408
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:24:55 2019 +0800

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

                # Conflicts:
                #	src/components/CheckBody/index.jsx
                #	src/components/MainSuit/index.jsx
                #	src/components/SpreadDrop/index.jsx

            commit 52a81abd66ca014880035ac04d229f22c54f9768
            Merge: 6b572c4 b133db8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:16:29 2019 +0800

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

            commit 3abdfe7396e7375d4d9a5fbafe0d11705494a101
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:35:13 2019 +0800

                其他史查体删到只剩一个文本标签时整行可落光标

            commit 65bf32b0cedb716f36c2d9bcba9cc79993a35cbc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:24:27 2019 +0800

                删除多余代码

            commit 333360a86405a53dc566e1db80812c62e9ada9df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:18:58 2019 +0800

                其他史查体提示优化,未获取到数据的情况优化

            commit b133db8b2ebe68183f0fca8a934b79e037ab2702
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 15:14:08 2019 +0800

                11

            commit 6b572c48f1c7b75e669aa328ab8d0c8271cd6a5f
            Merge: d7668cb 3131b2d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 15:12:02 2019 +0800

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

            commit 3131b2d66e39cb5df50b50a1512f3b3d7878cc83
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 10:56:58 2019 +0800

                主诉搜索框位置

            commit d7668cbc0bb1a57218083423f483367f6b6a1bbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 10:13:02 2019 +0800

                杂音类变量串bug

            commit 5ef7897748fe81cfc3a1e9e30a9cad9eb8576fac
            Merge: 77daf9d 0de92f7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:46:01 2019 +0800

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

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

            commit 77daf9d197cf583de16612dbc20339502081545f
            Merge: bd64c01 5479437
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:28:15 2019 +0800

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

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/SpreadDrop/index.jsx

            commit bd64c01ccec1e2ee37ad148b84aed1d064ae85d3
            Merge: 7dfd62a b380174
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:20:27 2019 +0800

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

            commit b3801745fb6938eb8bd727cc5b32ed7086dffdbd
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 20:15:51 2019 +0800

                化验文字太长显示省略号

            commit 33b3ef1bccc633bd90a57721429bcba5a4a71803
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 20:04:17 2019 +0800

                ie滚动

            commit 0de92f7a8175bb40e3ab8dc32b38ccc2b62d5cb4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 19:17:48 2019 +0800

                其他史查体提示bug修改

            commit ad5200304ddeec1bc1cead1e49f550319b1feff8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 19:04:44 2019 +0800

                单选双击编辑删光后失焦存值bug修改

            commit c1b9af5899a71f7398b2fd94a42770a59f77c7bc
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 18:59:06 2019 +0800

                数字带单位弹窗问题

            commit 7dfd62a2a867fd19a1ad80521c077eddd75bb484
            Merge: b901e9e a599e98
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 18:43:39 2019 +0800

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

            commit b901e9ed954d6502578623c1f28ea9edfe83dfbd
            Merge: b8b4174 a99d722
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 18:42:02 2019 +0800

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

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/CheckBody/index.jsx
                #	src/containers/eleType.js

            commit a99d722b957624438e91fb405418e8637f83f52f
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 18:32:09 2019 +0800

                滚动条弹窗调整

            commit ad1e46d28fbb2eeb3d894e82af6402aa8f4bf83e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 16:07:32 2019 +0800

                数字组件事件优化

            commit a599e98ab469a915bf759d3c08693ee313c13fa6
            Merge: 0d67c39 b8b4174
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 15:03:38 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 0d67c39cf1c0cb0949f3e98869b660c5de42ebd3
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 15:00:24 2019 +0800

                修改治疗方案药物治疗类名字段

            commit 27aced28537943a5b75cdaec24ad1f65ccec9477
            Merge: bc555b0 b8b4174
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:40:18 2019 +0800

                Merge branch 'dev/new1' into dev/otherHis

            commit b8b4174d5b561c963a269b29d737eec0a58f6889
            Merge: 27d6b1a e11a555
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:19:59 2019 +0800

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

            commit 27d6b1aed64dbe80fe158dbe620f1c8f9ecda70f
            Merge: 5ae0fe1 1a7645e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:19:36 2019 +0800

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

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/store/reducers/checkBody.js
                #	src/store/types/checkBody.js

            commit 5ae0fe1ebf36274d45e5a7d70709f655a54fa0be
            Merge: 6af13c9 bfad6c4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 09:46:23 2019 +0800

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

            commit e11a555129229f1ddb189c1a912f1d781270eac9
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 09:45:41 2019 +0800

                搜索结果去除诊断中已有诊断

            commit bc555b0a62f3d06017256e567738e1796f254a82
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 09:41:47 2019 +0800

                其他史删除不必要事件

            commit 8638209c04be43066a35ad6fab211e92bbd637b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 20:03:29 2019 +0800

                删除console

            commit 08da5c25ae264534d19e3c4fa7c5e370b3e0d456
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 20:01:46 2019 +0800

                诊断搜索添加同义词

            commit 9f0f76b675ccb06b8cb0d3655680a238d7cc4ae3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 19:46:31 2019 +0800

                ie8子标签灰显bug

            commit 10ec058189f5bbee4d5dcb47a45001988ca3d870
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 19:28:05 2019 +0800

                修改版本号和免责声明字体颜色

            commit e627b67e63d6fa3c1d4faa9ab492c0bf4d8ee1c1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 19:22:48 2019 +0800

                开单项没选择时,不跳到医嘱

            commit c60e17b33180d7485a46ca9e98c0ed16c7775f2a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 18:32:50 2019 +0800

                注释同类药物双击打开药品说明

            commit bfad6c404134c5268b07a2c79f1f8a386f952bc8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 18:20:17 2019 +0800

                诊断延迟搜索

            commit 69b02c93e3b2afb26f44733c2ef9558e2852047e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 17:04:52 2019 +0800

                查体既往史类事件处理添加

            commit bdc074220b4d662818d430e56e7f9796efd06537
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:58:12 2019 +0800

                其他史乙肝有高血压顺序勾选bug修改

            commit 48abc323e58cf8f400c0371b5cdff14fdf54b4d9
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 16:57:11 2019 +0800

                nothing to do

            commit f6f6e023919d536dd60b746e6f3b0b3267c332c2
            Merge: 3b8fdf4 6af13c9
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:51:35 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 3b8fdf425f7cd93dbb736cfe8bcb90ac72b900bf
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:48:56 2019 +0800

                通过ID搜索药品说明书(添加数据时查看药品说明书用)

            commit 6af13c94c3cb901fbc0e49f77ecb45f1950b4fbc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:26:45 2019 +0800

                翠加

            commit e1af9c88f74e6483b81850953f1af2051040e677
            Merge: 5ae9b8f 012bb7f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:21:57 2019 +0800

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

            commit 5ae9b8fae1e7d1f56f160b6f2d621b8d6e53658d
            Merge: 8decc9d 5b1feca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:21:38 2019 +0800

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

                # Conflicts:
                #	src/common/components/SearchOption/index.jsx
                #	src/common/js/func.js
                #	src/components/CheckBody/index.jsx
                #	src/containers/CurrentIll.js
                #	src/store/async-actions/homePage.js

            commit 8decc9d3e8255de2c81420a833e69582686aafdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:19:15 2019 +0800

                罗磊修改

            commit 012bb7f0ea4d0ec66f313834b0e97beed46c028f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:17:54 2019 +0800

                药品说明图标增加鼠标进入状态

            commit c4ea61552060862a541493087ec096a413cbca2c
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 16:12:30 2019 +0800

                高度计算有误

            commit 50769d9e8a9845954a58145e5b7041b131729b67
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 15:59:38 2019 +0800

                标点预览

            commit 4a8b8a17d9b784225eaa07d67925752339418ee1
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 15:49:58 2019 +0800

                滚动条问题

            commit a4f1c2776effa4bfb1c9628d48cee2a755d8558b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:36:47 2019 +0800

                诊断搜索增加搜索值为空情况

            commit cd77c307ae34abe8cfb6fb53f235beb8f43d884d
            Merge: ac44ed4 f7ec699
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:28:05 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit cee1138681863aa93e2374d48707171b294c0032
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 15:24:41 2019 +0800

                预览行内样式部分修改到less中

            commit ac44ed44fed7b42457e2dfc60b9ab13c97e0ced5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:06:10 2019 +0800

                提示信息疾病详情页右侧菜单

            commit 816fa09299c0177beac8573e50be4c86495a37f2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 14:59:20 2019 +0800

                标点灰显bug修改,下拉对应标签高亮颜色修改

            commit 3330385dd3ea7b2b419f5dbb92f05f8a20bc3c39
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 14:09:59 2019 +0800

                标点符号跟前一个标签灰显黑显

            commit b77a4e183b8413cbac1b663233b3382c7641857d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 13:43:26 2019 +0800

                修改诊断搜索参数

            commit b1f56da5d60d2944c4bbc8a8ccc61548f08b55e1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 13:26:29 2019 +0800

                纯标点符号不搜索,查体获取数据bug修改

            commit d6849d30404fe7d3346909a7e10bc894d1f2ba33
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 11:39:43 2019 +0800

                只有标点符号时不搜索

            commit 4f7c951a117bec49fa853071847422a8dbf51e9a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 11:23:42 2019 +0800

                单选组件双击编辑删完后失焦显示重复值bug修改

            commit d771a09a5fc4e3e7af92e3ff3c85ed44975b2648
            Merge: 28cd3ba f7ec699
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 11:13:20 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 28cd3bac18b0daa796f8a1a9292db3a24cb8e862
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 10:41:36 2019 +0800

                主诉数组多个空格元素处理

            commit 790d34dc38e886c3df1e67603922838f904e4ea7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 09:48:25 2019 +0800

                药品说明书鼠标指向方式

            commit f7ec699eb2b493c4bbbd0ee60194b639a6c8b8e8
            Merge: 6c245fb 909ab25
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:43:41 2019 +0800

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

            commit 6c245fb0901d2234a0aef7568039651dd4cdf91e
            Merge: 96cc574 e36be2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:43:15 2019 +0800

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

                # Conflicts:
                #	src/common/components/SearchOption/index.jsx
                #	src/common/js/func.js
                #	src/common/less/variables.less
                #	src/components/Operation/index.jsx
                #	src/components/PreviewBody/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/SpreadDrop/index.jsx
                #	src/containers/CurrentIll.js
                #	src/store/async-actions/patInfo.js
                #	src/store/reducers/assistCheck.js

            commit 197b0e5b453fa4446f71b728768baa67e5ab4700
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 09:42:48 2019 +0800

                修改版本信息字体大小

            commit 96cc574ab24f3da14e1f89610e6c5a1e451fa051
            Merge: 5a2d97b fe9e87d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:35:47 2019 +0800

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

                # Conflicts:
                #	src/common/less/variables.less
                #	src/components/PushContainer/index.jsx
                #	src/utils/tools.js

            commit fe9e87d5e0735c356cc4041292dad4ce9cce18dc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 17:30:38 2019 +0800

                搜索为空清除列表数据

            commit 909ab253717bafa4c9ffb3164441d8554e17ed03
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:27:10 2019 +0800

                输入框添加行高

            commit c870ce40e66ec3471bd8ab660346d41ca6374891
            Merge: 82c0130 cb47bc5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:12:48 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 82c013012b1ec9adad9ea974c609c785bae349b2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:12:26 2019 +0800

                删除console

            commit 656a2e69d55a87696a52780074cdb97ebf72c3e5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:03:22 2019 +0800

                提示信息详情页弹窗显示

            commit 94a46327141d7b22d245afbfef4908fca8b852df
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 15:50:52 2019 +0800

                化验没有参考值正常显示

            commit 5a2d97b0f644ef6172cce575e520ca3000cef9b0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 15:28:39 2019 +0800

                ie8点开下拉未选值存值bug修改

            commit 23f6f91a57f4c57826e5cd4adc6aea676a21751e
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 15:19:16 2019 +0800

                1.ie8自动转换中文为unicode导致判断有误
                2.阴影改为边框
                3.主诉现病史删除得到数组里有空元素处理

            commit 5e1184e69747c823a1ce3bba657332f1443f802b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 15:15:35 2019 +0800

                回读无查体点击唤出模板

            commit 48a9a00b3b5b31e499d32f8f6edbbda57390e721
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 14:30:22 2019 +0800

                切换模式其他史数据bug

            commit 4717362f96dd641518ca546c2b270a2c3f6d5002
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 11:38:42 2019 +0800

                血压类文本子标签存值

            commit 08f9160a8e26952c695d9563ece0cef09d7e6164
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 10:59:43 2019 +0800

                清除移除患者信息缓存

            commit cb47bc5b79d7f6e319a1b837d27012841925c678
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:16:42 2019 +0800

                翠翠分支未合单独添加

            commit 2a770d6266f8c7f5f0bd892befa6fa69166487bd
            Merge: 3e68866 86e1d1d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:17 2019 +0800

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

            commit 3e688668bdaf2d376901cfa70a90a3587ad7ff69
            Merge: dc08557 4f90da8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:11 2019 +0800

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

            commit dc0855703def7c3a0c56c74d0b033b42657cb62e
            Merge: 13db5c1 db268fc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:02 2019 +0800

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

            commit 4f90da88492079a14a3c167d364cc6b0160c668c
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 16:58:38 2019 +0800

                弹窗关闭时机

            commit 13db5c1cccec8c7f3ac5cb72d19aaf05a5bb63e4
            Merge: 58cffc8 6e906e0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 16:56:59 2019 +0800

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

            commit 6e906e06753a119829e67db34a0e32e1c2d1a4db
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 16:23:12 2019 +0800

                查体选中杂音血压选中状态bug修改

            commit 1e57bc5dc0b63eaaa040d59d53c9f1a9409d2030
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 15:42:03 2019 +0800

                单选组件下拉项可和名称相同

            commit 9318dc730440ce833cd1317aed52699572208224
            Merge: 58cffc8 db268fc
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 14:21:22 2019 +0800

                Merge branch 'dev/byll' into dev/new1

            commit db268fc6f4c11065e36e4405170bd08e667ce6fa
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 14:19:41 2019 +0800

                ie8搜索单个文字删除报错问题

            commit 86e1d1df0baee680a7c5bf99e8d6cbae4284c83c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 14:15:14 2019 +0800

                治疗方案药品说明显示方式

            commit 1391edf5cda27a44817030cb9fef6486da15b51e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 14:14:41 2019 +0800

                下拉框打开时标签边框蓝色

            commit 758555c01c184adde48fb869909a1b9fdb77f4b1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 13:50:39 2019 +0800

                箭头函数传值性能问题修改

            commit 8e25532ad88b1ca014acaaffb61155f3f62e8c64
            Merge: 7a78823 58cffc8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 09:48:15 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 58cffc89d51661f2edbd21e1424fdd29afd590f9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 18:21:01 2019 +0800

                上次提交回退

            commit 4ca59db29b1a256c9b3015646301c0105cead455
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 18:13:57 2019 +0800

                数字组件ie8输入报错参数无效bug修改

            commit 5afd59399265b3a516e35317687946d2df551c9b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:59:35 2019 +0800

                删除多余代码

            commit d56b647e2f32fc9e5a50e58376d1677076b9c5c0
            Merge: deb3340 e5ee60b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:57:54 2019 +0800

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

                # Conflicts:
                #	src/containers/CurrentIll.js
                #	src/store/actions/mainSuit.js

            commit 6c4e29739d3dbe45b1843f5a5fb2c054784d0739
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 16:55:03 2019 +0800

                ie8右浮动不生效

            commit deb33405ce270e3b1495e51fd537fa6d56f1a615
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:54:34 2019 +0800

                免责声明弹窗层级bug修改

            commit 15718f043d724dd440aab0d23c6eaf3cf54d2059
            Merge: c2f5a1e 0ca5c1f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:34:51 2019 +0800

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

            commit c2f5a1e29bd29942c2faa59fd4fd645bbe50a814
            Merge: a1c28c3 19f31f4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:17:11 2019 +0800

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

                # Conflicts:
                #	src/components/AddAssistCheck/Textarea/index.jsx

            commit 0ca5c1f1aa7ce0b7c558cd53b0c4fc19ad096f90
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 16:13:59 2019 +0800

                11

            commit a1c28c3d77f4d5d27b7ec1ef0ceb1aaf8a6afdb4
            Merge: 8bc39fc 3dbeabd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:13:41 2019 +0800

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

            commit 3dbeabd15713010eb953dcee9c619e0cb4e89baa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:10:56 2019 +0800

                弹窗层级修改

            commit b34feffbe308202a21d56c822371d5900e4d784c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 15:53:02 2019 +0800

                其他史无主诉第一次提示后不再提示bug修改

            commit 541a45685981ece9caf11ef7ee13d871e1aaaf27
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 15:47:44 2019 +0800

                搜索框下拉位置bug修改,杂音文字为多行时下拉遮挡文字bug修改

            commit b9bb9cba1fe356d94bdc64a1caa4b60460bdef68
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 15:36:55 2019 +0800

                复制内容样式乱掉问题解决

            commit 9641e6a1c9fd1fefa66a4324401cf38d60e29cf3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 14:37:35 2019 +0800

                无殊选中状态遗留bug修改

            commit 641c5762b7f7f98d532eb23fc97f881d33575222
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 14:18:44 2019 +0800

                打印相关样式修改ie待测

            commit e93c7c1557bee766ff94dfa4952cdf2f69c4e926
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 13:51:30 2019 +0800

                用户信息banner不被下拉框遮挡,杂音选中样式修改

            commit 64d1cffdb7e562263084ba5827df988a099ec7b7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 13:26:25 2019 +0800

                杂音类型下拉样式优化

            commit 08ab0d25e5c54f3535156e248de5063ff4454a2f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 11:31:31 2019 +0800

                其他史查体tagType4类型搜索选中展开

            commit a96e98a90f83c7d0e625f973b79cb65d33792623
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 10:48:50 2019 +0800

                获取模板接口放在获取病人信息回调中,确保参数不为空

            commit 19f31f4d19c841c9a0a86be849d749815e27a1c1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 09:43:48 2019 +0800

                修改标题点击enter问题

            commit 8bc39fc836e6f24fc599d8d679164f7412ac71f3
            Merge: 993eaf0 6fe34e5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:56:44 2019 +0800

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

                # Conflicts:
                #	src/components/AddAssistCheck/index.jsx
                #	src/components/Inspect/index.less
                #	src/components/NumberDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/store/actions/checkBody.js
                #	src/store/actions/mainSuit.js
                #	src/store/reducers/assistCheck.js

            commit 993eaf02f2d5d2b0244587ed7096d1fcf9659465
            Merge: 11260ee 6ca010f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:52:56 2019 +0800

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

            commit 6ca010f83a2b882163bfaf3ee7f125f45e8d5ce3
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 17:36:47 2019 +0800

                字体不一样,button问题

            commit 8433d68d9027b2c31c5db2da33182c1507f08f9b
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 17:12:29 2019 +0800

                更改中文冒号,修改辅检div样式,添加搜索ie8兼

            commit 11260eeb9c9958368e933981df83e4e097a04c9d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:08:07 2019 +0800

                杂音类型双击编辑blur后重复输入值bug修改

            commit 2911db7154036da7df72eb04b6e2a35b32c71106
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:48:08 2019 +0800

                双击编辑前后缀bug修改

            commit 6eef6a051d230f9f52a1df2ae6b5e3044c7b3505
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:33:58 2019 +0800

                主诉-其他史组件双击编辑前后缀存值

            commit 00f2e00fb09170526cd4101b320ece3b694e28f3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:07:49 2019 +0800

                查体数字组件双击编辑前后缀存值,血压类型标签双击编辑时不显示下拉框

            commit 8019239ea85bf8e66de7adff69d1fcc9b94eb226
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 13:57:24 2019 +0800

                修改ie8多[]bug

            commit 70689ffbb3b43af0bcd21e0c6898855ede313faa
            Merge: aca9d8f 3fe1212
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:36:41 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit aca9d8f6b118a3653050c6f59cbed645ac1b824d
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:19:43 2019 +0800

                判断模板保存前后是否相同

            commit a643a04284503f3491206a6da28f02e3b239bdfd
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:03:33 2019 +0800

                打印保存判断问题

            commit 665613f2a02a496e485917ee653ba58e4744fa7d
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 09:38:25 2019 +0800

                写死参数更改

            commit 3fe1212b9a37b328037ea87e8ed83b83bc71a5a6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:56:33 2019 +0800

                其他史提示无主诉时可输入bug修改

            commit d895d0391f5389858501b5be2d98c93516740f1a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:29:35 2019 +0800

                查体框可编辑状态删除

            commit 0ea49aca9cfc5399c0d074c81fe7a330a76ed40b
            Merge: 2799250 2facfcb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:19:21 2019 +0800

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

                # Conflicts:
                #	src/containers/eleType.js
                #	src/store/async-actions/treat.js

            commit 2facfcb8073c095fa0b6ae3eb54566fb072d7c85
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:15:41 2019 +0800

                查体获取数据失败时可输入bug修改

            commit 141ab5430c47c52bcff13dc7d34cc5a7fa134d4c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 15:12:53 2019 +0800

                其他史查体搜索结果放前后bug修改

            commit 9572b216a7c48e9947d3ce028b10f5849cb72102
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 14:34:34 2019 +0800

                其他史搜索选中位置bug修改

            commit ee5b7c3eb6a0e6328e2ee500deca54b756d69848
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 13:48:27 2019 +0800

                搜索bug修改

            commit c7e0483300e2188b162ce41063d38a50706979aa
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 16:34:50 2019 +0800

                11

            commit 7a7882300853f5a273686f709ab0462ad706a8f0
            Merge: 420bcf7 2799250
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 15:28:00 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 27992500bd6cd1d92f6cc4411a8436f36ef565d0
            Merge: 9573ac3 945c448
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:57:17 2019 +0800

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

            commit 9573ac3a696fa8e206e5a46e588dc4daad049381
            Merge: c90d43b fbbb8fb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:57:10 2019 +0800

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

            commit c90d43b677ba6dbaad86bd1fc8d4731eb46165b5
            Merge: d2c86ef 81e413f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:56:09 2019 +0800

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

                # Conflicts:
                #	src/containers/OtherHistory.js

            commit 81e413f1f4296fc8bcc22485e5779ddb776478f1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:53:45 2019 +0800

                之前修改的bug找回

            commit 420bcf750b1e316f23b750de4985441221ef0a5c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 14:53:11 2019 +0800

                修改同类药物样式

            commit 3bf089d9605e75bf7511e9d42fa6b03c9c6066b1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:44:35 2019 +0800

                改为全局弹窗显示

            commit fbbb8fbbb040b404ee7307b1b95505cea783626a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 14:38:23 2019 +0800

                修改添加诊断推送

            commit e1240a8e9f409aa5e4382e2bc0ef63ed6ff0a1dd
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:20:22 2019 +0800

                弹窗高度动态设置

            commit d2c86efb89cba523db9c587e7d8435a4b2be8531
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 11:16:53 2019 +0800

                无选中项体温输入bug修改

            commit aa6d15a7c141f10f275f1fc470d0eba476ffc4b2
            Merge: 9f91346 1fccd43
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:57:06 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 9f91346e73a2a64ce463baf32723a8c9e3b9cc05
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:55:41 2019 +0800

                bug修改

            commit 1fccd439ee53729685732eeb6fbbfe1be0eda80d
            Merge: 986a3cf 2e25c1b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 09:58:11 2019 +0800

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

            commit 3385c2c2a41d0b223136f5f176487cce09e1c082
            Merge: b876b6b 2e25c1b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 09:51:36 2019 +0800

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

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit e697f350f7724505282d06dfa0dc2ae001ea9c09
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 09:46:57 2019 +0800

                 删除console

            commit 2e25c1bb7076358b6e4063ced5731c3f456eb704
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 09:40:43 2019 +0800

                诊断第一个为复诊添加到主诉

            commit 986a3cf5976bfec9bce6afb554bab1f4a1a2a49d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:33:59 2019 +0800

                合并

            commit c900ae632d99d0c0fb2e2e5f9788707ada02745a
            Merge: 31ef38b b7bfe2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:18:38 2019 +0800

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

                # Conflicts:
                #	src/components/AddInspect/index.jsx
                #	src/components/CopyRight/index.less
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Inspect/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/Treat/index.jsx
                #	src/components/Treat/index.less
                #	src/containers/NumberUnitDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/diagnosticList.js
                #	src/store/async-actions/treat.js
                #	src/utils/tools.js

            commit 31ef38b3d5b46612b64866687214c2b9d1651b03
            Merge: 44fbf2b d6751d9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:05:17 2019 +0800

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

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/CopyRight/index.less
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Inspect/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/PushItems/index.less
                #	src/components/SpreadDrop/index.jsx
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/utils/tools.js

            commit 44fbf2b8d8f90640a9af8abe4da55c2af7efa319
            Merge: db4e755 935c0cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:52:43 2019 +0800

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

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

            commit db4e7559fb2bc15434058503ca8d1a1e3ffe8ad6
            Merge: edb84b0 9483642
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:44:26 2019 +0800

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

                # Conflicts:
                #	src/components/TreatDesc/DrugInfo/index.less
                #	src/store/async-actions/treat.js
                #	src/store/reducers/treat.js

            commit edb84b07adad34cdd5c94a592e543127d20eaec1
            Merge: b876b6b 6b71cd5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:35:50 2019 +0800

                更新

            commit b876b6b8dc6afe12ae2a90c990d147e32221d02c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 14:38:05 2019 +0800

                其他史有伴无排序

            commit f8ab9c103e8266a6ab44466a7fadbc1f0a91ceca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 14:06:33 2019 +0800

                查体搜索自由文本位置bug修改

            commit e45296e22263659c86f60d031bc5246c7f1be726
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:51:40 2019 +0800

                复诊主诉文本模式bug

            commit f5cae58692247cad7c0b3ff8966a2f7d5213069c
            Merge: 960317d d3e160a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:39:27 2019 +0800

                Merge branch 'dev/new1' into dev/otherHis

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

            commit 960317de925978075041b722cd3500488ce924fd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:36:13 2019 +0800

                双击隐藏下拉

            commit 06571b04a337a3805d723e22e964c5ba683293f5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 10:28:18 2019 +0800

                主诉saveText无值则判断为空,查体其他史聚焦提示

            commit 94836425d1dc9b9cf5cc1f2ce6f3bdc3706fd578
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:50:58 2019 +0800

                修改版本信息样式

            commit e0092d7003c2bcfecc38a77350d29ddc1a92dbf2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:40:32 2019 +0800

                关闭药品说明书时清除内容

            commit a921420ddd0b8c4c8101b1d5bb1d7fec8e422341
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:01:15 2019 +0800

                修改治疗方案和药品说明书样式

            commit 935c0cf687389a50aeef502b97f07685e675bd1d
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 17:16:52 2019 +0800

                滚动兼容

            commit 6b71cd51bbafd8c4283b1c16fae3a538a88f5651
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:54:56 2019 +0800

                现病史病程变化

            commit 91c3713c62e8eb4b9437b00d754133e87561d8cc
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:36:48 2019 +0800

                注释scrollTo

            commit 2123a1e9839af1052e1405d6a005ddf521041c9d
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:10:44 2019 +0800

                Squashed commit of the following:

                commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 16:00:51 2019 +0800

                    打印医生签名自动获取

                commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 14:09:41 2019 +0800

                    样式调整

                commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 14:02:27 2019 +0800

                    化验填写单清空按钮,弹窗还在

                commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 13:46:36 2019 +0800

                    模板列表获取时机

                commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 13:34:03 2019 +0800

                    模板名称重复弹窗不关闭

                commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 10:46:13 2019 +0800

                    模板保存跟之前所有保存的模板作对比

                commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:35:01 2019 +0800

                    底部几个按钮换行设置最小宽度

                commit 7400613a1eb642e1d01004c7818883fd73c2350c
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:28:45 2019 +0800

                    历史病例时间和按钮不能共存

                commit eda3f4b08a3460360541cd2af1c2ca071681c595
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:12:47 2019 +0800

                    bug修改

                commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 15:54:49 2019 +0800

                    还是符号处理...

                commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 14:17:40 2019 +0800

                    顿号去重

                commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                Merge: 4095b3f b09559b
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:59:54 2019 +0800

                    Merge branch 'dev/new1' into dev/byll

                commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:55:47 2019 +0800

                    样式宽度更改和逗号处理

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

                # Conflicts:
                #	src/utils/tools.js

            commit 6df92ea9ddd29c14979874f2f0e7eac54d032eaf
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:07:27 2019 +0800

                Squashed commit of the following:

                commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 15:20:06 2019 +0800

                    治疗方案样式

                commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 15:18:20 2019 +0800

                    修改治疗方案样式

                commit 859a7364a96569f6aa92360efbce5a19b40681cb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:32:44 2019 +0800

                    修改治疗方案小标题样式

                commit 99789b23f06c18e5b588552066faf7f2ccacf198
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:07:48 2019 +0800

                    修改治疗方案同类药物

                commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:00:40 2019 +0800

                    修改弹窗IE8不居中

                commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 20:30:39 2019 +0800

                    治疗方案高度自适应

                commit c000d83fb6ac5f265951c0e1377b627d24d2da10
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 17:27:30 2019 +0800

                    修改治疗方案边框

                commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:58:28 2019 +0800

                    导入化验结果,第一次添加诊断为主诉时不往主诉添加字符串

                commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:56:03 2019 +0800

                    治疗方案标题添加疾病名称

                commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:22:37 2019 +0800

                    修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:41:20 2019 +0800

                    ie8治疗方案遮罩

                commit fee35d5473b69aafb5335759006a93fea8d14145
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:05:16 2019 +0800

                    治疗方案遮罩IE8

                commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:04:58 2019 +0800

                    修改右侧推送字体大小

                commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 13:26:56 2019 +0800

                    修改化验项开单逗号问题

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

                # Conflicts:
                #	src/components/Treat/index.jsx
                #	src/components/Treat/index.less
                #	src/store/async-actions/diagnosticList.js
                #	src/store/async-actions/treat.js

            commit 20f96c311119b635dad33f6c9222d94d8563bbfe
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:02:31 2019 +0800

                Squashed commit of the following:

                commit 27178b569e9575d450bbf1ce329e069d4c4b4b8c
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 30 15:57:20 2019 +0800

                    ie8现病史添加症状报错的问题&查体血压选中不变黑的问题

                commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 18:17:15 2019 +0800

                    查体模板添加逗号,主诉两个时间处理
                    Squashed commit of the following:

                    commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:51:09 2019 +0800

                        Squashed commit of the following:

                        commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 14:17:40 2019 +0800

                            顿号去重

                        commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                        Merge: 4095b3f b09559b
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:59:54 2019 +0800

                            Merge branch 'dev/new1' into dev/byll

                        commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:55:47 2019 +0800

                            样式宽度更改和逗号处理

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit fea9a721ccb5afb9f1873c2111e3722d7330d394
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:50:07 2019 +0800

                        Squashed commit of the following:

                        commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 15:22:37 2019 +0800

                            修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                        commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:41:20 2019 +0800

                            ie8治疗方案遮罩

                        commit fee35d5473b69aafb5335759006a93fea8d14145
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:05:16 2019 +0800

                            治疗方案遮罩IE8

                        commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:04:58 2019 +0800

                            修改右侧推送字体大小

                        commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 13:26:56 2019 +0800

                            修改化验项开单逗号问题

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

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

                    commit 2c70e41e7a5254838436b499b1ad787f523585f8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:42:54 2019 +0800

                        Squashed commit of the following:

                        commit 519f23c91954f87e836cbd400b158f774c498ba6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Tue Jan 29 15:35:59 2019 +0800

                            文本删除又出现的问题
                            Squashed commit of the following:

                            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Tue Jan 29 11:44:56 2019 +0800

                                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:41:03 2019 +0800

                                Squashed commit of the following:

                                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                                Author: Luolei <16657115156@163.com>
                                Date:   Fri Jan 25 14:06:09 2019 +0800

                                    date修改

                            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:38:40 2019 +0800

                                Squashed commit of the following:

                                commit 29b2499b796085a682a936d82c97decc35edf891
                                Author: zhangxc <zhangxc@zjlantone.com>
                                Date:   Fri Jan 25 13:50:07 2019 +0800

                                    修改版本信息和免责声明位置

                            commit e36f2f1b811d6978117161f50b16dd5bae298547
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:33:30 2019 +0800

                                Squashed commit of the following:

                                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 15:59:14 2019 +0800

                                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 14:21:41 2019 +0800

                                    Squashed commit of the following:

                                    commit d3e160a516240b77576567b993223816a68231a6
                                    Merge: 79e63ed c7e9e73
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:16 2019 +0800

                                        化验辅捡ie8搜索卡死修改

                                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:12:43 2019 +0800

                                        默认host地址删除

                                    commit e01035349f92405572238a0a97d80bb557dda802
                                    Merge: 8a8015d caad36f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 10:59:52 2019 +0800

                                        修改样式

                                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:46:01 2019 +0800

                                        合并报错修改

                                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                                    Merge: bbe85ff 58e0fdd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                                    Merge: b86268a 3bfa819
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/containers/SpreadDrop.js

                                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                                    Merge: 79c59d3 105488f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                        # Conflicts:
                                        #	src/store/async-actions/treat.js

                                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                                    Merge: db90e04 de190a5
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 20:18:42 2019 +0800

                                        中英文逗号

                                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 18:31:55 2019 +0800

                                        去掉英文逗号

                                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 17:22:34 2019 +0800

                                        修改治疗方案

                                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 16:49:10 2019 +0800

                                        下拉项间距调整,ie8事件兼容

                                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:09:49 2019 +0800

                                        药品说明书样式

                                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:08:17 2019 +0800

                                        修改药品说明书

                                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:06:17 2019 +0800

                                        修改开单样式

                                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:02:30 2019 +0800

                                        修改获取患者信息路径

                                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:43:38 2019 +0800

                                        添加诊断判断有没有治疗方案

                                    commit f617e5c267246786e7a6801cc87811f0d2527235
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:39:13 2019 +0800

                                        merge from 'dev/zxc'

                                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 10:33:44 2019 +0800

                                        提示语

                                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                                    Merge: d3ade00 95e9a94
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                        # Conflicts:
                                        #	src/components/DiagnosticList/index.jsx
                                        #	src/components/Operation/index.jsx
                                        #	src/containers/SpreadDrop.js
                                        #	src/store/actions/otherHistory.js
                                        #	src/store/async-actions/treat.js
                                        #	src/store/types/checkBody.js

                                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                                    Merge: 2fd497e 2458ea1
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:03:28 2019 +0800

                                        提示语消失默认时间改为2秒

                                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 10:02:00 2019 +0800

                                        治疗方案置灰

                                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:59:16 2019 +0800

                                        治疗方案

                                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                                    Merge: 62bd7fb 38f9720
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:47:47 2019 +0800

                                        Merge branch 'dev/new' into dev/zhangxc

                                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:32 2019 +0800

                                        Revert "Revert "修改药品说明样式""

                                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                                    Merge: 28c364a c37d1cc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:45:29 2019 +0800

                                        Revert "修改药品说明样式"

                                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:25:58 2019 +0800

                                        搜索列表显示样式更改

                                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:15:40 2019 +0800

                                        样式调整

                                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:22:29 2019 +0800

                                        修改导入host

                                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:15:44 2019 +0800

                                        临时修改版本弹窗高度

                                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:10:27 2019 +0800

                                        化验导入删除填值推送

                                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:43:48 2019 +0800

                                        添加删除辅捡右侧推送

                                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:30:50 2019 +0800

                                        修改杂音选中项bug

                                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                                    Merge: b489e52 6a1a3df
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:57:50 2019 +0800

                                        既往史无殊选中bug

                                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 18:57:03 2019 +0800

                                        css

                                    commit 96efc7b8118a99db629f898960621b98786bd42e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:26:40 2019 +0800

                                        合罗磊分支

                                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:49:02 2019 +0800

                                        回退

                                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                                    Merge: 6732dbb 1dd6c92
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                        # Conflicts:
                                        #	src/common/components/TailInlineTag/index.less
                                        #	src/common/components/Textarea/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx
                                        #	src/containers/OtherHistory.js
                                        #	src/store/actions/otherHistory.js

                                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                                    Merge: bc168f8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx

                                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                                    Merge: 3559798 6d55c59
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:31:13 2019 +0800

                                        既往史下拉滚动条添加

                                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:22:01 2019 +0800

                                        修改请求地址

                                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 17:16:22 2019 +0800

                                        辅检横向滚动

                                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                                    Merge: adc853a 45b1158
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit cf97be2f425bdef386a137e92929969c321ab047
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:08:25 2019 +0800

                                        去掉一个字

                                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:01:26 2019 +0800

                                        bug

                                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 15:58:40 2019 +0800

                                        其他史高血压选中bug修改

                                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 15:16:32 2019 +0800

                                        删除项有问题

                                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                                    Merge: d2eca9d 1a6bf74
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:59:26 2019 +0800

                                        Merge branch 'dev/liucf' into dev/luolei

                                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 14:51:07 2019 +0800

                                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:43:46 2019 +0800

                                        日期bug

                                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:46:29 2019 +0800

                                        请求地址修改-刚才反了

                                    commit 70e9420d59b745c59f3abe04c33100777184d024
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:44:13 2019 +0800

                                        请求地址修改

                                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:39:05 2019 +0800

                                        打印图标

                                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:31:48 2019 +0800

                                        其他史高血压数据展开

                                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:00:06 2019 +0800

                                        查体type修改

                                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:58:27 2019 +0800

                                        查体type修改

                                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                                    Merge: 4b8aa34 540b6a8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:51:52 2019 +0800

                                        Merge branch 'dev/new' into dev/luolei

                                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:47:15 2019 +0800

                                        搜索弹窗被遮挡问题解决

                                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:23:04 2019 +0800

                                        地址临时修改

                                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:20:05 2019 +0800

                                        版本信息弹窗高度限制

                                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:13:40 2019 +0800

                                        推送接口主诉现病史合并,治疗方案容错

                                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                                    Merge: 4a897b4 5a39d90
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                                    Merge: 7f1c7c8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:43 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/common/components/ItemBox/index.jsx
                                        #	src/components/AddInspect/index.jsx
                                        #	src/components/Diagnosis/index.jsx
                                        #	src/components/Diagnosis/index.less

                                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:52:01 2019 +0800

                                        层级问题

                                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                                    Merge: e5d0122 7f1c7c8
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:21 2019 +0800

                                        11

                                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:39:50 2019 +0800

                                        修改请求地址

                                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:38:05 2019 +0800

                                        修改请求地址

                                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                                    Merge: df67559 a82d18c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                                    Merge: ff817bf 6805811
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                                    commit 68058110e041e72b8c95979a4fd23e690912746b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:43:26 2019 +0800

                                        遮罩统一0.6透明度

                                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:34:59 2019 +0800

                                        透明度ie8

                                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:24:39 2019 +0800

                                        修改治疗方案无内容按钮置灰

                                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                                    Merge: 9c0e078 84ec971
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:09:22 2019 +0800

                                        merge from 'lcf'

                                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 19:01:31 2019 +0800

                                        修改药品说明样式

                                    commit ff817bf6d6d928b98557371362374859bec3aabd
                                    Merge: d50ffe0 b2e679a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:50:45 2019 +0800

                                        导入ie8暂时先灰掉

                                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                                    Merge: 573f0b5 b286d0a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:23:57 2019 +0800

                                        文本模式ie8onInput存值,搜索下拉项样式

                                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 15:30:07 2019 +0800

                                        修改开单项到医嘱逗号

                                    commit 573f0b59ff517de16f94296240572544e31c9f46
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:23:46 2019 +0800

                                        合并后报错处理

                                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                                    Merge: 55d15d6 fbab9de
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:18:22 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                        # Conflicts:
                                        #	src/components/CurrentIll/index.jsx
                                        #	src/containers/EditableSpan.js
                                        #	src/store/actions/currentIll.js
                                        #	src/store/reducers/checkBody.js
                                        #	src/utils/ajax.js
                                        #	src/utils/config.js

                                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                                    Merge: 2d40e6e ad68815
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:10:38 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:02:18 2019 +0800

                                        ie8的onInput代替函数

                                    commit ad688156064254d6b615284642882ba5486ff764
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 10:29:36 2019 +0800

                                        init

                                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:13:57 2019 +0800

                                        updata pro

                                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:12:21 2019 +0800

                                        test

                                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 13:13:11 2019 +0800

                                    单选和多选编辑失焦时调用推送接口

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                            # Conflicts:
                            #	src/components/AddInspect/index.jsx
                            #	src/components/Inspect/index.jsx
                            #	src/components/PushItems/index.less
                            #	src/store/actions/checkBody.js
                            #	src/store/actions/currentIll.js
                            #	src/store/actions/mainSuit.js
                            #	src/store/actions/otherHistory.js

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/NumberDrop/index.jsx
                        #	src/components/NumberUnitDrop/index.jsx
                        #	src/store/actions/mainSuit.js

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/PushItems/index.jsx
                    #	src/utils/tools.js

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

                # Conflicts:
                #	src/containers/NumberUnitDrop.js
                #	src/store/actions/checkBody.js

            commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 16:00:51 2019 +0800

                打印医生签名自动获取

            commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 15:20:06 2019 +0800

                治疗方案样式

            commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 15:18:20 2019 +0800

                修改治疗方案样式

            commit 859a7364a96569f6aa92360efbce5a19b40681cb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:32:44 2019 +0800

                修改治疗方案小标题样式

            commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 14:09:41 2019 +0800

                样式调整

            commit 99789b23f06c18e5b588552066faf7f2ccacf198
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:07:48 2019 +0800

                修改治疗方案同类药物

            commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 14:02:27 2019 +0800

                化验填写单清空按钮,弹窗还在

            commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:00:40 2019 +0800

                修改弹窗IE8不居中

            commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 13:46:36 2019 +0800

                模板列表获取时机

            commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 13:34:03 2019 +0800

                模板名称重复弹窗不关闭

            commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 10:46:13 2019 +0800

                模板保存跟之前所有保存的模板作对比

            commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 20:30:39 2019 +0800

                治疗方案高度自适应

            commit 3e1c705ef6c2b2d0944ced37b8fa3f7c01307e25
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 18:20:27 2019 +0800

                Squashed commit of the following:

                commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 18:17:15 2019 +0800

                    查体模板添加逗号,主诉两个时间处理
                    Squashed commit of the following:

                    commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:51:09 2019 +0800

                        Squashed commit of the following:

                        commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 14:17:40 2019 +0800

                            顿号去重

                        commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                        Merge: 4095b3f b09559b
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:59:54 2019 +0800

                            Merge branch 'dev/new1' into dev/byll

                        commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:55:47 2019 +0800

                            样式宽度更改和逗号处理

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit fea9a721ccb5afb9f1873c2111e3722d7330d394
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:50:07 2019 +0800

                        Squashed commit of the following:

                        commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 15:22:37 2019 +0800

                            修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                        commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:41:20 2019 +0800

                            ie8治疗方案遮罩

                        commit fee35d5473b69aafb5335759006a93fea8d14145
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:05:16 2019 +0800

                            治疗方案遮罩IE8

                        commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:04:58 2019 +0800

                            修改右侧推送字体大小

                        commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 13:26:56 2019 +0800

                            修改化验项开单逗号问题

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

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

                    commit 2c70e41e7a5254838436b499b1ad787f523585f8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:42:54 2019 +0800

                        Squashed commit of the following:

                        commit 519f23c91954f87e836cbd400b158f774c498ba6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Tue Jan 29 15:35:59 2019 +0800

                            文本删除又出现的问题
                            Squashed commit of the following:

                            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Tue Jan 29 11:44:56 2019 +0800

                                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:41:03 2019 +0800

                                Squashed commit of the following:

                                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                                Author: Luolei <16657115156@163.com>
                                Date:   Fri Jan 25 14:06:09 2019 +0800

                                    date修改

                            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:38:40 2019 +0800

                                Squashed commit of the following:

                                commit 29b2499b796085a682a936d82c97decc35edf891
                                Author: zhangxc <zhangxc@zjlantone.com>
                                Date:   Fri Jan 25 13:50:07 2019 +0800

                                    修改版本信息和免责声明位置

                            commit e36f2f1b811d6978117161f50b16dd5bae298547
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:33:30 2019 +0800

                                Squashed commit of the following:

                                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 15:59:14 2019 +0800

                                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 14:21:41 2019 +0800

                                    Squashed commit of the following:

                                    commit d3e160a516240b77576567b993223816a68231a6
                                    Merge: 79e63ed c7e9e73
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:16 2019 +0800

                                        化验辅捡ie8搜索卡死修改

                                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:12:43 2019 +0800

                                        默认host地址删除

                                    commit e01035349f92405572238a0a97d80bb557dda802
                                    Merge: 8a8015d caad36f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 10:59:52 2019 +0800

                                        修改样式

                                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:46:01 2019 +0800

                                        合并报错修改

                                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                                    Merge: bbe85ff 58e0fdd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                                    Merge: b86268a 3bfa819
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/containers/SpreadDrop.js

                                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                                    Merge: 79c59d3 105488f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                        # Conflicts:
                                        #	src/store/async-actions/treat.js

                                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                                    Merge: db90e04 de190a5
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 20:18:42 2019 +0800

                                        中英文逗号

                                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 18:31:55 2019 +0800

                                        去掉英文逗号

                                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 17:22:34 2019 +0800

                                        修改治疗方案

                                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 16:49:10 2019 +0800

                                        下拉项间距调整,ie8事件兼容

                                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:09:49 2019 +0800

                                        药品说明书样式

                                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:08:17 2019 +0800

                                        修改药品说明书

                                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:06:17 2019 +0800

                                        修改开单样式

                                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:02:30 2019 +0800

                                        修改获取患者信息路径

                                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:43:38 2019 +0800

                                        添加诊断判断有没有治疗方案

                                    commit f617e5c267246786e7a6801cc87811f0d2527235
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:39:13 2019 +0800

                                        merge from 'dev/zxc'

                                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 10:33:44 2019 +0800

                                        提示语

                                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                                    Merge: d3ade00 95e9a94
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                        # Conflicts:
                                        #	src/components/DiagnosticList/index.jsx
                                        #	src/components/Operation/index.jsx
                                        #	src/containers/SpreadDrop.js
                                        #	src/store/actions/otherHistory.js
                                        #	src/store/async-actions/treat.js
                                        #	src/store/types/checkBody.js

                                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                                    Merge: 2fd497e 2458ea1
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:03:28 2019 +0800

                                        提示语消失默认时间改为2秒

                                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 10:02:00 2019 +0800

                                        治疗方案置灰

                                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:59:16 2019 +0800

                                        治疗方案

                                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                                    Merge: 62bd7fb 38f9720
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:47:47 2019 +0800

                                        Merge branch 'dev/new' into dev/zhangxc

                                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:32 2019 +0800

                                        Revert "Revert "修改药品说明样式""

                                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                                    Merge: 28c364a c37d1cc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:45:29 2019 +0800

                                        Revert "修改药品说明样式"

                                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:25:58 2019 +0800

                                        搜索列表显示样式更改

                                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:15:40 2019 +0800

                                        样式调整

                                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:22:29 2019 +0800

                                        修改导入host

                                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:15:44 2019 +0800

                                        临时修改版本弹窗高度

                                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:10:27 2019 +0800

                                        化验导入删除填值推送

                                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:43:48 2019 +0800

                                        添加删除辅捡右侧推送

                                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:30:50 2019 +0800

                                        修改杂音选中项bug

                                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                                    Merge: b489e52 6a1a3df
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:57:50 2019 +0800

                                        既往史无殊选中bug

                                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 18:57:03 2019 +0800

                                        css

                                    commit 96efc7b8118a99db629f898960621b98786bd42e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:26:40 2019 +0800

                                        合罗磊分支

                                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:49:02 2019 +0800

                                        回退

                                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                                    Merge: 6732dbb 1dd6c92
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                        # Conflicts:
                                        #	src/common/components/TailInlineTag/index.less
                                        #	src/common/components/Textarea/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx
                                        #	src/containers/OtherHistory.js
                                        #	src/store/actions/otherHistory.js

                                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                                    Merge: bc168f8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx

                                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                                    Merge: 3559798 6d55c59
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:31:13 2019 +0800

                                        既往史下拉滚动条添加

                                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:22:01 2019 +0800

                                        修改请求地址

                                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 17:16:22 2019 +0800

                                        辅检横向滚动

                                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                                    Merge: adc853a 45b1158
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit cf97be2f425bdef386a137e92929969c321ab047
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:08:25 2019 +0800

                                        去掉一个字

                                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:01:26 2019 +0800

                                        bug

                                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 15:58:40 2019 +0800

                                        其他史高血压选中bug修改

                                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 15:16:32 2019 +0800

                                        删除项有问题

                                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                                    Merge: d2eca9d 1a6bf74
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:59:26 2019 +0800

                                        Merge branch 'dev/liucf' into dev/luolei

                                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 14:51:07 2019 +0800

                                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:43:46 2019 +0800

                                        日期bug

                                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:46:29 2019 +0800

                                        请求地址修改-刚才反了

                                    commit 70e9420d59b745c59f3abe04c33100777184d024
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:44:13 2019 +0800

                                        请求地址修改

                                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:39:05 2019 +0800

                                        打印图标

                                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:31:48 2019 +0800

                                        其他史高血压数据展开

                                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:00:06 2019 +0800

                                        查体type修改

                                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:58:27 2019 +0800

                                        查体type修改

                                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                                    Merge: 4b8aa34 540b6a8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:51:52 2019 +0800

                                        Merge branch 'dev/new' into dev/luolei

                                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:47:15 2019 +0800

                                        搜索弹窗被遮挡问题解决

                                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:23:04 2019 +0800

                                        地址临时修改

                                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:20:05 2019 +0800

                                        版本信息弹窗高度限制

                                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:13:40 2019 +0800

                                        推送接口主诉现病史合并,治疗方案容错

                                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                                    Merge: 4a897b4 5a39d90
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                                    Merge: 7f1c7c8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:43 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/common/components/ItemBox/index.jsx
                                        #	src/components/AddInspect/index.jsx
                                        #	src/components/Diagnosis/index.jsx
                                        #	src/components/Diagnosis/index.less

                                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:52:01 2019 +0800

                                        层级问题

                                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                                    Merge: e5d0122 7f1c7c8
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:21 2019 +0800

                                        11

                                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:39:50 2019 +0800

                                        修改请求地址

                                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:38:05 2019 +0800

                                        修改请求地址

                                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                                    Merge: df67559 a82d18c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                                    Merge: ff817bf 6805811
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                                    commit 68058110e041e72b8c95979a4fd23e690912746b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:43:26 2019 +0800

                                        遮罩统一0.6透明度

                                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:34:59 2019 +0800

                                        透明度ie8

                                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:24:39 2019 +0800

                                        修改治疗方案无内容按钮置灰

                                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                                    Merge: 9c0e078 84ec971
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:09:22 2019 +0800

                                        merge from 'lcf'

                                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 19:01:31 2019 +0800

                                        修改药品说明样式

                                    commit ff817bf6d6d928b98557371362374859bec3aabd
                                    Merge: d50ffe0 b2e679a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:50:45 2019 +0800

                                        导入ie8暂时先灰掉

                                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                                    Merge: 573f0b5 b286d0a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:23:57 2019 +0800

                                        文本模式ie8onInput存值,搜索下拉项样式

                                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 15:30:07 2019 +0800

                                        修改开单项到医嘱逗号

                                    commit 573f0b59ff517de16f94296240572544e31c9f46
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:23:46 2019 +0800

                                        合并后报错处理

                                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                                    Merge: 55d15d6 fbab9de
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:18:22 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                        # Conflicts:
                                        #	src/components/CurrentIll/index.jsx
                                        #	src/containers/EditableSpan.js
                                        #	src/store/actions/currentIll.js
                                        #	src/store/reducers/checkBody.js
                                        #	src/utils/ajax.js
                                        #	src/utils/config.js

                                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                                    Merge: 2d40e6e ad68815
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:10:38 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:02:18 2019 +0800

                                        ie8的onInput代替函数

                                    commit ad688156064254d6b615284642882ba5486ff764
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 10:29:36 2019 +0800

                                        init

                                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:13:57 2019 +0800

                                        updata pro

                                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:12:21 2019 +0800

                                        test

                                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 13:13:11 2019 +0800

                                    单选和多选编辑失焦时调用推送接口

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                            # Conflicts:
                            #	src/components/AddInspect/index.jsx
                            #	src/components/Inspect/index.jsx
                            #	src/components/PushItems/index.less
                            #	src/store/actions/checkBody.js
                            #	src/store/actions/currentIll.js
                            #	src/store/actions/mainSuit.js
                            #	src/store/actions/otherHistory.js

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/NumberDrop/index.jsx
                        #	src/components/NumberUnitDrop/index.jsx
                        #	src/store/actions/mainSuit.js

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/PushItems/index.jsx
                    #	src/utils/tools.js

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:35:01 2019 +0800

                底部几个按钮换行设置最小宽度

            commit 7400613a1eb642e1d01004c7818883fd73c2350c
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:28:45 2019 +0800

                历史病例时间和按钮不能共存

            commit c000d83fb6ac5f265951c0e1377b627d24d2da10
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 17:27:30 2019 +0800

                修改治疗方案边框

            commit eda3f4b08a3460360541cd2af1c2ca071681c595
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:12:47 2019 +0800

                bug修改

            commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 15:54:49 2019 +0800

                还是符号处理...

            commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:58:28 2019 +0800

                导入化验结果,第一次添加诊断为主诉时不往主诉添加字符串

            commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:56:03 2019 +0800

                治疗方案标题添加疾病名称

            commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:51:09 2019 +0800

                Squashed commit of the following:

                commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 14:17:40 2019 +0800

                    顿号去重

                commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                Merge: 4095b3f b09559b
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:59:54 2019 +0800

                    Merge branch 'dev/new1' into dev/byll

                commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:55:47 2019 +0800

                    样式宽度更改和逗号处理

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit fea9a721ccb5afb9f1873c2111e3722d7330d394
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:50:07 2019 +0800

                Squashed commit of the following:

                commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:22:37 2019 +0800

                    修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:41:20 2019 +0800

                    ie8治疗方案遮罩

                commit fee35d5473b69aafb5335759006a93fea8d14145
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:05:16 2019 +0800

                    治疗方案遮罩IE8

                commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:04:58 2019 +0800

                    修改右侧推送字体大小

                commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 13:26:56 2019 +0800

                    修改化验项开单逗号问题

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

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

            commit 2c70e41e7a5254838436b499b1ad787f523585f8
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:42:54 2019 +0800

                Squashed commit of the following:

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/NumberDrop/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/store/actions/mainSuit.js

            commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:22:37 2019 +0800

                修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

            commit 799eef5c34a21f9d90bc82a40240838cf10ba601
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:41:20 2019 +0800

                ie8治疗方案遮罩

            commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 14:17:40 2019 +0800

                顿号去重

            commit fee35d5473b69aafb5335759006a93fea8d14145
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:05:16 2019 +0800

                治疗方案遮罩IE8

            commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:04:58 2019 +0800

                修改右侧推送字体大小

            commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
            Merge: 4095b3f b09559b
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:59:54 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:55:47 2019 +0800

                样式宽度更改和逗号处理

            commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 13:26:56 2019 +0800

                修改化验项开单逗号问题

            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 11:44:56 2019 +0800

                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:41:03 2019 +0800

                Squashed commit of the following:

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:38:40 2019 +0800

                Squashed commit of the following:

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

            commit e36f2f1b811d6978117161f50b16dd5bae298547
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:33:30 2019 +0800

                Squashed commit of the following:

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit d6751d916bd9aff60373a28ce2240bc078809e9a
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 09:51:31 2019 +0800

                合并new1分支
                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

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

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

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

                commit caad36f002904aa859a0d780eefdf5b9cdc9011e
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 11:24:02 2019 +0800

                    时间单位组件IE兼容

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

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

                commit 58e0fdd1ab99664163923ff7ae455efff5850195
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 09:20:30 2019 +0800

                    主诉IE兼容性处理

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/containers/SpreadDrop.js

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

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

                    # Conflicts:
                    #	src/store/async-actions/treat.js

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

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

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整,ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

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

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

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

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

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

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

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

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/components/AddAssistCheck/index.jsx

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

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

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并,治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

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

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

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

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

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

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

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

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值,搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

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

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

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

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

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

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

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

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

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

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

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

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

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

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

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

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

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

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

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

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

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

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

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

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

        commit f353eaef8074a17ee8977dd3ac1f9cf7685e713e
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 09:32:28 2019 +0800

            Squashed commit of the following:

            commit 70e968a78a10c520fa092cd979e0e03475523dc4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 09:25:57 2019 +0800

                修改诊断搜索参数

            commit 77ca8b29d1fc647e6765ebe0330b52ea88bd606f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 18:12:20 2019 +0800

                合并错误修改

            commit a20149638473c75479c56deb365db7c328a558cb
            Merge: cfc64ea 6b7dfbb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 18:08:43 2019 +0800

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

                # Conflicts:
                #	src/store/async-actions/homePage.js

            commit cfc64eaaaf0c98941c04be7b355aa646ecb3c560
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:27:09 2019 +0800

                标点加英问号

            commit 6b7dfbb33bd85d54dff60649f913b2fef6f8ce0c
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 17:24:55 2019 +0800

                bug提交

            commit 35a9c17b604893b2d97c45143128e5ea4d8d15bc
            Merge: 11d0086 a0beff1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:17:00 2019 +0800

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

            commit 11d00865399c3ba8bf5afe096ca3f3856c86be36
            Merge: 4f214b2 422c5cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:16:54 2019 +0800

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

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

            commit 4f214b2a23fd9bacb6671e191f7e42544c7b87af
            Merge: c721d35 9378eb8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:15:36 2019 +0800

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

            commit c721d35ada039c262724106b4b8d0342573e36ec
            Merge: b8f144b 0f0c391
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:15:32 2019 +0800

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

            commit 9378eb8bfca2571b7ed6e83560f2decaded45f2c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 16:55:33 2019 +0800

                其他史selecteds为空bug修改

            commit f6fec4a2b2f25e1b8d89b62601baa63a2cefe968
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 16:38:02 2019 +0800

                修改清空后第一次点击键盘不触发click事件bug

            commit c11b47d06e11c024a17f02b5648a800405d88ff5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 10:28:17 2019 +0800

                其他史文本模式数据bug修改

            commit 422c5cfdfaa0312d65cce2c717de1f1b2f63755b
            Merge: b479e52 b8f144b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 10:25:45 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit b479e52191221be49d4417308014517a821d8d41
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 10:21:39 2019 +0800

                修改诊断搜索

            commit b8f144b7c2c1fb60d208525d29dc1a1a38280edb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 09:44:49 2019 +0800

                去重标点添加

            commit 345ea481613f2fe5beb8aacdc117ce022a60f1b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 09:23:31 2019 +0800

                修改常用药物慎用标识透明度

            commit 0f0c3911304b587351e1d53627a9f1a314f9173a
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 09:08:54 2019 +0800

                11

            commit 58d128cb772f05fbf90974b0187ce2fa91905f76
            Merge: 5ec2c5b 21e2bf6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:55 2019 +0800

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

            commit 5ec2c5be9b99f40fd7322ea4299a8ef5ddbfbf5a
            Merge: e3965b6 f388f66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:51 2019 +0800

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

            commit e3965b6f49b9325a9a6aa6f9e3382d8e6be8b6b9
            Merge: ba2209b b37ea33
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:18 2019 +0800

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

            commit ba2209baa70ce98557956e4ee5e24659537b4e41
            Merge: c7033dc 2fc00bd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:22:41 2019 +0800

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

            commit 2fc00bd2a0c2c83d0b3a763147a5196f36ed2513
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 17:56:22 2019 +0800

                病例滚动条上面不遮挡导入按钮上移

            commit 21e2bf63e19461fc8956c991678d11ada4abad61
            Merge: 56412f4 c7033dc
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 28 15:49:11 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 56412f467c018e2ce22415a54a36be230126b5fe
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 28 15:47:21 2019 +0800

                注释查看药品说明书

            commit 7a306c9f203aa3e7c67a6c2138adbe2602b9aa56
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 15:44:55 2019 +0800

                修改其他史查体杂音类选中bug

            commit f388f660e2062b82ac39984f21bcd1603982f911
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 12:28:02 2019 +0800

                1

            commit c7033dc0fa9b576fd44ad580a70d9dc3c9abbc21
            Merge: 24781b3 9b8aba5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:47 2019 +0800

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

            commit 24781b351a21c98c7f0185b808c6cb2c8459cab8
            Merge: dd471cd 686d0e6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:41 2019 +0800

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

            commit dd471cd31cd4f5e8bee1cc4394afc2d1ec645d27
            Merge: fdfd012 beee05d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:32 2019 +0800

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

            commit fdfd0120716eea088da637b233700b07e6865f53
            Merge: 47805f3 6c7eff1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:16 2019 +0800

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

            commit 6c7eff13a7a93e7e50d569a72155a280973c1053
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 09:59:02 2019 +0800

                excel导入日期时间戳格式转换

            commit 92eb95e4a13cc141cf115fd59ba96eb9c4ad81f8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 09:35:49 2019 +0800

                化验清空只清空数据

            commit 9b8aba56d77ce741849edf60453f395ec7a17959
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 17:00:35 2019 +0800

                清空后其他史杂音类选中状态bug修改

            commit cca4e2b37197823231e6cbe1407b93ab2c1cb49e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:38:03 2019 +0800

                标点补充

            commit 686d0e6888cbe437c6126b079f546c5a7b811ae7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 16:34:13 2019 +0800

                点击开单项到医嘱

            commit 47805f396f0acda35a73a8fbe23a2b290af60a84
            Merge: dbfbe54 0ab03d2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:20:13 2019 +0800

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

            commit dbfbe549b65f8dea75579b10e02d7a4d022929a2
            Merge: ba95b15 24a72ee
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:20:08 2019 +0800

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

            commit ba95b154cd8f0acb6ac3cbdd0f56c2b5cd128a51
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:17:59 2019 +0800

                主诉合并错误修改

            commit 545d910e9331f21ab16be77ab7ac326ad3de580d
            Merge: a261f0c 48728c3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:15:51 2019 +0800

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

                # Conflicts:
                #	src/components/MainSuit/index.jsx
                #	src/components/PreviewBody/index.jsx
                #	src/components/PrintPreview/index.jsx
                #	src/components/TreatDesc/DrugInfo/index.jsx
                #	src/store/actions/diagnosticList.js
                #	src/store/actions/otherHistory.js
                #	src/store/reducers/assistCheck.js
                #	src/store/reducers/otherHistory.js

            commit 6b6082ca9ad86cab359874b6089815719b51d7d4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 16:04:10 2019 +0800

                Revert "第一个诊断为复诊添加到诊断调用推送接口"

                This reverts commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d.

            commit a261f0c60ae06808381dd443b5d8cef42760d953
            Merge: f2cb210 7e81b63
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:58:46 2019 +0800

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

            commit 0ab03d2eba0865ebdda8c8b9eb84e5dea7f07b59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:53:28 2019 +0800

                标点规则:中间连续标点保留第一个,开头去掉,结尾保留第一个,灰色不显示

            commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 15:40:32 2019 +0800

                第一个诊断为复诊添加到诊断调用推送接口

            commit cd02a522c6054deb9ade0fed202338dd1ce9021b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:26:16 2019 +0800

                输入再删除输入不搜索bug修改

            commit e62e0aa6083ed13edbbfc36124ff79363ddaba38
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:16:58 2019 +0800

                推送参数加主诉

            commit 134276afd973d5b5d8e07389cee27eb9391e9247
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:14:00 2019 +0800

                双击编辑状态关闭bug

            commit 769c60daabd81ef48f37f5227e9a55fb205ce5ee
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 14:11:43 2019 +0800

                化验颜色不一致

            commit e3ad8a2d18a21cc770b9c303d92146bbe78e4d8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 14:10:40 2019 +0800

                有选中无殊未灰bug修改

            commit 581c9dbc6f714c5e795a45102cb095cf84738522
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 14:04:07 2019 +0800

                杂音类单选bug修改

            commit 20a3edfe13f4c24c2748758f28bd488aa2ca6ea1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 09:37:07 2019 +0800

                推荐检查项没内容时,开单按钮置灰

            commit 970c4d7db52af55f2e9d39ce3401289683a8f297
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 17:39:35 2019 +0800

                常用药物治疗添加类名置灰状态

            commit 7e81b634b0952dc237048ee99f41364e360cea84
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 17:38:04 2019 +0800

                清除添加化验辅按钮浮动,打印医生名字位置,辅检标题小屏幕换行,模板接口进入页面没有调用问题

            commit f2cb21089d2c321a9cc6b5e666627c6a75e275db
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 17:25:29 2019 +0800

                数字键盘在组合中样式bug修改

            commit dd03327ec3396302fb66f3f60f7b24c0ff730e6c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 16:53:48 2019 +0800

                点击开单聚焦到医嘱

            commit 179d7080d06e284ed973d59c5a76ed3dc6a26daf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 16:43:01 2019 +0800

                重复修改,回退

            commit 7beb5f11bab81ae4535eaf2e61136ab71d06e0aa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 16:41:17 2019 +0800

                修改1024样式bug

            commit 7ad8183615802729dc3bbb6507c864a376e79bb6
            Merge: fca4a15 66e5e26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 16:07:59 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit fca4a15e3ab974f4c684496f43f76afa606a23bc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 16:06:12 2019 +0800

                回读div里的模拟placeholder清空,辅检出现两次,模板列表为空高度问题,火狐div清空还有个换行符去掉

            commit 66e5e26b6541d8923222f43852e56d91252a1c84
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:20:20 2019 +0800

                修改提示信息疾病说明菜单按钮光标形状

            commit ef15ad95e416155b911c474742cf526bbad9b041
            Merge: c051e01 8911ac8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:15:58 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit c051e0198219bc143a535bac13afa3dfcd90696c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:14:39 2019 +0800

                药品说明书多个Id查询

            commit 8911ac8887de34bdef955a59462f260fc2c6962b
            Merge: d31a749 37f085a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 13:19:19 2019 +0800

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

            commit d31a749c48b6f6b1e6725575fd09f84f71ebfd9b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 13:19:06 2019 +0800

                搜索后加标点测回

            commit 30000aad93762077ef746ef683fd2a47c14b3853
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 11:22:11 2019 +0800

                其他史查体搜索的标签后加逗号

            commit 37f085a3d788fd707c76bca36d9cd714f0d03742
            Merge: 9112336 13dce94
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 11:17:23 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 9112336c27d8e2c1c143b75b8d8bf03f85b528f1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 11:16:40 2019 +0800

                修改推送添加到诊断

            commit 13dce94fec6b39d0ddf4d0b0322bd84fadddc860
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 10:14:36 2019 +0800

                1024合并bug修改

            commit d1cb01259d8eab3933cd5166c6e39c6e9ec85516
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 10:12:56 2019 +0800

                同类药判断添加名称判断(有的同类药id为null)

            commit 536ab1e7dc67936fa9a586f8d55ad1c6d2ee60ba
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:41:41 2019 +0800

                修改药品说明书标题宽度

            commit c855d6416f7509f8ac7d6cb437790a11ad8d93d9
            Merge: feceb08 25a000f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:41:03 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 25a000f38ba5cdfb6fdb174c54341f9b058f2dd7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:40:26 2019 +0800

                Revert "修改药品说明书标题宽度"

                This reverts commit 576b54554b36e37ea0eb80e815ad381772b19cc5.

            commit 576b54554b36e37ea0eb80e815ad381772b19cc5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:38:52 2019 +0800

                修改药品说明书标题宽度

            commit 51a04b0d5f4f7124e9ae63240a32ed39b945f50b
            Merge: 644d713 0236d09
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:58 2019 +0800

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

            commit 644d7138c63af93af0e0286644367726d3da2ba0
            Merge: fa1380f c7236c8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:37 2019 +0800

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

            commit c7236c894382e11b0a4051f097643e857bf8f065
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:06 2019 +0800

                两边对齐火狐兼容

            commit fa1380f7bafb00efe15a3c1e487f162f2594a913
            Merge: e0bc863 96ced84
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:12:10 2019 +0800

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

            commit feceb083da47d70c70db09cc69ce6359e907ecb2
            Merge: 0236d09 e0bc863
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 20:10:43 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 0236d096817f2a3b0b04a67a3a44b3394014e267
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 20:01:41 2019 +0800

                药品禁用状态i图标不置灰

            commit 96ced84b7cd01fecf31a546ef58a2375bdfb2e37
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:00:10 2019 +0800

                说明书标题去空格

            commit a073a592d34258a699b123e4dec909cc0c4c73a8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:52:14 2019 +0800

                药品说明书排版

            commit e0bc863cca36de3ab8f8398352f72642780728d9
            Merge: 853319f 3fd13c2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:18:29 2019 +0800

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

            commit 3fd13c27d56310fc94d46f4e14f374a4de4dd8fa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:18:02 2019 +0800

                数字框蓝色背景显示修改

            commit 853319fd0394943edd4945e24701e837f71cf1ac
            Merge: 6211dfd 07d7ab9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:14:47 2019 +0800

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

            commit 07d7ab98655cbe928b1ac037bcd3889e59918dbb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:14:09 2019 +0800

                数字键盘输入优化,bug修改

            commit 6211dfdbb509b4fa4b555899887b119e2333ef41
            Merge: ca9f83c 4c41407
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 18:36:49 2019 +0800

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

            commit ca9f83c2e9296cb408f91cd53cdf7eae22a39993
            Merge: 2897015 d8fc333
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 18:35:58 2019 +0800

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

                # Conflicts:
                #	src/utils/tools.js

            commit d8fc333a180f46d4b4fad31cd39e1362e3b1f206
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 18:17:49 2019 +0800

                火狐placeholder模拟

            commit 4c414071774ef37e1ac57739d72e4b35e8456a8d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 17:43:26 2019 +0800

                双击删除标签时删除后面的标点

            commit 2897015cc3d9fd4bc687c88de707a965d30f1f80
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 17:07:24 2019 +0800

                清空等条件判断

            commit 298014e4aefc250ce60555d316be355b469abad5
            Merge: d8b2728 54ed95b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:55:02 2019 +0800

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

                # Conflicts:
                #	src/components/EMRContainer/index.less
                #	src/components/MainSuit/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/Operation/index.less

            commit d8b2728b1c4484c4327ea2fd1c5be54a87e802f5
            Merge: 827b9fe 6ff3c2f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:49:36 2019 +0800

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

            commit 6ff3c2f91b7a21f20081c4feb7cdbeb0fe94f61b
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 16:46:01 2019 +0800

                性别判断提示位置更改

            commit 827b9feb46ed370019aef767270dc98240a3a60d
            Merge: 3164918 f18aff0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:21:51 2019 +0800

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

            commit f18aff0c73b774231f1894446b877e67f7bf1bcf
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 16:15:52 2019 +0800

                其他史数据判断补充

            commit 3164918c9c57afd13cd89077ee356ed0541458f0
            Merge: a3c6497 0adcc7b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:42:23 2019 +0800

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

            commit 0adcc7bf5f39b10a3c2254cf1633d9ffd05e6073
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 15:40:14 2019 +0800

                数据判断有误

            commit a3c649762af9a4d8b66db4f678e62c708cca301b
            Merge: af35906 fa664ff
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:12:20 2019 +0800

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

                # Conflicts:
                #	src/components/PushContainer/index.less

            commit af359067b1d3c08d5329f89ab0565d9eeaa8d49d
            Merge: 4785b29 c33cd61
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:06:45 2019 +0800

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

            commit c33cd619b6aca13ec5a5fadbe66bfe4b71f5ed81
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 14:51:06 2019 +0800

                双击编辑蓝色边框

            commit 4785b29ea0eb3c58b5f508ddf9e2a65fd5b96247
            Merge: 942579e e665919
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:41:56 2019 +0800

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

                # Conflicts:
                #	src/components/PreviewBody/index.less

            commit e6659190bc72350a2b1848d30d1098aa61f29849
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 13:37:52 2019 +0800

                模板部分滚动条显示出来

            commit 942579e843fef29e00e4764d4acac312a51496ec
            Merge: 2b7ce81 7a014d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:35:56 2019 +0800

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

            commit 7a014d0d797d7e90f88a8d0f939c9845096b0411
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:35:18 2019 +0800

                有糖尿病bug修改

            commit a66f41acdd18acfa5dd6343178571743f1193226
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:32:44 2019 +0800

                其他史查体回读bug修改

            commit fa664ffcfa65bd1438999b0f9e79f99c80f7d531
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 11:30:05 2019 +0800

                删除诊断没有id时(添加名称判断)

            commit 86720794a59da37c8700f72e96740bcdf1906dc8
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 11:27:23 2019 +0800

                bug

            commit 3de2cf0c7fae1a0f1a994ee604f696d1f64c191e
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 11:09:44 2019 +0800

                1024下历史病例显示问题,清空主诉聚焦不在span

            commit 3f9e94c357e549318c1e79a04842a4c477d58974
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 10:03:29 2019 +0800

                pushContainer添加定位信息

            commit ec0a210bc616de96a0ed48df41300fcf95f6b1f3
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 10:02:01 2019 +0800

                预览宽度有误

            commit 2b7ce81ae4a157abf013f3b2f156b5d280f9403e
            Merge: 78fe295 de5b6f2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 09:52:32 2019 +0800

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

                # Conflicts:
                #	src/components/OtherHistory/index.jsx
                #	src/components/PreviewBody/index.jsx

            commit de5b6f2da0953c8bce31d166490d633f5c8d39c4
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:41:50 2019 +0800

                模板男女弹窗样式调整

            commit b2b959689c9b48b7e82b07766b7320952d649dbd
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:25:31 2019 +0800

                弹窗高度动态变化

            commit a2006f9c3a15df6225e8f5664e3f8330e9def1b7
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:22:25 2019 +0800

                弹窗宽度变化

            commit c6d4ec0ba654f8ed6d25c92f592c11fa8dfc0491
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 16:51:25 2019 +0800

                bug

            commit 8bfb380ec8366c43dbd2d3a0078ccc9f13816d62
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 11:10:18 2019 +0800

                连续两个句号处理

            commit fb65e9d6a4af98dcfafc8008963a59e9ef368dbb
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 10:45:55 2019 +0800

                判断是否为空只判断文本不判断结构

            commit 1749ad61e39543920defb0e8be1d7ce61a03a7bb
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 10:34:52 2019 +0800

                男女模板区分

            commit ef798e435a077495c1e84d3ca6893a7e78470119
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 17:28:30 2019 +0800

                模板性别

            commit 78fe295b3e69c7e7720b73ea67d3ffcc347f8554
            Merge: d5b22a1 3abdfe7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:25:11 2019 +0800

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

            commit d5b22a1659068387f4fd1cd0a76d10da296f9511
            Merge: 52a81ab e073408
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:24:55 2019 +0800

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

                # Conflicts:
                #	src/components/CheckBody/index.jsx
                #	src/components/MainSuit/index.jsx
                #	src/components/SpreadDrop/index.jsx

            commit 52a81abd66ca014880035ac04d229f22c54f9768
            Merge: 6b572c4 b133db8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:16:29 2019 +0800

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

            commit 3abdfe7396e7375d4d9a5fbafe0d11705494a101
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:35:13 2019 +0800

                其他史查体删到只剩一个文本标签时整行可落光标

            commit 65bf32b0cedb716f36c2d9bcba9cc79993a35cbc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:24:27 2019 +0800

                删除多余代码

            commit 333360a86405a53dc566e1db80812c62e9ada9df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:18:58 2019 +0800

                其他史查体提示优化,未获取到数据的情况优化

            commit b133db8b2ebe68183f0fca8a934b79e037ab2702
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 15:14:08 2019 +0800

                11

            commit 6b572c48f1c7b75e669aa328ab8d0c8271cd6a5f
            Merge: d7668cb 3131b2d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 15:12:02 2019 +0800

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

            commit 3131b2d66e39cb5df50b50a1512f3b3d7878cc83
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 10:56:58 2019 +0800

                主诉搜索框位置

            commit d7668cbc0bb1a57218083423f483367f6b6a1bbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 10:13:02 2019 +0800

                杂音类变量串bug

            commit 5ef7897748fe81cfc3a1e9e30a9cad9eb8576fac
            Merge: 77daf9d 0de92f7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:46:01 2019 +0800

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

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

            commit 77daf9d197cf583de16612dbc20339502081545f
            Merge: bd64c01 5479437
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:28:15 2019 +0800

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

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/SpreadDrop/index.jsx

            commit bd64c01ccec1e2ee37ad148b84aed1d064ae85d3
            Merge: 7dfd62a b380174
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:20:27 2019 +0800

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

            commit b3801745fb6938eb8bd727cc5b32ed7086dffdbd
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 20:15:51 2019 +0800

                化验文字太长显示省略号

            commit 33b3ef1bccc633bd90a57721429bcba5a4a71803
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 20:04:17 2019 +0800

                ie滚动

            commit 0de92f7a8175bb40e3ab8dc32b38ccc2b62d5cb4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 19:17:48 2019 +0800

                其他史查体提示bug修改

            commit ad5200304ddeec1bc1cead1e49f550319b1feff8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 19:04:44 2019 +0800

                单选双击编辑删光后失焦存值bug修改

            commit c1b9af5899a71f7398b2fd94a42770a59f77c7bc
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 18:59:06 2019 +0800

                数字带单位弹窗问题

            commit 7dfd62a2a867fd19a1ad80521c077eddd75bb484
            Merge: b901e9e a599e98
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 18:43:39 2019 +0800

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

            commit b901e9ed954d6502578623c1f28ea9edfe83dfbd
            Merge: b8b4174 a99d722
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 18:42:02 2019 +0800

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

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/CheckBody/index.jsx
                #	src/containers/eleType.js

            commit a99d722b957624438e91fb405418e8637f83f52f
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 18:32:09 2019 +0800

                滚动条弹窗调整

            commit ad1e46d28fbb2eeb3d894e82af6402aa8f4bf83e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 16:07:32 2019 +0800

                数字组件事件优化

            commit a599e98ab469a915bf759d3c08693ee313c13fa6
            Merge: 0d67c39 b8b4174
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 15:03:38 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 0d67c39cf1c0cb0949f3e98869b660c5de42ebd3
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 15:00:24 2019 +0800

                修改治疗方案药物治疗类名字段

            commit 27aced28537943a5b75cdaec24ad1f65ccec9477
            Merge: bc555b0 b8b4174
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:40:18 2019 +0800

                Merge branch 'dev/new1' into dev/otherHis

            commit b8b4174d5b561c963a269b29d737eec0a58f6889
            Merge: 27d6b1a e11a555
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:19:59 2019 +0800

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

            commit 27d6b1aed64dbe80fe158dbe620f1c8f9ecda70f
            Merge: 5ae0fe1 1a7645e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:19:36 2019 +0800

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

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/store/reducers/checkBody.js
                #	src/store/types/checkBody.js

            commit 5ae0fe1ebf36274d45e5a7d70709f655a54fa0be
            Merge: 6af13c9 bfad6c4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 09:46:23 2019 +0800

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

            commit e11a555129229f1ddb189c1a912f1d781270eac9
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 09:45:41 2019 +0800

                搜索结果去除诊断中已有诊断

            commit bc555b0a62f3d06017256e567738e1796f254a82
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 09:41:47 2019 +0800

                其他史删除不必要事件

            commit 8638209c04be43066a35ad6fab211e92bbd637b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 20:03:29 2019 +0800

                删除console

            commit 08da5c25ae264534d19e3c4fa7c5e370b3e0d456
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 20:01:46 2019 +0800

                诊断搜索添加同义词

            commit 9f0f76b675ccb06b8cb0d3655680a238d7cc4ae3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 19:46:31 2019 +0800

                ie8子标签灰显bug

            commit 10ec058189f5bbee4d5dcb47a45001988ca3d870
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 19:28:05 2019 +0800

                修改版本号和免责声明字体颜色

            commit e627b67e63d6fa3c1d4faa9ab492c0bf4d8ee1c1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 19:22:48 2019 +0800

                开单项没选择时,不跳到医嘱

            commit c60e17b33180d7485a46ca9e98c0ed16c7775f2a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 18:32:50 2019 +0800

                注释同类药物双击打开药品说明

            commit bfad6c404134c5268b07a2c79f1f8a386f952bc8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 18:20:17 2019 +0800

                诊断延迟搜索

            commit 69b02c93e3b2afb26f44733c2ef9558e2852047e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 17:04:52 2019 +0800

                查体既往史类事件处理添加

            commit bdc074220b4d662818d430e56e7f9796efd06537
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:58:12 2019 +0800

                其他史乙肝有高血压顺序勾选bug修改

            commit 48abc323e58cf8f400c0371b5cdff14fdf54b4d9
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 16:57:11 2019 +0800

                nothing to do

            commit f6f6e023919d536dd60b746e6f3b0b3267c332c2
            Merge: 3b8fdf4 6af13c9
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:51:35 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 3b8fdf425f7cd93dbb736cfe8bcb90ac72b900bf
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:48:56 2019 +0800

                通过ID搜索药品说明书(添加数据时查看药品说明书用)

            commit 6af13c94c3cb901fbc0e49f77ecb45f1950b4fbc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:26:45 2019 +0800

                翠加

            commit e1af9c88f74e6483b81850953f1af2051040e677
            Merge: 5ae9b8f 012bb7f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:21:57 2019 +0800

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

            commit 5ae9b8fae1e7d1f56f160b6f2d621b8d6e53658d
            Merge: 8decc9d 5b1feca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:21:38 2019 +0800

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

                # Conflicts:
                #	src/common/components/SearchOption/index.jsx
                #	src/common/js/func.js
                #	src/components/CheckBody/index.jsx
                #	src/containers/CurrentIll.js
                #	src/store/async-actions/homePage.js

            commit 8decc9d3e8255de2c81420a833e69582686aafdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:19:15 2019 +0800

                罗磊修改

            commit 012bb7f0ea4d0ec66f313834b0e97beed46c028f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:17:54 2019 +0800

                药品说明图标增加鼠标进入状态

            commit c4ea61552060862a541493087ec096a413cbca2c
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 16:12:30 2019 +0800

                高度计算有误

            commit 50769d9e8a9845954a58145e5b7041b131729b67
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 15:59:38 2019 +0800

                标点预览

            commit 4a8b8a17d9b784225eaa07d67925752339418ee1
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 15:49:58 2019 +0800

                滚动条问题

            commit a4f1c2776effa4bfb1c9628d48cee2a755d8558b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:36:47 2019 +0800

                诊断搜索增加搜索值为空情况

            commit cd77c307ae34abe8cfb6fb53f235beb8f43d884d
            Merge: ac44ed4 f7ec699
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:28:05 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit cee1138681863aa93e2374d48707171b294c0032
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 15:24:41 2019 +0800

                预览行内样式部分修改到less中

            commit ac44ed44fed7b42457e2dfc60b9ab13c97e0ced5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:06:10 2019 +0800

                提示信息疾病详情页右侧菜单

            commit 816fa09299c0177beac8573e50be4c86495a37f2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 14:59:20 2019 +0800

                标点灰显bug修改,下拉对应标签高亮颜色修改

            commit 3330385dd3ea7b2b419f5dbb92f05f8a20bc3c39
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 14:09:59 2019 +0800

                标点符号跟前一个标签灰显黑显

            commit b77a4e183b8413cbac1b663233b3382c7641857d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 13:43:26 2019 +0800

                修改诊断搜索参数

            commit b1f56da5d60d2944c4bbc8a8ccc61548f08b55e1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 13:26:29 2019 +0800

                纯标点符号不搜索,查体获取数据bug修改

            commit d6849d30404fe7d3346909a7e10bc894d1f2ba33
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 11:39:43 2019 +0800

                只有标点符号时不搜索

            commit 4f7c951a117bec49fa853071847422a8dbf51e9a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 11:23:42 2019 +0800

                单选组件双击编辑删完后失焦显示重复值bug修改

            commit d771a09a5fc4e3e7af92e3ff3c85ed44975b2648
            Merge: 28cd3ba f7ec699
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 11:13:20 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 28cd3bac18b0daa796f8a1a9292db3a24cb8e862
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 10:41:36 2019 +0800

                主诉数组多个空格元素处理

            commit 790d34dc38e886c3df1e67603922838f904e4ea7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 09:48:25 2019 +0800

                药品说明书鼠标指向方式

            commit f7ec699eb2b493c4bbbd0ee60194b639a6c8b8e8
            Merge: 6c245fb 909ab25
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:43:41 2019 +0800

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

            commit 6c245fb0901d2234a0aef7568039651dd4cdf91e
            Merge: 96cc574 e36be2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:43:15 2019 +0800

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

                # Conflicts:
                #	src/common/components/SearchOption/index.jsx
                #	src/common/js/func.js
                #	src/common/less/variables.less
                #	src/components/Operation/index.jsx
                #	src/components/PreviewBody/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/SpreadDrop/index.jsx
                #	src/containers/CurrentIll.js
                #	src/store/async-actions/patInfo.js
                #	src/store/reducers/assistCheck.js

            commit 197b0e5b453fa4446f71b728768baa67e5ab4700
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 09:42:48 2019 +0800

                修改版本信息字体大小

            commit 96cc574ab24f3da14e1f89610e6c5a1e451fa051
            Merge: 5a2d97b fe9e87d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:35:47 2019 +0800

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

                # Conflicts:
                #	src/common/less/variables.less
                #	src/components/PushContainer/index.jsx
                #	src/utils/tools.js

            commit fe9e87d5e0735c356cc4041292dad4ce9cce18dc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 17:30:38 2019 +0800

                搜索为空清除列表数据

            commit 909ab253717bafa4c9ffb3164441d8554e17ed03
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:27:10 2019 +0800

                输入框添加行高

            commit c870ce40e66ec3471bd8ab660346d41ca6374891
            Merge: 82c0130 cb47bc5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:12:48 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 82c013012b1ec9adad9ea974c609c785bae349b2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:12:26 2019 +0800

                删除console

            commit 656a2e69d55a87696a52780074cdb97ebf72c3e5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:03:22 2019 +0800

                提示信息详情页弹窗显示

            commit 94a46327141d7b22d245afbfef4908fca8b852df
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 15:50:52 2019 +0800

                化验没有参考值正常显示

            commit 5a2d97b0f644ef6172cce575e520ca3000cef9b0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 15:28:39 2019 +0800

                ie8点开下拉未选值存值bug修改

            commit 23f6f91a57f4c57826e5cd4adc6aea676a21751e
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 15:19:16 2019 +0800

                1.ie8自动转换中文为unicode导致判断有误
                2.阴影改为边框
                3.主诉现病史删除得到数组里有空元素处理

            commit 5e1184e69747c823a1ce3bba657332f1443f802b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 15:15:35 2019 +0800

                回读无查体点击唤出模板

            commit 48a9a00b3b5b31e499d32f8f6edbbda57390e721
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 14:30:22 2019 +0800

                切换模式其他史数据bug

            commit 4717362f96dd641518ca546c2b270a2c3f6d5002
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 11:38:42 2019 +0800

                血压类文本子标签存值

            commit 08f9160a8e26952c695d9563ece0cef09d7e6164
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 10:59:43 2019 +0800

                清除移除患者信息缓存

            commit cb47bc5b79d7f6e319a1b837d27012841925c678
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:16:42 2019 +0800

                翠翠分支未合单独添加

            commit 2a770d6266f8c7f5f0bd892befa6fa69166487bd
            Merge: 3e68866 86e1d1d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:17 2019 +0800

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

            commit 3e688668bdaf2d376901cfa70a90a3587ad7ff69
            Merge: dc08557 4f90da8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:11 2019 +0800

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

            commit dc0855703def7c3a0c56c74d0b033b42657cb62e
            Merge: 13db5c1 db268fc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:02 2019 +0800

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

            commit 4f90da88492079a14a3c167d364cc6b0160c668c
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 16:58:38 2019 +0800

                弹窗关闭时机

            commit 13db5c1cccec8c7f3ac5cb72d19aaf05a5bb63e4
            Merge: 58cffc8 6e906e0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 16:56:59 2019 +0800

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

            commit 6e906e06753a119829e67db34a0e32e1c2d1a4db
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 16:23:12 2019 +0800

                查体选中杂音血压选中状态bug修改

            commit 1e57bc5dc0b63eaaa040d59d53c9f1a9409d2030
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 15:42:03 2019 +0800

                单选组件下拉项可和名称相同

            commit 9318dc730440ce833cd1317aed52699572208224
            Merge: 58cffc8 db268fc
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 14:21:22 2019 +0800

                Merge branch 'dev/byll' into dev/new1

            commit db268fc6f4c11065e36e4405170bd08e667ce6fa
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 14:19:41 2019 +0800

                ie8搜索单个文字删除报错问题

            commit 86e1d1df0baee680a7c5bf99e8d6cbae4284c83c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 14:15:14 2019 +0800

                治疗方案药品说明显示方式

            commit 1391edf5cda27a44817030cb9fef6486da15b51e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 14:14:41 2019 +0800

                下拉框打开时标签边框蓝色

            commit 758555c01c184adde48fb869909a1b9fdb77f4b1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 13:50:39 2019 +0800

                箭头函数传值性能问题修改

            commit 8e25532ad88b1ca014acaaffb61155f3f62e8c64
            Merge: 7a78823 58cffc8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 09:48:15 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 58cffc89d51661f2edbd21e1424fdd29afd590f9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 18:21:01 2019 +0800

                上次提交回退

            commit 4ca59db29b1a256c9b3015646301c0105cead455
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 18:13:57 2019 +0800

                数字组件ie8输入报错参数无效bug修改

            commit 5afd59399265b3a516e35317687946d2df551c9b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:59:35 2019 +0800

                删除多余代码

            commit d56b647e2f32fc9e5a50e58376d1677076b9c5c0
            Merge: deb3340 e5ee60b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:57:54 2019 +0800

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

                # Conflicts:
                #	src/containers/CurrentIll.js
                #	src/store/actions/mainSuit.js

            commit 6c4e29739d3dbe45b1843f5a5fb2c054784d0739
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 16:55:03 2019 +0800

                ie8右浮动不生效

            commit deb33405ce270e3b1495e51fd537fa6d56f1a615
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:54:34 2019 +0800

                免责声明弹窗层级bug修改

            commit 15718f043d724dd440aab0d23c6eaf3cf54d2059
            Merge: c2f5a1e 0ca5c1f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:34:51 2019 +0800

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

            commit c2f5a1e29bd29942c2faa59fd4fd645bbe50a814
            Merge: a1c28c3 19f31f4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:17:11 2019 +0800

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

                # Conflicts:
                #	src/components/AddAssistCheck/Textarea/index.jsx

            commit 0ca5c1f1aa7ce0b7c558cd53b0c4fc19ad096f90
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 16:13:59 2019 +0800

                11

            commit a1c28c3d77f4d5d27b7ec1ef0ceb1aaf8a6afdb4
            Merge: 8bc39fc 3dbeabd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:13:41 2019 +0800

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

            commit 3dbeabd15713010eb953dcee9c619e0cb4e89baa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:10:56 2019 +0800

                弹窗层级修改

            commit b34feffbe308202a21d56c822371d5900e4d784c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 15:53:02 2019 +0800

                其他史无主诉第一次提示后不再提示bug修改

            commit 541a45685981ece9caf11ef7ee13d871e1aaaf27
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 15:47:44 2019 +0800

                搜索框下拉位置bug修改,杂音文字为多行时下拉遮挡文字bug修改

            commit b9bb9cba1fe356d94bdc64a1caa4b60460bdef68
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 15:36:55 2019 +0800

                复制内容样式乱掉问题解决

            commit 9641e6a1c9fd1fefa66a4324401cf38d60e29cf3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 14:37:35 2019 +0800

                无殊选中状态遗留bug修改

            commit 641c5762b7f7f98d532eb23fc97f881d33575222
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 14:18:44 2019 +0800

                打印相关样式修改ie待测

            commit e93c7c1557bee766ff94dfa4952cdf2f69c4e926
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 13:51:30 2019 +0800

                用户信息banner不被下拉框遮挡,杂音选中样式修改

            commit 64d1cffdb7e562263084ba5827df988a099ec7b7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 13:26:25 2019 +0800

                杂音类型下拉样式优化

            commit 08ab0d25e5c54f3535156e248de5063ff4454a2f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 11:31:31 2019 +0800

                其他史查体tagType4类型搜索选中展开

            commit a96e98a90f83c7d0e625f973b79cb65d33792623
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 10:48:50 2019 +0800

                获取模板接口放在获取病人信息回调中,确保参数不为空

            commit 19f31f4d19c841c9a0a86be849d749815e27a1c1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 09:43:48 2019 +0800

                修改标题点击enter问题

            commit 8bc39fc836e6f24fc599d8d679164f7412ac71f3
            Merge: 993eaf0 6fe34e5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:56:44 2019 +0800

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

                # Conflicts:
                #	src/components/AddAssistCheck/index.jsx
                #	src/components/Inspect/index.less
                #	src/components/NumberDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/store/actions/checkBody.js
                #	src/store/actions/mainSuit.js
                #	src/store/reducers/assistCheck.js

            commit 993eaf02f2d5d2b0244587ed7096d1fcf9659465
            Merge: 11260ee 6ca010f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:52:56 2019 +0800

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

            commit 6ca010f83a2b882163bfaf3ee7f125f45e8d5ce3
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 17:36:47 2019 +0800

                字体不一样,button问题

            commit 8433d68d9027b2c31c5db2da33182c1507f08f9b
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 17:12:29 2019 +0800

                更改中文冒号,修改辅检div样式,添加搜索ie8兼

            commit 11260eeb9c9958368e933981df83e4e097a04c9d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:08:07 2019 +0800

                杂音类型双击编辑blur后重复输入值bug修改

            commit 2911db7154036da7df72eb04b6e2a35b32c71106
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:48:08 2019 +0800

                双击编辑前后缀bug修改

            commit 6eef6a051d230f9f52a1df2ae6b5e3044c7b3505
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:33:58 2019 +0800

                主诉-其他史组件双击编辑前后缀存值

            commit 00f2e00fb09170526cd4101b320ece3b694e28f3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:07:49 2019 +0800

                查体数字组件双击编辑前后缀存值,血压类型标签双击编辑时不显示下拉框

            commit 8019239ea85bf8e66de7adff69d1fcc9b94eb226
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 13:57:24 2019 +0800

                修改ie8多[]bug

            commit 70689ffbb3b43af0bcd21e0c6898855ede313faa
            Merge: aca9d8f 3fe1212
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:36:41 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit aca9d8f6b118a3653050c6f59cbed645ac1b824d
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:19:43 2019 +0800

                判断模板保存前后是否相同

            commit a643a04284503f3491206a6da28f02e3b239bdfd
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:03:33 2019 +0800

                打印保存判断问题

            commit 665613f2a02a496e485917ee653ba58e4744fa7d
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 09:38:25 2019 +0800

                写死参数更改

            commit 3fe1212b9a37b328037ea87e8ed83b83bc71a5a6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:56:33 2019 +0800

                其他史提示无主诉时可输入bug修改

            commit d895d0391f5389858501b5be2d98c93516740f1a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:29:35 2019 +0800

                查体框可编辑状态删除

            commit 0ea49aca9cfc5399c0d074c81fe7a330a76ed40b
            Merge: 2799250 2facfcb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:19:21 2019 +0800

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

                # Conflicts:
                #	src/containers/eleType.js
                #	src/store/async-actions/treat.js

            commit 2facfcb8073c095fa0b6ae3eb54566fb072d7c85
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:15:41 2019 +0800

                查体获取数据失败时可输入bug修改

            commit 141ab5430c47c52bcff13dc7d34cc5a7fa134d4c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 15:12:53 2019 +0800

                其他史查体搜索结果放前后bug修改

            commit 9572b216a7c48e9947d3ce028b10f5849cb72102
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 14:34:34 2019 +0800

                其他史搜索选中位置bug修改

            commit ee5b7c3eb6a0e6328e2ee500deca54b756d69848
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 13:48:27 2019 +0800

                搜索bug修改

            commit c7e0483300e2188b162ce41063d38a50706979aa
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 16:34:50 2019 +0800

                11

            commit 7a7882300853f5a273686f709ab0462ad706a8f0
            Merge: 420bcf7 2799250
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 15:28:00 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 27992500bd6cd1d92f6cc4411a8436f36ef565d0
            Merge: 9573ac3 945c448
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:57:17 2019 +0800

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

            commit 9573ac3a696fa8e206e5a46e588dc4daad049381
            Merge: c90d43b fbbb8fb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:57:10 2019 +0800

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

            commit c90d43b677ba6dbaad86bd1fc8d4731eb46165b5
            Merge: d2c86ef 81e413f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:56:09 2019 +0800

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

                # Conflicts:
                #	src/containers/OtherHistory.js

            commit 81e413f1f4296fc8bcc22485e5779ddb776478f1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:53:45 2019 +0800

                之前修改的bug找回

            commit 420bcf750b1e316f23b750de4985441221ef0a5c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 14:53:11 2019 +0800

                修改同类药物样式

            commit 3bf089d9605e75bf7511e9d42fa6b03c9c6066b1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:44:35 2019 +0800

                改为全局弹窗显示

            commit fbbb8fbbb040b404ee7307b1b95505cea783626a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 14:38:23 2019 +0800

                修改添加诊断推送

            commit e1240a8e9f409aa5e4382e2bc0ef63ed6ff0a1dd
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:20:22 2019 +0800

                弹窗高度动态设置

            commit d2c86efb89cba523db9c587e7d8435a4b2be8531
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 11:16:53 2019 +0800

                无选中项体温输入bug修改

            commit aa6d15a7c141f10f275f1fc470d0eba476ffc4b2
            Merge: 9f91346 1fccd43
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:57:06 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 9f91346e73a2a64ce463baf32723a8c9e3b9cc05
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:55:41 2019 +0800

                bug修改

            commit 1fccd439ee53729685732eeb6fbbfe1be0eda80d
            Merge: 986a3cf 2e25c1b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 09:58:11 2019 +0800

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

            commit 3385c2c2a41d0b223136f5f176487cce09e1c082
            Merge: b876b6b 2e25c1b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 09:51:36 2019 +0800

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

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit e697f350f7724505282d06dfa0dc2ae001ea9c09
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 09:46:57 2019 +0800

                 删除console

            commit 2e25c1bb7076358b6e4063ced5731c3f456eb704
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 09:40:43 2019 +0800

                诊断第一个为复诊添加到主诉

            commit 986a3cf5976bfec9bce6afb554bab1f4a1a2a49d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:33:59 2019 +0800

                合并

            commit c900ae632d99d0c0fb2e2e5f9788707ada02745a
            Merge: 31ef38b b7bfe2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:18:38 2019 +0800

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

                # Conflicts:
                #	src/components/AddInspect/index.jsx
                #	src/components/CopyRight/index.less
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Inspect/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/Treat/index.jsx
                #	src/components/Treat/index.less
                #	src/containers/NumberUnitDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/diagnosticList.js
                #	src/store/async-actions/treat.js
                #	src/utils/tools.js

            commit 31ef38b3d5b46612b64866687214c2b9d1651b03
            Merge: 44fbf2b d6751d9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:05:17 2019 +0800

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

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/CopyRight/index.less
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Inspect/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/PushItems/index.less
                #	src/components/SpreadDrop/index.jsx
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/utils/tools.js

            commit 44fbf2b8d8f90640a9af8abe4da55c2af7efa319
            Merge: db4e755 935c0cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:52:43 2019 +0800

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

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

            commit db4e7559fb2bc15434058503ca8d1a1e3ffe8ad6
            Merge: edb84b0 9483642
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:44:26 2019 +0800

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

                # Conflicts:
                #	src/components/TreatDesc/DrugInfo/index.less
                #	src/store/async-actions/treat.js
                #	src/store/reducers/treat.js

            commit edb84b07adad34cdd5c94a592e543127d20eaec1
            Merge: b876b6b 6b71cd5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:35:50 2019 +0800

                更新

            commit b876b6b8dc6afe12ae2a90c990d147e32221d02c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 14:38:05 2019 +0800

                其他史有伴无排序

            commit f8ab9c103e8266a6ab44466a7fadbc1f0a91ceca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 14:06:33 2019 +0800

                查体搜索自由文本位置bug修改

            commit e45296e22263659c86f60d031bc5246c7f1be726
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:51:40 2019 +0800

                复诊主诉文本模式bug

            commit f5cae58692247cad7c0b3ff8966a2f7d5213069c
            Merge: 960317d d3e160a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:39:27 2019 +0800

                Merge branch 'dev/new1' into dev/otherHis

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

            commit 960317de925978075041b722cd3500488ce924fd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:36:13 2019 +0800

                双击隐藏下拉

            commit 06571b04a337a3805d723e22e964c5ba683293f5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 10:28:18 2019 +0800

                主诉saveText无值则判断为空,查体其他史聚焦提示

            commit 94836425d1dc9b9cf5cc1f2ce6f3bdc3706fd578
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:50:58 2019 +0800

                修改版本信息样式

            commit e0092d7003c2bcfecc38a77350d29ddc1a92dbf2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:40:32 2019 +0800

                关闭药品说明书时清除内容

            commit a921420ddd0b8c4c8101b1d5bb1d7fec8e422341
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:01:15 2019 +0800

                修改治疗方案和药品说明书样式

            commit 935c0cf687389a50aeef502b97f07685e675bd1d
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 17:16:52 2019 +0800

                滚动兼容

            commit 6b71cd51bbafd8c4283b1c16fae3a538a88f5651
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:54:56 2019 +0800

                现病史病程变化

            commit 91c3713c62e8eb4b9437b00d754133e87561d8cc
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:36:48 2019 +0800

                注释scrollTo

            commit 2123a1e9839af1052e1405d6a005ddf521041c9d
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:10:44 2019 +0800

                Squashed commit of the following:

                commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 16:00:51 2019 +0800

                    打印医生签名自动获取

                commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 14:09:41 2019 +0800

                    样式调整

                commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 14:02:27 2019 +0800

                    化验填写单清空按钮,弹窗还在

                commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 13:46:36 2019 +0800

                    模板列表获取时机

                commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 13:34:03 2019 +0800

                    模板名称重复弹窗不关闭

                commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 10:46:13 2019 +0800

                    模板保存跟之前所有保存的模板作对比

                commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:35:01 2019 +0800

                    底部几个按钮换行设置最小宽度

                commit 7400613a1eb642e1d01004c7818883fd73c2350c
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:28:45 2019 +0800

                    历史病例时间和按钮不能共存

                commit eda3f4b08a3460360541cd2af1c2ca071681c595
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:12:47 2019 +0800

                    bug修改

                commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 15:54:49 2019 +0800

                    还是符号处理...

                commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 14:17:40 2019 +0800

                    顿号去重

                commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                Merge: 4095b3f b09559b
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:59:54 2019 +0800

                    Merge branch 'dev/new1' into dev/byll

                commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:55:47 2019 +0800

                    样式宽度更改和逗号处理

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

                # Conflicts:
                #	src/utils/tools.js

            commit 6df92ea9ddd29c14979874f2f0e7eac54d032eaf
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:07:27 2019 +0800

                Squashed commit of the following:

                commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 15:20:06 2019 +0800

                    治疗方案样式

                commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 15:18:20 2019 +0800

                    修改治疗方案样式

                commit 859a7364a96569f6aa92360efbce5a19b40681cb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:32:44 2019 +0800

                    修改治疗方案小标题样式

                commit 99789b23f06c18e5b588552066faf7f2ccacf198
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:07:48 2019 +0800

                    修改治疗方案同类药物

                commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:00:40 2019 +0800

                    修改弹窗IE8不居中

                commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 20:30:39 2019 +0800

                    治疗方案高度自适应

                commit c000d83fb6ac5f265951c0e1377b627d24d2da10
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 17:27:30 2019 +0800

                    修改治疗方案边框

                commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:58:28 2019 +0800

                    导入化验结果,第一次添加诊断为主诉时不往主诉添加字符串

                commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:56:03 2019 +0800

                    治疗方案标题添加疾病名称

                commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:22:37 2019 +0800

                    修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:41:20 2019 +0800

                    ie8治疗方案遮罩

                commit fee35d5473b69aafb5335759006a93fea8d14145
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:05:16 2019 +0800

                    治疗方案遮罩IE8

                commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:04:58 2019 +0800

                    修改右侧推送字体大小

                commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 13:26:56 2019 +0800

                    修改化验项开单逗号问题

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

                # Conflicts:
                #	src/components/Treat/index.jsx
                #	src/components/Treat/index.less
                #	src/store/async-actions/diagnosticList.js
                #	src/store/async-actions/treat.js

            commit 20f96c311119b635dad33f6c9222d94d8563bbfe
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:02:31 2019 +0800

                Squashed commit of the following:

                commit 27178b569e9575d450bbf1ce329e069d4c4b4b8c
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 30 15:57:20 2019 +0800

                    ie8现病史添加症状报错的问题&查体血压选中不变黑的问题

                commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 18:17:15 2019 +0800

                    查体模板添加逗号,主诉两个时间处理
                    Squashed commit of the following:

                    commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:51:09 2019 +0800

                        Squashed commit of the following:

                        commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 14:17:40 2019 +0800

                            顿号去重

                        commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                        Merge: 4095b3f b09559b
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:59:54 2019 +0800

                            Merge branch 'dev/new1' into dev/byll

                        commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:55:47 2019 +0800

                            样式宽度更改和逗号处理

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit fea9a721ccb5afb9f1873c2111e3722d7330d394
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:50:07 2019 +0800

                        Squashed commit of the following:

                        commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 15:22:37 2019 +0800

                            修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                        commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:41:20 2019 +0800

                            ie8治疗方案遮罩

                        commit fee35d5473b69aafb5335759006a93fea8d14145
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:05:16 2019 +0800

                            治疗方案遮罩IE8

                        commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:04:58 2019 +0800

                            修改右侧推送字体大小

                        commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 13:26:56 2019 +0800

                            修改化验项开单逗号问题

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

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

                    commit 2c70e41e7a5254838436b499b1ad787f523585f8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:42:54 2019 +0800

                        Squashed commit of the following:

                        commit 519f23c91954f87e836cbd400b158f774c498ba6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Tue Jan 29 15:35:59 2019 +0800

                            文本删除又出现的问题
                            Squashed commit of the following:

                            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Tue Jan 29 11:44:56 2019 +0800

                                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:41:03 2019 +0800

                                Squashed commit of the following:

                                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                                Author: Luolei <16657115156@163.com>
                                Date:   Fri Jan 25 14:06:09 2019 +0800

                                    date修改

                            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:38:40 2019 +0800

                                Squashed commit of the following:

                                commit 29b2499b796085a682a936d82c97decc35edf891
                                Author: zhangxc <zhangxc@zjlantone.com>
                                Date:   Fri Jan 25 13:50:07 2019 +0800

                                    修改版本信息和免责声明位置

                            commit e36f2f1b811d6978117161f50b16dd5bae298547
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:33:30 2019 +0800

                                Squashed commit of the following:

                                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 15:59:14 2019 +0800

                                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 14:21:41 2019 +0800

                                    Squashed commit of the following:

                                    commit d3e160a516240b77576567b993223816a68231a6
                                    Merge: 79e63ed c7e9e73
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:16 2019 +0800

                                        化验辅捡ie8搜索卡死修改

                                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:12:43 2019 +0800

                                        默认host地址删除

                                    commit e01035349f92405572238a0a97d80bb557dda802
                                    Merge: 8a8015d caad36f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 10:59:52 2019 +0800

                                        修改样式

                                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:46:01 2019 +0800

                                        合并报错修改

                                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                                    Merge: bbe85ff 58e0fdd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                                    Merge: b86268a 3bfa819
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/containers/SpreadDrop.js

                                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                                    Merge: 79c59d3 105488f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                        # Conflicts:
                                        #	src/store/async-actions/treat.js

                                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                                    Merge: db90e04 de190a5
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 20:18:42 2019 +0800

                                        中英文逗号

                                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 18:31:55 2019 +0800

                                        去掉英文逗号

                                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 17:22:34 2019 +0800

                                        修改治疗方案

                                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 16:49:10 2019 +0800

                                        下拉项间距调整,ie8事件兼容

                                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:09:49 2019 +0800

                                        药品说明书样式

                                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:08:17 2019 +0800

                                        修改药品说明书

                                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:06:17 2019 +0800

                                        修改开单样式

                                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:02:30 2019 +0800

                                        修改获取患者信息路径

                                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:43:38 2019 +0800

                                        添加诊断判断有没有治疗方案

                                    commit f617e5c267246786e7a6801cc87811f0d2527235
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:39:13 2019 +0800

                                        merge from 'dev/zxc'

                                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 10:33:44 2019 +0800

                                        提示语

                                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                                    Merge: d3ade00 95e9a94
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                        # Conflicts:
                                        #	src/components/DiagnosticList/index.jsx
                                        #	src/components/Operation/index.jsx
                                        #	src/containers/SpreadDrop.js
                                        #	src/store/actions/otherHistory.js
                                        #	src/store/async-actions/treat.js
                                        #	src/store/types/checkBody.js

                                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                                    Merge: 2fd497e 2458ea1
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:03:28 2019 +0800

                                        提示语消失默认时间改为2秒

                                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 10:02:00 2019 +0800

                                        治疗方案置灰

                                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:59:16 2019 +0800

                                        治疗方案

                                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                                    Merge: 62bd7fb 38f9720
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:47:47 2019 +0800

                                        Merge branch 'dev/new' into dev/zhangxc

                                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:32 2019 +0800

                                        Revert "Revert "修改药品说明样式""

                                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                                    Merge: 28c364a c37d1cc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:45:29 2019 +0800

                                        Revert "修改药品说明样式"

                                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:25:58 2019 +0800

                                        搜索列表显示样式更改

                                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:15:40 2019 +0800

                                        样式调整

                                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:22:29 2019 +0800

                                        修改导入host

                                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:15:44 2019 +0800

                                        临时修改版本弹窗高度

                                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:10:27 2019 +0800

                                        化验导入删除填值推送

                                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:43:48 2019 +0800

                                        添加删除辅捡右侧推送

                                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:30:50 2019 +0800

                                        修改杂音选中项bug

                                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                                    Merge: b489e52 6a1a3df
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:57:50 2019 +0800

                                        既往史无殊选中bug

                                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 18:57:03 2019 +0800

                                        css

                                    commit 96efc7b8118a99db629f898960621b98786bd42e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:26:40 2019 +0800

                                        合罗磊分支

                                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:49:02 2019 +0800

                                        回退

                                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                                    Merge: 6732dbb 1dd6c92
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                        # Conflicts:
                                        #	src/common/components/TailInlineTag/index.less
                                        #	src/common/components/Textarea/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx
                                        #	src/containers/OtherHistory.js
                                        #	src/store/actions/otherHistory.js

                                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                                    Merge: bc168f8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx

                                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                                    Merge: 3559798 6d55c59
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:31:13 2019 +0800

                                        既往史下拉滚动条添加

                                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:22:01 2019 +0800

                                        修改请求地址

                                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 17:16:22 2019 +0800

                                        辅检横向滚动

                                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                                    Merge: adc853a 45b1158
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit cf97be2f425bdef386a137e92929969c321ab047
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:08:25 2019 +0800

                                        去掉一个字

                                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:01:26 2019 +0800

                                        bug

                                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 15:58:40 2019 +0800

                                        其他史高血压选中bug修改

                                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 15:16:32 2019 +0800

                                        删除项有问题

                                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                                    Merge: d2eca9d 1a6bf74
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:59:26 2019 +0800

                                        Merge branch 'dev/liucf' into dev/luolei

                                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 14:51:07 2019 +0800

                                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:43:46 2019 +0800

                                        日期bug

                                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:46:29 2019 +0800

                                        请求地址修改-刚才反了

                                    commit 70e9420d59b745c59f3abe04c33100777184d024
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:44:13 2019 +0800

                                        请求地址修改

                                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:39:05 2019 +0800

                                        打印图标

                                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:31:48 2019 +0800

                                        其他史高血压数据展开

                                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:00:06 2019 +0800

                                        查体type修改

                                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:58:27 2019 +0800

                                        查体type修改

                                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                                    Merge: 4b8aa34 540b6a8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:51:52 2019 +0800

                                        Merge branch 'dev/new' into dev/luolei

                                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:47:15 2019 +0800

                                        搜索弹窗被遮挡问题解决

                                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:23:04 2019 +0800

                                        地址临时修改

                                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:20:05 2019 +0800

                                        版本信息弹窗高度限制

                                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:13:40 2019 +0800

                                        推送接口主诉现病史合并,治疗方案容错

                                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                                    Merge: 4a897b4 5a39d90
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                                    Merge: 7f1c7c8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:43 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/common/components/ItemBox/index.jsx
                                        #	src/components/AddInspect/index.jsx
                                        #	src/components/Diagnosis/index.jsx
                                        #	src/components/Diagnosis/index.less

                                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:52:01 2019 +0800

                                        层级问题

                                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                                    Merge: e5d0122 7f1c7c8
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:21 2019 +0800

                                        11

                                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:39:50 2019 +0800

                                        修改请求地址

                                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:38:05 2019 +0800

                                        修改请求地址

                                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                                    Merge: df67559 a82d18c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                                    Merge: ff817bf 6805811
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                                    commit 68058110e041e72b8c95979a4fd23e690912746b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:43:26 2019 +0800

                                        遮罩统一0.6透明度

                                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:34:59 2019 +0800

                                        透明度ie8

                                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:24:39 2019 +0800

                                        修改治疗方案无内容按钮置灰

                                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                                    Merge: 9c0e078 84ec971
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:09:22 2019 +0800

                                        merge from 'lcf'

                                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 19:01:31 2019 +0800

                                        修改药品说明样式

                                    commit ff817bf6d6d928b98557371362374859bec3aabd
                                    Merge: d50ffe0 b2e679a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:50:45 2019 +0800

                                        导入ie8暂时先灰掉

                                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                                    Merge: 573f0b5 b286d0a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:23:57 2019 +0800

                                        文本模式ie8onInput存值,搜索下拉项样式

                                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 15:30:07 2019 +0800

                                        修改开单项到医嘱逗号

                                    commit 573f0b59ff517de16f94296240572544e31c9f46
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:23:46 2019 +0800

                                        合并后报错处理

                                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                                    Merge: 55d15d6 fbab9de
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:18:22 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                        # Conflicts:
                                        #	src/components/CurrentIll/index.jsx
                                        #	src/containers/EditableSpan.js
                                        #	src/store/actions/currentIll.js
                                        #	src/store/reducers/checkBody.js
                                        #	src/utils/ajax.js
                                        #	src/utils/config.js

                                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                                    Merge: 2d40e6e ad68815
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:10:38 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:02:18 2019 +0800

                                        ie8的onInput代替函数

                                    commit ad688156064254d6b615284642882ba5486ff764
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 10:29:36 2019 +0800

                                        init

                                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:13:57 2019 +0800

                                        updata pro

                                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:12:21 2019 +0800

                                        test

                                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 13:13:11 2019 +0800

                                    单选和多选编辑失焦时调用推送接口

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                            # Conflicts:
                            #	src/components/AddInspect/index.jsx
                            #	src/components/Inspect/index.jsx
                            #	src/components/PushItems/index.less
                            #	src/store/actions/checkBody.js
                            #	src/store/actions/currentIll.js
                            #	src/store/actions/mainSuit.js
                            #	src/store/actions/otherHistory.js

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/NumberDrop/index.jsx
                        #	src/components/NumberUnitDrop/index.jsx
                        #	src/store/actions/mainSuit.js

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/PushItems/index.jsx
                    #	src/utils/tools.js

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

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

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

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

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

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

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

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

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

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

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

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

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

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

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

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

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

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

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

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

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

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

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

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

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

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

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

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

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

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

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

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

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

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

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

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

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

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

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

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

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

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

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

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

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

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

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

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

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

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

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

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

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

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

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

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

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

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

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

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

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

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

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

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

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

                # Conflicts:
                #	src/containers/NumberUnitDrop.js
                #	src/store/actions/checkBody.js

            commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 16:00:51 2019 +0800

                打印医生签名自动获取

            commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 15:20:06 2019 +0800

                治疗方案样式

            commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 15:18:20 2019 +0800

                修改治疗方案样式

            commit 859a7364a96569f6aa92360efbce5a19b40681cb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:32:44 2019 +0800

                修改治疗方案小标题样式

            commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 14:09:41 2019 +0800

                样式调整

            commit 99789b23f06c18e5b588552066faf7f2ccacf198
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:07:48 2019 +0800

                修改治疗方案同类药物

            commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 14:02:27 2019 +0800

                化验填写单清空按钮,弹窗还在

            commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:00:40 2019 +0800

                修改弹窗IE8不居中

            commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 13:46:36 2019 +0800

                模板列表获取时机

            commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 13:34:03 2019 +0800

                模板名称重复弹窗不关闭

            commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 10:46:13 2019 +0800

                模板保存跟之前所有保存的模板作对比

            commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 20:30:39 2019 +0800

                治疗方案高度自适应

            commit 3e1c705ef6c2b2d0944ced37b8fa3f7c01307e25
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 18:20:27 2019 +0800

                Squashed commit of the following:

                commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 18:17:15 2019 +0800

                    查体模板添加逗号,主诉两个时间处理
                    Squashed commit of the following:

                    commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:51:09 2019 +0800

                        Squashed commit of the following:

                        commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 14:17:40 2019 +0800

                            顿号去重

                        commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                        Merge: 4095b3f b09559b
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:59:54 2019 +0800

                            Merge branch 'dev/new1' into dev/byll

                        commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:55:47 2019 +0800

                            样式宽度更改和逗号处理

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit fea9a721ccb5afb9f1873c2111e3722d7330d394
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:50:07 2019 +0800

                        Squashed commit of the following:

                        commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 15:22:37 2019 +0800

                            修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                        commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:41:20 2019 +0800

                            ie8治疗方案遮罩

                        commit fee35d5473b69aafb5335759006a93fea8d14145
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:05:16 2019 +0800

                            治疗方案遮罩IE8

                        commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:04:58 2019 +0800

                            修改右侧推送字体大小

                        commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 13:26:56 2019 +0800

                            修改化验项开单逗号问题

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                        # Conflicts:
                        #	src/components/PushItems/index.jsx

                    commit 2c70e41e7a5254838436b499b1ad787f523585f8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:42:54 2019 +0800

                        Squashed commit of the following:

                        commit 519f23c91954f87e836cbd400b158f774c498ba6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Tue Jan 29 15:35:59 2019 +0800

                            文本删除又出现的问题
                            Squashed commit of the following:

                            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Tue Jan 29 11:44:56 2019 +0800

                                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:41:03 2019 +0800

                                Squashed commit of the following:

                                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                                Author: Luolei <16657115156@163.com>
                                Date:   Fri Jan 25 14:06:09 2019 +0800

                                    date修改

                            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:38:40 2019 +0800

                                Squashed commit of the following:

                                commit 29b2499b796085a682a936d82c97decc35edf891
                                Author: zhangxc <zhangxc@zjlantone.com>
                                Date:   Fri Jan 25 13:50:07 2019 +0800

                                    修改版本信息和免责声明位置

                            commit e36f2f1b811d6978117161f50b16dd5bae298547
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:33:30 2019 +0800

                                Squashed commit of the following:

                                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 15:59:14 2019 +0800

                                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 14:21:41 2019 +0800

                                    Squashed commit of the following:

                                    commit d3e160a516240b77576567b993223816a68231a6
                                    Merge: 79e63ed c7e9e73
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:48 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:16 2019 +0800

                                        化验辅捡ie8搜索卡死修改

                                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:12:43 2019 +0800

                                        默认host地址删除

                                    commit e01035349f92405572238a0a97d80bb557dda802
                                    Merge: 8a8015d caad36f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 11:45:20 2019 +0800

                                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 10:59:52 2019 +0800

                                        修改样式

                                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:46:01 2019 +0800

                                        合并报错修改

                                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                                    Merge: bbe85ff 58e0fdd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:42:51 2019 +0800

                                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                                    Merge: b86268a 3bfa819
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:30:05 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/containers/SpreadDrop.js

                                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                                    Merge: 79c59d3 105488f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:25:44 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                        # Conflicts:
                                        #	src/store/async-actions/treat.js

                                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                                    Merge: db90e04 de190a5
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:24:40 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 20:18:42 2019 +0800

                                        中英文逗号

                                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 18:31:55 2019 +0800

                                        去掉英文逗号

                                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 17:22:34 2019 +0800

                                        修改治疗方案

                                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 16:49:10 2019 +0800

                                        下拉项间距调整,ie8事件兼容

                                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:09:49 2019 +0800

                                        药品说明书样式

                                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:08:17 2019 +0800

                                        修改药品说明书

                                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:06:17 2019 +0800

                                        修改开单样式

                                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:02:30 2019 +0800

                                        修改获取患者信息路径

                                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:43:38 2019 +0800

                                        添加诊断判断有没有治疗方案

                                    commit f617e5c267246786e7a6801cc87811f0d2527235
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:39:13 2019 +0800

                                        merge from 'dev/zxc'

                                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 10:33:44 2019 +0800

                                        提示语

                                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                                    Merge: d3ade00 95e9a94
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:09:57 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                        # Conflicts:
                                        #	src/components/DiagnosticList/index.jsx
                                        #	src/components/Operation/index.jsx
                                        #	src/containers/SpreadDrop.js
                                        #	src/store/actions/otherHistory.js
                                        #	src/store/async-actions/treat.js
                                        #	src/store/types/checkBody.js

                                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                                    Merge: 2fd497e 2458ea1
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:05:17 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:03:28 2019 +0800

                                        提示语消失默认时间改为2秒

                                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 10:02:00 2019 +0800

                                        治疗方案置灰

                                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:59:16 2019 +0800

                                        治疗方案

                                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                                    Merge: 62bd7fb 38f9720
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:47:47 2019 +0800

                                        Merge branch 'dev/new' into dev/zhangxc

                                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:32 2019 +0800

                                        Revert "Revert "修改药品说明样式""

                                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                                    Merge: 28c364a c37d1cc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:00 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:45:29 2019 +0800

                                        Revert "修改药品说明样式"

                                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:25:58 2019 +0800

                                        搜索列表显示样式更改

                                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:15:40 2019 +0800

                                        样式调整

                                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:22:29 2019 +0800

                                        修改导入host

                                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:15:44 2019 +0800

                                        临时修改版本弹窗高度

                                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:10:27 2019 +0800

                                        化验导入删除填值推送

                                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:43:48 2019 +0800

                                        添加删除辅捡右侧推送

                                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:30:50 2019 +0800

                                        修改杂音选中项bug

                                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                                    Merge: b489e52 6a1a3df
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:58:07 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:57:50 2019 +0800

                                        既往史无殊选中bug

                                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 18:57:03 2019 +0800

                                        css

                                    commit 96efc7b8118a99db629f898960621b98786bd42e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:26:40 2019 +0800

                                        合罗磊分支

                                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:49:02 2019 +0800

                                        回退

                                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                                    Merge: 6732dbb 1dd6c92
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:44:02 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/TailInlineTag/index.less
                                        #	src/common/components/Textarea/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx
                                        #	src/containers/OtherHistory.js
                                        #	src/store/actions/otherHistory.js

                                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                                    Merge: bc168f8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:36:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx

                                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                                    Merge: 3559798 6d55c59
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:34:30 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:31:13 2019 +0800

                                        既往史下拉滚动条添加

                                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:22:01 2019 +0800

                                        修改请求地址

                                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 17:16:22 2019 +0800

                                        辅检横向滚动

                                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                                    Merge: adc853a 45b1158
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 16:53:11 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit cf97be2f425bdef386a137e92929969c321ab047
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:08:25 2019 +0800

                                        去掉一个字

                                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:01:26 2019 +0800

                                        bug

                                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 15:58:40 2019 +0800

                                        其他史高血压选中bug修改

                                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 15:16:32 2019 +0800

                                        删除项有问题

                                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                                    Merge: d2eca9d 1a6bf74
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:59:26 2019 +0800

                                        Merge branch 'dev/liucf' into dev/luolei

                                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 14:51:07 2019 +0800

                                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:43:46 2019 +0800

                                        日期bug

                                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:46:29 2019 +0800

                                        请求地址修改-刚才反了

                                    commit 70e9420d59b745c59f3abe04c33100777184d024
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:44:13 2019 +0800

                                        请求地址修改

                                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:39:05 2019 +0800

                                        打印图标

                                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:31:48 2019 +0800

                                        其他史高血压数据展开

                                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:00:06 2019 +0800

                                        查体type修改

                                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:58:27 2019 +0800

                                        查体type修改

                                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                                    Merge: 4b8aa34 540b6a8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:51:52 2019 +0800

                                        Merge branch 'dev/new' into dev/luolei

                                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:47:15 2019 +0800

                                        搜索弹窗被遮挡问题解决

                                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:23:04 2019 +0800

                                        地址临时修改

                                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:20:05 2019 +0800

                                        版本信息弹窗高度限制

                                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:13:40 2019 +0800

                                        推送接口主诉现病史合并,治疗方案容错

                                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                                    Merge: 4a897b4 5a39d90
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                                    Merge: 7f1c7c8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:43 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/common/components/ItemBox/index.jsx
                                        #	src/components/AddInspect/index.jsx
                                        #	src/components/Diagnosis/index.jsx
                                        #	src/components/Diagnosis/index.less

                                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:52:01 2019 +0800

                                        层级问题

                                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                                    Merge: e5d0122 7f1c7c8
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:34 2019 +0800

                                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:21 2019 +0800

                                        11

                                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:39:50 2019 +0800

                                        修改请求地址

                                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:38:05 2019 +0800

                                        修改请求地址

                                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                                    Merge: df67559 a82d18c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                                    Merge: ff817bf 6805811
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:39 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                    commit 68058110e041e72b8c95979a4fd23e690912746b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:43:26 2019 +0800

                                        遮罩统一0.6透明度

                                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:34:59 2019 +0800

                                        透明度ie8

                                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:24:39 2019 +0800

                                        修改治疗方案无内容按钮置灰

                                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                                    Merge: 9c0e078 84ec971
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:09:22 2019 +0800

                                        merge from 'lcf'

                                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 19:01:31 2019 +0800

                                        修改药品说明样式

                                    commit ff817bf6d6d928b98557371362374859bec3aabd
                                    Merge: d50ffe0 b2e679a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:52:34 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:50:45 2019 +0800

                                        导入ie8暂时先灰掉

                                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                                    Merge: 573f0b5 b286d0a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:25:09 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:23:57 2019 +0800

                                        文本模式ie8onInput存值,搜索下拉项样式

                                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 15:30:07 2019 +0800

                                        修改开单项到医嘱逗号

                                    commit 573f0b59ff517de16f94296240572544e31c9f46
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:23:46 2019 +0800

                                        合并后报错处理

                                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                                    Merge: 55d15d6 fbab9de
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:18:22 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                        # Conflicts:
                                        #	src/components/CurrentIll/index.jsx
                                        #	src/containers/EditableSpan.js
                                        #	src/store/actions/currentIll.js
                                        #	src/store/reducers/checkBody.js
                                        #	src/utils/ajax.js
                                        #	src/utils/config.js

                                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                                    Merge: 2d40e6e ad68815
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:10:38 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/components/MainSuit/index.jsx

                                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:02:18 2019 +0800

                                        ie8的onInput代替函数

                                    commit ad688156064254d6b615284642882ba5486ff764
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 10:29:36 2019 +0800

                                        init

                                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:13:57 2019 +0800

                                        updata pro

                                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:12:21 2019 +0800

                                        test

                                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 13:13:11 2019 +0800

                                    单选和多选编辑失焦时调用推送接口

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                            # Conflicts:
                            #	src/components/AddInspect/index.jsx
                            #	src/components/Inspect/index.jsx
                            #	src/components/PushItems/index.less
                            #	src/store/actions/checkBody.js
                            #	src/store/actions/currentIll.js
                            #	src/store/actions/mainSuit.js
                            #	src/store/actions/otherHistory.js

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/NumberDrop/index.jsx
                        #	src/components/NumberUnitDrop/index.jsx
                        #	src/store/actions/mainSuit.js

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/PushItems/index.jsx
                    #	src/utils/tools.js

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:35:01 2019 +0800

                底部几个按钮换行设置最小宽度

            commit 7400613a1eb642e1d01004c7818883fd73c2350c
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:28:45 2019 +0800

                历史病例时间和按钮不能共存

            commit c000d83fb6ac5f265951c0e1377b627d24d2da10
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 17:27:30 2019 +0800

                修改治疗方案边框

            commit eda3f4b08a3460360541cd2af1c2ca071681c595
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:12:47 2019 +0800

                bug修改

            commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 15:54:49 2019 +0800

                还是符号处理...

            commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:58:28 2019 +0800

                导入化验结果,第一次添加诊断为主诉时不往主诉添加字符串

            commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:56:03 2019 +0800

                治疗方案标题添加疾病名称

            commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:51:09 2019 +0800

                Squashed commit of the following:

                commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 14:17:40 2019 +0800

                    顿号去重

                commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                Merge: 4095b3f b09559b
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:59:54 2019 +0800

                    Merge branch 'dev/new1' into dev/byll

                commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:55:47 2019 +0800

                    样式宽度更改和逗号处理

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit fea9a721ccb5afb9f1873c2111e3722d7330d394
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:50:07 2019 +0800

                Squashed commit of the following:

                commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:22:37 2019 +0800

                    修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:41:20 2019 +0800

                    ie8治疗方案遮罩

                commit fee35d5473b69aafb5335759006a93fea8d14145
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:05:16 2019 +0800

                    治疗方案遮罩IE8

                commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:04:58 2019 +0800

                    修改右侧推送字体大小

                commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 13:26:56 2019 +0800

                    修改化验项开单逗号问题

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

                # Conflicts:
                #	src/components/PushItems/index.jsx

            commit 2c70e41e7a5254838436b499b1ad787f523585f8
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:42:54 2019 +0800

                Squashed commit of the following:

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/NumberDrop/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/store/actions/mainSuit.js

            commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:22:37 2019 +0800

                修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

            commit 799eef5c34a21f9d90bc82a40240838cf10ba601
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:41:20 2019 +0800

                ie8治疗方案遮罩

            commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 14:17:40 2019 +0800

                顿号去重

            commit fee35d5473b69aafb5335759006a93fea8d14145
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:05:16 2019 +0800

                治疗方案遮罩IE8

            commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:04:58 2019 +0800

                修改右侧推送字体大小

            commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
            Merge: 4095b3f b09559b
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:59:54 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:55:47 2019 +0800

                样式宽度更改和逗号处理

            commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 13:26:56 2019 +0800

                修改化验项开单逗号问题

            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 11:44:56 2019 +0800

                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:41:03 2019 +0800

                Squashed commit of the following:

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:38:40 2019 +0800

                Squashed commit of the following:

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

            commit e36f2f1b811d6978117161f50b16dd5bae298547
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:33:30 2019 +0800

                Squashed commit of the following:

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit d6751d916bd9aff60373a28ce2240bc078809e9a
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 09:51:31 2019 +0800

                合并new1分支
                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit caad36f002904aa859a0d780eefdf5b9cdc9011e
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 11:24:02 2019 +0800

                    时间单位组件IE兼容

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit 58e0fdd1ab99664163923ff7ae455efff5850195
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 09:20:30 2019 +0800

                    主诉IE兼容性处理

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/containers/SpreadDrop.js

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                    # Conflicts:
                    #	src/store/async-actions/treat.js

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整,ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

                    Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/components/AddAssistCheck/index.jsx

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并,治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/new' into dev/new

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

                    Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值,搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/components/MainSuit/index.jsx

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

        commit 0dd720981dd0439560d143288ad3eca97fada9b2
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 09:29:01 2019 +0800

            光标没有落入span禁止默认事件

        # Conflicts:
        #	src/components/AddAssistCheck/Textarea/index.jsx
        #	src/components/DiagResultSearch/index.less
        #	src/components/Operation/index.jsx
        #	src/components/PreviewBody/index.jsx
        #	src/store/async-actions/diagnosticSearch.js
        #	src/store/async-actions/homePage.js
        #	src/utils/tools.js

    commit d1c4b3df50161943df810df972f34507aff03d18
    Merge: bc106be 0c6c3ae
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 09:22:01 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit bc106beef3bdcbe8f57f43e04bfa01805cd5533d
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 09:10:25 2019 +0800

        saveText火狐拿不到

    commit 0c6c3ae8f9aee7b8e6c3678b9151e8ae0c410c13
    Merge: 734d5a7 7547aad
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 20:58:47 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 7547aad07181cba7573e32745446542c312f0a40
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon Mar 4 20:55:15 2019 +0800

        Squashed commit of the following:

        commit b0c00a729612618f20f468d7354303097a8bbb3a
        Merge: 8585a00 7badd32
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 20:44:51 2019 +0800

            Merge branch 'dev/byll' of http://192.168.2.236:10080/zhouna/newICSS into dev/byll

        commit 8585a0093ff723eacb191dc7403e3ce36e9b2c89
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 20:43:40 2019 +0800

            冲突测试

        commit 7badd324c95ce9228e4bc77018b95ef12ce8b478
        Author: Luolei <16657115156@163.com>
        Date:   Mon Mar 4 20:28:34 2019 +0800

            innerText兼容

        commit bae44fbc4ec23f87680a8a990bb7b4beafe76bdb
        Author: Luolei <16657115156@163.com>
        Date:   Mon Mar 4 19:32:27 2019 +0800

            火狐div兼容

        commit ae75e0b94813e902df0cb9fcfdb010a077da2bcc
        Author: Luolei <16657115156@163.com>
        Date:   Mon Mar 4 16:51:40 2019 +0800

            搜索结果位置变化,div换行问题

        commit c4b7f3caf26cc03ee94e500988fa561a4a8cb6d0
        Author: Luolei <16657115156@163.com>
        Date:   Mon Mar 4 10:38:22 2019 +0800

            预览文字过多导致出现滚动条

        commit 67c2971080b85bdef5a695642163cf1f55aa315e
        Author: Luolei <16657115156@163.com>
        Date:   Mon Mar 4 10:32:51 2019 +0800

            现病史查体其他史输入内容过多问题,默认回读辅检提示语

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx
        #	src/common/components/Textarea/index.less
        #	src/components/AddAssistCheck/Textarea/index.less

    commit 5aa0803915a89ab2d49508ea976a9112c100c45d
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon Mar 4 20:39:16 2019 +0800

        Squashed commit of the following:

        commit 9e748c97a82a417812ae6f416f70827867185081
        Merge: 3cf35e1 f353eae
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 16:10:25 2019 +0800

            Merge branch 'IE_test' of http://192.168.2.236:10080/zhouna/newICSS into IE_test

            # Conflicts:
            #	src/common/components/Textarea/index.less
            #	src/components/AddAssistCheck/Textarea/index.less

        commit 3cf35e1da1e6a3ef203d27c4875ccc4ba2ea556c
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 16:09:24 2019 +0800

            合并new1
            Squashed commit of the following:

            commit 70e968a78a10c520fa092cd979e0e03475523dc4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 09:25:57 2019 +0800

                修改诊断搜索参数

            commit 77ca8b29d1fc647e6765ebe0330b52ea88bd606f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 18:12:20 2019 +0800

                合并错误修改

            commit a20149638473c75479c56deb365db7c328a558cb
            Merge: cfc64ea 6b7dfbb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 18:08:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/store/async-actions/homePage.js

            commit cfc64eaaaf0c98941c04be7b355aa646ecb3c560
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:27:09 2019 +0800

                标点加英问号

            commit 6b7dfbb33bd85d54dff60649f913b2fef6f8ce0c
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 17:24:55 2019 +0800

                bug提交

            commit 35a9c17b604893b2d97c45143128e5ea4d8d15bc
            Merge: 11d0086 a0beff1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:17:00 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit 11d00865399c3ba8bf5afe096ca3f3856c86be36
            Merge: 4f214b2 422c5cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:16:54 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/components/DiagResultSearch/index.jsx

            commit 4f214b2a23fd9bacb6671e191f7e42544c7b87af
            Merge: c721d35 9378eb8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:15:36 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c721d35ada039c262724106b4b8d0342573e36ec
            Merge: b8f144b 0f0c391
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:15:32 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 9378eb8bfca2571b7ed6e83560f2decaded45f2c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 16:55:33 2019 +0800

                其他史selecteds为空bug修改

            commit f6fec4a2b2f25e1b8d89b62601baa63a2cefe968
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 16:38:02 2019 +0800

                修改清空后第一次点击键盘不触发click事件bug

            commit c11b47d06e11c024a17f02b5648a800405d88ff5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 10:28:17 2019 +0800

                其他史文本模式数据bug修改

            commit 422c5cfdfaa0312d65cce2c717de1f1b2f63755b
            Merge: b479e52 b8f144b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 10:25:45 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit b479e52191221be49d4417308014517a821d8d41
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 10:21:39 2019 +0800

                修改诊断搜索

            commit b8f144b7c2c1fb60d208525d29dc1a1a38280edb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 09:44:49 2019 +0800

                去重标点添加

            commit 345ea481613f2fe5beb8aacdc117ce022a60f1b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 09:23:31 2019 +0800

                修改常用药物慎用标识透明度

            commit 0f0c3911304b587351e1d53627a9f1a314f9173a
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 09:08:54 2019 +0800

                11

            commit 58d128cb772f05fbf90974b0187ce2fa91905f76
            Merge: 5ec2c5b 21e2bf6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:55 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 5ec2c5be9b99f40fd7322ea4299a8ef5ddbfbf5a
            Merge: e3965b6 f388f66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:51 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit e3965b6f49b9325a9a6aa6f9e3382d8e6be8b6b9
            Merge: ba2209b b37ea33
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:18 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit ba2209baa70ce98557956e4ee5e24659537b4e41
            Merge: c7033dc 2fc00bd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:22:41 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2fc00bd2a0c2c83d0b3a763147a5196f36ed2513
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 17:56:22 2019 +0800

                病例滚动条上面不遮挡导入按钮上移

            commit 21e2bf63e19461fc8956c991678d11ada4abad61
            Merge: 56412f4 c7033dc
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 28 15:49:11 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 56412f467c018e2ce22415a54a36be230126b5fe
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 28 15:47:21 2019 +0800

                注释查看药品说明书

            commit 7a306c9f203aa3e7c67a6c2138adbe2602b9aa56
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 15:44:55 2019 +0800

                修改其他史查体杂音类选中bug

            commit f388f660e2062b82ac39984f21bcd1603982f911
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 12:28:02 2019 +0800

                1

            commit c7033dc0fa9b576fd44ad580a70d9dc3c9abbc21
            Merge: 24781b3 9b8aba5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:47 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 24781b351a21c98c7f0185b808c6cb2c8459cab8
            Merge: dd471cd 686d0e6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:41 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit dd471cd31cd4f5e8bee1cc4394afc2d1ec645d27
            Merge: fdfd012 beee05d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:32 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit fdfd0120716eea088da637b233700b07e6865f53
            Merge: 47805f3 6c7eff1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:16 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 6c7eff13a7a93e7e50d569a72155a280973c1053
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 09:59:02 2019 +0800

                excel导入日期时间戳格式转换

            commit 92eb95e4a13cc141cf115fd59ba96eb9c4ad81f8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 09:35:49 2019 +0800

                化验清空只清空数据

            commit 9b8aba56d77ce741849edf60453f395ec7a17959
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 17:00:35 2019 +0800

                清空后其他史杂音类选中状态bug修改

            commit cca4e2b37197823231e6cbe1407b93ab2c1cb49e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:38:03 2019 +0800

                标点补充

            commit 686d0e6888cbe437c6126b079f546c5a7b811ae7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 16:34:13 2019 +0800

                点击开单项到医嘱

            commit 47805f396f0acda35a73a8fbe23a2b290af60a84
            Merge: dbfbe54 0ab03d2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:20:13 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit dbfbe549b65f8dea75579b10e02d7a4d022929a2
            Merge: ba95b15 24a72ee
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:20:08 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit ba95b154cd8f0acb6ac3cbdd0f56c2b5cd128a51
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:17:59 2019 +0800

                主诉合并错误修改

            commit 545d910e9331f21ab16be77ab7ac326ad3de580d
            Merge: a261f0c 48728c3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:15:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/components/MainSuit/index.jsx
                #	src/components/PreviewBody/index.jsx
                #	src/components/PrintPreview/index.jsx
                #	src/components/TreatDesc/DrugInfo/index.jsx
                #	src/store/actions/diagnosticList.js
                #	src/store/actions/otherHistory.js
                #	src/store/reducers/assistCheck.js
                #	src/store/reducers/otherHistory.js

            commit 6b6082ca9ad86cab359874b6089815719b51d7d4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 16:04:10 2019 +0800

                Revert "第一个诊断为复诊添加到诊断调用推送接口"

                This reverts commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d.

            commit a261f0c60ae06808381dd443b5d8cef42760d953
            Merge: f2cb210 7e81b63
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:58:46 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 0ab03d2eba0865ebdda8c8b9eb84e5dea7f07b59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:53:28 2019 +0800

                标点规则:中间连续标点保留第一个,开头去掉,结尾保留第一个,灰色不显示

            commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 15:40:32 2019 +0800

                第一个诊断为复诊添加到诊断调用推送接口

            commit cd02a522c6054deb9ade0fed202338dd1ce9021b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:26:16 2019 +0800

                输入再删除输入不搜索bug修改

            commit e62e0aa6083ed13edbbfc36124ff79363ddaba38
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:16:58 2019 +0800

                推送参数加主诉

            commit 134276afd973d5b5d8e07389cee27eb9391e9247
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:14:00 2019 +0800

                双击编辑状态关闭bug

            commit 769c60daabd81ef48f37f5227e9a55fb205ce5ee
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 14:11:43 2019 +0800

                化验颜色不一致

            commit e3ad8a2d18a21cc770b9c303d92146bbe78e4d8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 14:10:40 2019 +0800

                有选中无殊未灰bug修改

            commit 581c9dbc6f714c5e795a45102cb095cf84738522
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 14:04:07 2019 +0800

                杂音类单选bug修改

            commit 20a3edfe13f4c24c2748758f28bd488aa2ca6ea1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 09:37:07 2019 +0800

                推荐检查项没内容时,开单按钮置灰

            commit 970c4d7db52af55f2e9d39ce3401289683a8f297
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 17:39:35 2019 +0800

                常用药物治疗添加类名置灰状态

            commit 7e81b634b0952dc237048ee99f41364e360cea84
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 17:38:04 2019 +0800

                清除添加化验辅按钮浮动,打印医生名字位置,辅检标题小屏幕换行,模板接口进入页面没有调用问题

            commit f2cb21089d2c321a9cc6b5e666627c6a75e275db
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 17:25:29 2019 +0800

                数字键盘在组合中样式bug修改

            commit dd03327ec3396302fb66f3f60f7b24c0ff730e6c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 16:53:48 2019 +0800

                点击开单聚焦到医嘱

            commit 179d7080d06e284ed973d59c5a76ed3dc6a26daf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 16:43:01 2019 +0800

                重复修改,回退

            commit 7beb5f11bab81ae4535eaf2e61136ab71d06e0aa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 16:41:17 2019 +0800

                修改1024样式bug

            commit 7ad8183615802729dc3bbb6507c864a376e79bb6
            Merge: fca4a15 66e5e26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 16:07:59 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit fca4a15e3ab974f4c684496f43f76afa606a23bc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 16:06:12 2019 +0800

                回读div里的模拟placeholder清空,辅检出现两次,模板列表为空高度问题,火狐div清空还有个换行符去掉

            commit 66e5e26b6541d8923222f43852e56d91252a1c84
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:20:20 2019 +0800

                修改提示信息疾病说明菜单按钮光标形状

            commit ef15ad95e416155b911c474742cf526bbad9b041
            Merge: c051e01 8911ac8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:15:58 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit c051e0198219bc143a535bac13afa3dfcd90696c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:14:39 2019 +0800

                药品说明书多个Id查询

            commit 8911ac8887de34bdef955a59462f260fc2c6962b
            Merge: d31a749 37f085a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 13:19:19 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit d31a749c48b6f6b1e6725575fd09f84f71ebfd9b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 13:19:06 2019 +0800

                搜索后加标点测回

            commit 30000aad93762077ef746ef683fd2a47c14b3853
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 11:22:11 2019 +0800

                其他史查体搜索的标签后加逗号

            commit 37f085a3d788fd707c76bca36d9cd714f0d03742
            Merge: 9112336 13dce94
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 11:17:23 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 9112336c27d8e2c1c143b75b8d8bf03f85b528f1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 11:16:40 2019 +0800

                修改推送添加到诊断

            commit 13dce94fec6b39d0ddf4d0b0322bd84fadddc860
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 10:14:36 2019 +0800

                1024合并bug修改

            commit d1cb01259d8eab3933cd5166c6e39c6e9ec85516
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 10:12:56 2019 +0800

                同类药判断添加名称判断(有的同类药id为null)

            commit 536ab1e7dc67936fa9a586f8d55ad1c6d2ee60ba
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:41:41 2019 +0800

                修改药品说明书标题宽度

            commit c855d6416f7509f8ac7d6cb437790a11ad8d93d9
            Merge: feceb08 25a000f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:41:03 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 25a000f38ba5cdfb6fdb174c54341f9b058f2dd7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:40:26 2019 +0800

                Revert "修改药品说明书标题宽度"

                This reverts commit 576b54554b36e37ea0eb80e815ad381772b19cc5.

            commit 576b54554b36e37ea0eb80e815ad381772b19cc5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:38:52 2019 +0800

                修改药品说明书标题宽度

            commit 51a04b0d5f4f7124e9ae63240a32ed39b945f50b
            Merge: 644d713 0236d09
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:58 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 644d7138c63af93af0e0286644367726d3da2ba0
            Merge: fa1380f c7236c8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:37 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7236c894382e11b0a4051f097643e857bf8f065
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:06 2019 +0800

                两边对齐火狐兼容

            commit fa1380f7bafb00efe15a3c1e487f162f2594a913
            Merge: e0bc863 96ced84
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:12:10 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit feceb083da47d70c70db09cc69ce6359e907ecb2
            Merge: 0236d09 e0bc863
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 20:10:43 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 0236d096817f2a3b0b04a67a3a44b3394014e267
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 20:01:41 2019 +0800

                药品禁用状态i图标不置灰

            commit 96ced84b7cd01fecf31a546ef58a2375bdfb2e37
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:00:10 2019 +0800

                说明书标题去空格

            commit a073a592d34258a699b123e4dec909cc0c4c73a8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:52:14 2019 +0800

                药品说明书排版

            commit e0bc863cca36de3ab8f8398352f72642780728d9
            Merge: 853319f 3fd13c2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:18:29 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 3fd13c27d56310fc94d46f4e14f374a4de4dd8fa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:18:02 2019 +0800

                数字框蓝色背景显示修改

            commit 853319fd0394943edd4945e24701e837f71cf1ac
            Merge: 6211dfd 07d7ab9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:14:47 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 07d7ab98655cbe928b1ac037bcd3889e59918dbb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:14:09 2019 +0800

                数字键盘输入优化,bug修改

            commit 6211dfdbb509b4fa4b555899887b119e2333ef41
            Merge: ca9f83c 4c41407
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 18:36:49 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit ca9f83c2e9296cb408f91cd53cdf7eae22a39993
            Merge: 2897015 d8fc333
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 18:35:58 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/utils/tools.js

            commit d8fc333a180f46d4b4fad31cd39e1362e3b1f206
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 18:17:49 2019 +0800

                火狐placeholder模拟

            commit 4c414071774ef37e1ac57739d72e4b35e8456a8d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 17:43:26 2019 +0800

                双击删除标签时删除后面的标点

            commit 2897015cc3d9fd4bc687c88de707a965d30f1f80
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 17:07:24 2019 +0800

                清空等条件判断

            commit 298014e4aefc250ce60555d316be355b469abad5
            Merge: d8b2728 54ed95b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:55:02 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/components/EMRContainer/index.less
                #	src/components/MainSuit/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/Operation/index.less

            commit d8b2728b1c4484c4327ea2fd1c5be54a87e802f5
            Merge: 827b9fe 6ff3c2f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:49:36 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 6ff3c2f91b7a21f20081c4feb7cdbeb0fe94f61b
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 16:46:01 2019 +0800

                性别判断提示位置更改

            commit 827b9feb46ed370019aef767270dc98240a3a60d
            Merge: 3164918 f18aff0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:21:51 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit f18aff0c73b774231f1894446b877e67f7bf1bcf
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 16:15:52 2019 +0800

                其他史数据判断补充

            commit 3164918c9c57afd13cd89077ee356ed0541458f0
            Merge: a3c6497 0adcc7b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:42:23 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 0adcc7bf5f39b10a3c2254cf1633d9ffd05e6073
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 15:40:14 2019 +0800

                数据判断有误

            commit a3c649762af9a4d8b66db4f678e62c708cca301b
            Merge: af35906 fa664ff
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:12:20 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/components/PushContainer/index.less

            commit af359067b1d3c08d5329f89ab0565d9eeaa8d49d
            Merge: 4785b29 c33cd61
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:06:45 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c33cd619b6aca13ec5a5fadbe66bfe4b71f5ed81
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 14:51:06 2019 +0800

                双击编辑蓝色边框

            commit 4785b29ea0eb3c58b5f508ddf9e2a65fd5b96247
            Merge: 942579e e665919
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:41:56 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/components/PreviewBody/index.less

            commit e6659190bc72350a2b1848d30d1098aa61f29849
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 13:37:52 2019 +0800

                模板部分滚动条显示出来

            commit 942579e843fef29e00e4764d4acac312a51496ec
            Merge: 2b7ce81 7a014d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:35:56 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 7a014d0d797d7e90f88a8d0f939c9845096b0411
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:35:18 2019 +0800

                有糖尿病bug修改

            commit a66f41acdd18acfa5dd6343178571743f1193226
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:32:44 2019 +0800

                其他史查体回读bug修改

            commit fa664ffcfa65bd1438999b0f9e79f99c80f7d531
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 11:30:05 2019 +0800

                删除诊断没有id时(添加名称判断)

            commit 86720794a59da37c8700f72e96740bcdf1906dc8
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 11:27:23 2019 +0800

                bug

            commit 3de2cf0c7fae1a0f1a994ee604f696d1f64c191e
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 11:09:44 2019 +0800

                1024下历史病例显示问题,清空主诉聚焦不在span

            commit 3f9e94c357e549318c1e79a04842a4c477d58974
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 10:03:29 2019 +0800

                pushContainer添加定位信息

            commit ec0a210bc616de96a0ed48df41300fcf95f6b1f3
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 10:02:01 2019 +0800

                预览宽度有误

            commit 2b7ce81ae4a157abf013f3b2f156b5d280f9403e
            Merge: 78fe295 de5b6f2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 09:52:32 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/components/OtherHistory/index.jsx
                #	src/components/PreviewBody/index.jsx

            commit de5b6f2da0953c8bce31d166490d633f5c8d39c4
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:41:50 2019 +0800

                模板男女弹窗样式调整

            commit b2b959689c9b48b7e82b07766b7320952d649dbd
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:25:31 2019 +0800

                弹窗高度动态变化

            commit a2006f9c3a15df6225e8f5664e3f8330e9def1b7
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:22:25 2019 +0800

                弹窗宽度变化

            commit c6d4ec0ba654f8ed6d25c92f592c11fa8dfc0491
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 16:51:25 2019 +0800

                bug

            commit 8bfb380ec8366c43dbd2d3a0078ccc9f13816d62
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 11:10:18 2019 +0800

                连续两个句号处理

            commit fb65e9d6a4af98dcfafc8008963a59e9ef368dbb
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 10:45:55 2019 +0800

                判断是否为空只判断文本不判断结构

            commit 1749ad61e39543920defb0e8be1d7ce61a03a7bb
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 10:34:52 2019 +0800

                男女模板区分

            commit ef798e435a077495c1e84d3ca6893a7e78470119
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 17:28:30 2019 +0800

                模板性别

            commit 78fe295b3e69c7e7720b73ea67d3ffcc347f8554
            Merge: d5b22a1 3abdfe7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:25:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit d5b22a1659068387f4fd1cd0a76d10da296f9511
            Merge: 52a81ab e073408
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:24:55 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/components/CheckBody/index.jsx
                #	src/components/MainSuit/index.jsx
                #	src/components/SpreadDrop/index.jsx

            commit 52a81abd66ca014880035ac04d229f22c54f9768
            Merge: 6b572c4 b133db8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:16:29 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 3abdfe7396e7375d4d9a5fbafe0d11705494a101
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:35:13 2019 +0800

                其他史查体删到只剩一个文本标签时整行可落光标

            commit 65bf32b0cedb716f36c2d9bcba9cc79993a35cbc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:24:27 2019 +0800

                删除多余代码

            commit 333360a86405a53dc566e1db80812c62e9ada9df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:18:58 2019 +0800

                其他史查体提示优化,未获取到数据的情况优化

            commit b133db8b2ebe68183f0fca8a934b79e037ab2702
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 15:14:08 2019 +0800

                11

            commit 6b572c48f1c7b75e669aa328ab8d0c8271cd6a5f
            Merge: d7668cb 3131b2d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 15:12:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 3131b2d66e39cb5df50b50a1512f3b3d7878cc83
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 10:56:58 2019 +0800

                主诉搜索框位置

            commit d7668cbc0bb1a57218083423f483367f6b6a1bbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 10:13:02 2019 +0800

                杂音类变量串bug

            commit 5ef7897748fe81cfc3a1e9e30a9cad9eb8576fac
            Merge: 77daf9d 0de92f7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:46:01 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/components/NumberDrop/index.jsx

            commit 77daf9d197cf583de16612dbc20339502081545f
            Merge: bd64c01 5479437
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:28:15 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/SpreadDrop/index.jsx

            commit bd64c01ccec1e2ee37ad148b84aed1d064ae85d3
            Merge: 7dfd62a b380174
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:20:27 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b3801745fb6938eb8bd727cc5b32ed7086dffdbd
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 20:15:51 2019 +0800

                化验文字太长显示省略号

            commit 33b3ef1bccc633bd90a57721429bcba5a4a71803
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 20:04:17 2019 +0800

                ie滚动

            commit 0de92f7a8175bb40e3ab8dc32b38ccc2b62d5cb4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 19:17:48 2019 +0800

                其他史查体提示bug修改

            commit ad5200304ddeec1bc1cead1e49f550319b1feff8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 19:04:44 2019 +0800

                单选双击编辑删光后失焦存值bug修改

            commit c1b9af5899a71f7398b2fd94a42770a59f77c7bc
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 18:59:06 2019 +0800

                数字带单位弹窗问题

            commit 7dfd62a2a867fd19a1ad80521c077eddd75bb484
            Merge: b901e9e a599e98
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 18:43:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit b901e9ed954d6502578623c1f28ea9edfe83dfbd
            Merge: b8b4174 a99d722
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 18:42:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/CheckBody/index.jsx
                #	src/containers/eleType.js

            commit a99d722b957624438e91fb405418e8637f83f52f
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 18:32:09 2019 +0800

                滚动条弹窗调整

            commit ad1e46d28fbb2eeb3d894e82af6402aa8f4bf83e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 16:07:32 2019 +0800

                数字组件事件优化

            commit a599e98ab469a915bf759d3c08693ee313c13fa6
            Merge: 0d67c39 b8b4174
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 15:03:38 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 0d67c39cf1c0cb0949f3e98869b660c5de42ebd3
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 15:00:24 2019 +0800

                修改治疗方案药物治疗类名字段

            commit 27aced28537943a5b75cdaec24ad1f65ccec9477
            Merge: bc555b0 b8b4174
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:40:18 2019 +0800

                Merge branch 'dev/new1' into dev/otherHis

            commit b8b4174d5b561c963a269b29d737eec0a58f6889
            Merge: 27d6b1a e11a555
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:19:59 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 27d6b1aed64dbe80fe158dbe620f1c8f9ecda70f
            Merge: 5ae0fe1 1a7645e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:19:36 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/store/reducers/checkBody.js
                #	src/store/types/checkBody.js

            commit 5ae0fe1ebf36274d45e5a7d70709f655a54fa0be
            Merge: 6af13c9 bfad6c4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 09:46:23 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit e11a555129229f1ddb189c1a912f1d781270eac9
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 09:45:41 2019 +0800

                搜索结果去除诊断中已有诊断

            commit bc555b0a62f3d06017256e567738e1796f254a82
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 09:41:47 2019 +0800

                其他史删除不必要事件

            commit 8638209c04be43066a35ad6fab211e92bbd637b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 20:03:29 2019 +0800

                删除console

            commit 08da5c25ae264534d19e3c4fa7c5e370b3e0d456
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 20:01:46 2019 +0800

                诊断搜索添加同义词

            commit 9f0f76b675ccb06b8cb0d3655680a238d7cc4ae3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 19:46:31 2019 +0800

                ie8子标签灰显bug

            commit 10ec058189f5bbee4d5dcb47a45001988ca3d870
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 19:28:05 2019 +0800

                修改版本号和免责声明字体颜色

            commit e627b67e63d6fa3c1d4faa9ab492c0bf4d8ee1c1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 19:22:48 2019 +0800

                开单项没选择时,不跳到医嘱

            commit c60e17b33180d7485a46ca9e98c0ed16c7775f2a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 18:32:50 2019 +0800

                注释同类药物双击打开药品说明

            commit bfad6c404134c5268b07a2c79f1f8a386f952bc8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 18:20:17 2019 +0800

                诊断延迟搜索

            commit 69b02c93e3b2afb26f44733c2ef9558e2852047e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 17:04:52 2019 +0800

                查体既往史类事件处理添加

            commit bdc074220b4d662818d430e56e7f9796efd06537
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:58:12 2019 +0800

                其他史乙肝有高血压顺序勾选bug修改

            commit 48abc323e58cf8f400c0371b5cdff14fdf54b4d9
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 16:57:11 2019 +0800

                nothing to do

            commit f6f6e023919d536dd60b746e6f3b0b3267c332c2
            Merge: 3b8fdf4 6af13c9
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:51:35 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 3b8fdf425f7cd93dbb736cfe8bcb90ac72b900bf
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:48:56 2019 +0800

                通过ID搜索药品说明书(添加数据时查看药品说明书用)

            commit 6af13c94c3cb901fbc0e49f77ecb45f1950b4fbc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:26:45 2019 +0800

                翠加

            commit e1af9c88f74e6483b81850953f1af2051040e677
            Merge: 5ae9b8f 012bb7f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:21:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 5ae9b8fae1e7d1f56f160b6f2d621b8d6e53658d
            Merge: 8decc9d 5b1feca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:21:38 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/common/components/SearchOption/index.jsx
                #	src/common/js/func.js
                #	src/components/CheckBody/index.jsx
                #	src/containers/CurrentIll.js
                #	src/store/async-actions/homePage.js

            commit 8decc9d3e8255de2c81420a833e69582686aafdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:19:15 2019 +0800

                罗磊修改

            commit 012bb7f0ea4d0ec66f313834b0e97beed46c028f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:17:54 2019 +0800

                药品说明图标增加鼠标进入状态

            commit c4ea61552060862a541493087ec096a413cbca2c
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 16:12:30 2019 +0800

                高度计算有误

            commit 50769d9e8a9845954a58145e5b7041b131729b67
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 15:59:38 2019 +0800

                标点预览

            commit 4a8b8a17d9b784225eaa07d67925752339418ee1
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 15:49:58 2019 +0800

                滚动条问题

            commit a4f1c2776effa4bfb1c9628d48cee2a755d8558b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:36:47 2019 +0800

                诊断搜索增加搜索值为空情况

            commit cd77c307ae34abe8cfb6fb53f235beb8f43d884d
            Merge: ac44ed4 f7ec699
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:28:05 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit cee1138681863aa93e2374d48707171b294c0032
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 15:24:41 2019 +0800

                预览行内样式部分修改到less中

            commit ac44ed44fed7b42457e2dfc60b9ab13c97e0ced5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:06:10 2019 +0800

                提示信息疾病详情页右侧菜单

            commit 816fa09299c0177beac8573e50be4c86495a37f2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 14:59:20 2019 +0800

                标点灰显bug修改,下拉对应标签高亮颜色修改

            commit 3330385dd3ea7b2b419f5dbb92f05f8a20bc3c39
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 14:09:59 2019 +0800

                标点符号跟前一个标签灰显黑显

            commit b77a4e183b8413cbac1b663233b3382c7641857d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 13:43:26 2019 +0800

                修改诊断搜索参数

            commit b1f56da5d60d2944c4bbc8a8ccc61548f08b55e1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 13:26:29 2019 +0800

                纯标点符号不搜索,查体获取数据bug修改

            commit d6849d30404fe7d3346909a7e10bc894d1f2ba33
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 11:39:43 2019 +0800

                只有标点符号时不搜索

            commit 4f7c951a117bec49fa853071847422a8dbf51e9a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 11:23:42 2019 +0800

                单选组件双击编辑删完后失焦显示重复值bug修改

            commit d771a09a5fc4e3e7af92e3ff3c85ed44975b2648
            Merge: 28cd3ba f7ec699
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 11:13:20 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 28cd3bac18b0daa796f8a1a9292db3a24cb8e862
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 10:41:36 2019 +0800

                主诉数组多个空格元素处理

            commit 790d34dc38e886c3df1e67603922838f904e4ea7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 09:48:25 2019 +0800

                药品说明书鼠标指向方式

            commit f7ec699eb2b493c4bbbd0ee60194b639a6c8b8e8
            Merge: 6c245fb 909ab25
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:43:41 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 6c245fb0901d2234a0aef7568039651dd4cdf91e
            Merge: 96cc574 e36be2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:43:15 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/common/components/SearchOption/index.jsx
                #	src/common/js/func.js
                #	src/common/less/variables.less
                #	src/components/Operation/index.jsx
                #	src/components/PreviewBody/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/SpreadDrop/index.jsx
                #	src/containers/CurrentIll.js
                #	src/store/async-actions/patInfo.js
                #	src/store/reducers/assistCheck.js

            commit 197b0e5b453fa4446f71b728768baa67e5ab4700
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 09:42:48 2019 +0800

                修改版本信息字体大小

            commit 96cc574ab24f3da14e1f89610e6c5a1e451fa051
            Merge: 5a2d97b fe9e87d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:35:47 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/common/less/variables.less
                #	src/components/PushContainer/index.jsx
                #	src/utils/tools.js

            commit fe9e87d5e0735c356cc4041292dad4ce9cce18dc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 17:30:38 2019 +0800

                搜索为空清除列表数据

            commit 909ab253717bafa4c9ffb3164441d8554e17ed03
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:27:10 2019 +0800

                输入框添加行高

            commit c870ce40e66ec3471bd8ab660346d41ca6374891
            Merge: 82c0130 cb47bc5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:12:48 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 82c013012b1ec9adad9ea974c609c785bae349b2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:12:26 2019 +0800

                删除console

            commit 656a2e69d55a87696a52780074cdb97ebf72c3e5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:03:22 2019 +0800

                提示信息详情页弹窗显示

            commit 94a46327141d7b22d245afbfef4908fca8b852df
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 15:50:52 2019 +0800

                化验没有参考值正常显示

            commit 5a2d97b0f644ef6172cce575e520ca3000cef9b0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 15:28:39 2019 +0800

                ie8点开下拉未选值存值bug修改

            commit 23f6f91a57f4c57826e5cd4adc6aea676a21751e
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 15:19:16 2019 +0800

                1.ie8自动转换中文为unicode导致判断有误
                2.阴影改为边框
                3.主诉现病史删除得到数组里有空元素处理

            commit 5e1184e69747c823a1ce3bba657332f1443f802b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 15:15:35 2019 +0800

                回读无查体点击唤出模板

            commit 48a9a00b3b5b31e499d32f8f6edbbda57390e721
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 14:30:22 2019 +0800

                切换模式其他史数据bug

            commit 4717362f96dd641518ca546c2b270a2c3f6d5002
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 11:38:42 2019 +0800

                血压类文本子标签存值

            commit 08f9160a8e26952c695d9563ece0cef09d7e6164
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 10:59:43 2019 +0800

                清除移除患者信息缓存

            commit cb47bc5b79d7f6e319a1b837d27012841925c678
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:16:42 2019 +0800

                翠翠分支未合单独添加

            commit 2a770d6266f8c7f5f0bd892befa6fa69166487bd
            Merge: 3e68866 86e1d1d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 3e688668bdaf2d376901cfa70a90a3587ad7ff69
            Merge: dc08557 4f90da8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit dc0855703def7c3a0c56c74d0b033b42657cb62e
            Merge: 13db5c1 db268fc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 4f90da88492079a14a3c167d364cc6b0160c668c
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 16:58:38 2019 +0800

                弹窗关闭时机

            commit 13db5c1cccec8c7f3ac5cb72d19aaf05a5bb63e4
            Merge: 58cffc8 6e906e0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 16:56:59 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 6e906e06753a119829e67db34a0e32e1c2d1a4db
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 16:23:12 2019 +0800

                查体选中杂音血压选中状态bug修改

            commit 1e57bc5dc0b63eaaa040d59d53c9f1a9409d2030
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 15:42:03 2019 +0800

                单选组件下拉项可和名称相同

            commit 9318dc730440ce833cd1317aed52699572208224
            Merge: 58cffc8 db268fc
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 14:21:22 2019 +0800

                Merge branch 'dev/byll' into dev/new1

            commit db268fc6f4c11065e36e4405170bd08e667ce6fa
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 14:19:41 2019 +0800

                ie8搜索单个文字删除报错问题

            commit 86e1d1df0baee680a7c5bf99e8d6cbae4284c83c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 14:15:14 2019 +0800

                治疗方案药品说明显示方式

            commit 1391edf5cda27a44817030cb9fef6486da15b51e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 14:14:41 2019 +0800

                下拉框打开时标签边框蓝色

            commit 758555c01c184adde48fb869909a1b9fdb77f4b1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 13:50:39 2019 +0800

                箭头函数传值性能问题修改

            commit 8e25532ad88b1ca014acaaffb61155f3f62e8c64
            Merge: 7a78823 58cffc8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 09:48:15 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 58cffc89d51661f2edbd21e1424fdd29afd590f9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 18:21:01 2019 +0800

                上次提交回退

            commit 4ca59db29b1a256c9b3015646301c0105cead455
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 18:13:57 2019 +0800

                数字组件ie8输入报错参数无效bug修改

            commit 5afd59399265b3a516e35317687946d2df551c9b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:59:35 2019 +0800

                删除多余代码

            commit d56b647e2f32fc9e5a50e58376d1677076b9c5c0
            Merge: deb3340 e5ee60b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:57:54 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/containers/CurrentIll.js
                #	src/store/actions/mainSuit.js

            commit 6c4e29739d3dbe45b1843f5a5fb2c054784d0739
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 16:55:03 2019 +0800

                ie8右浮动不生效

            commit deb33405ce270e3b1495e51fd537fa6d56f1a615
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:54:34 2019 +0800

                免责声明弹窗层级bug修改

            commit 15718f043d724dd440aab0d23c6eaf3cf54d2059
            Merge: c2f5a1e 0ca5c1f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:34:51 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit c2f5a1e29bd29942c2faa59fd4fd645bbe50a814
            Merge: a1c28c3 19f31f4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:17:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/components/AddAssistCheck/Textarea/index.jsx

            commit 0ca5c1f1aa7ce0b7c558cd53b0c4fc19ad096f90
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 16:13:59 2019 +0800

                11

            commit a1c28c3d77f4d5d27b7ec1ef0ceb1aaf8a6afdb4
            Merge: 8bc39fc 3dbeabd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:13:41 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 3dbeabd15713010eb953dcee9c619e0cb4e89baa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:10:56 2019 +0800

                弹窗层级修改

            commit b34feffbe308202a21d56c822371d5900e4d784c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 15:53:02 2019 +0800

                其他史无主诉第一次提示后不再提示bug修改

            commit 541a45685981ece9caf11ef7ee13d871e1aaaf27
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 15:47:44 2019 +0800

                搜索框下拉位置bug修改,杂音文字为多行时下拉遮挡文字bug修改

            commit b9bb9cba1fe356d94bdc64a1caa4b60460bdef68
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 15:36:55 2019 +0800

                复制内容样式乱掉问题解决

            commit 9641e6a1c9fd1fefa66a4324401cf38d60e29cf3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 14:37:35 2019 +0800

                无殊选中状态遗留bug修改

            commit 641c5762b7f7f98d532eb23fc97f881d33575222
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 14:18:44 2019 +0800

                打印相关样式修改ie待测

            commit e93c7c1557bee766ff94dfa4952cdf2f69c4e926
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 13:51:30 2019 +0800

                用户信息banner不被下拉框遮挡,杂音选中样式修改

            commit 64d1cffdb7e562263084ba5827df988a099ec7b7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 13:26:25 2019 +0800

                杂音类型下拉样式优化

            commit 08ab0d25e5c54f3535156e248de5063ff4454a2f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 11:31:31 2019 +0800

                其他史查体tagType4类型搜索选中展开

            commit a96e98a90f83c7d0e625f973b79cb65d33792623
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 10:48:50 2019 +0800

                获取模板接口放在获取病人信息回调中,确保参数不为空

            commit 19f31f4d19c841c9a0a86be849d749815e27a1c1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 09:43:48 2019 +0800

                修改标题点击enter问题

            commit 8bc39fc836e6f24fc599d8d679164f7412ac71f3
            Merge: 993eaf0 6fe34e5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:56:44 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/components/AddAssistCheck/index.jsx
                #	src/components/Inspect/index.less
                #	src/components/NumberDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/store/actions/checkBody.js
                #	src/store/actions/mainSuit.js
                #	src/store/reducers/assistCheck.js

            commit 993eaf02f2d5d2b0244587ed7096d1fcf9659465
            Merge: 11260ee 6ca010f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:52:56 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 6ca010f83a2b882163bfaf3ee7f125f45e8d5ce3
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 17:36:47 2019 +0800

                字体不一样,button问题

            commit 8433d68d9027b2c31c5db2da33182c1507f08f9b
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 17:12:29 2019 +0800

                更改中文冒号,修改辅检div样式,添加搜索ie8兼

            commit 11260eeb9c9958368e933981df83e4e097a04c9d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:08:07 2019 +0800

                杂音类型双击编辑blur后重复输入值bug修改

            commit 2911db7154036da7df72eb04b6e2a35b32c71106
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:48:08 2019 +0800

                双击编辑前后缀bug修改

            commit 6eef6a051d230f9f52a1df2ae6b5e3044c7b3505
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:33:58 2019 +0800

                主诉-其他史组件双击编辑前后缀存值

            commit 00f2e00fb09170526cd4101b320ece3b694e28f3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:07:49 2019 +0800

                查体数字组件双击编辑前后缀存值,血压类型标签双击编辑时不显示下拉框

            commit 8019239ea85bf8e66de7adff69d1fcc9b94eb226
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 13:57:24 2019 +0800

                修改ie8多[]bug

            commit 70689ffbb3b43af0bcd21e0c6898855ede313faa
            Merge: aca9d8f 3fe1212
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:36:41 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit aca9d8f6b118a3653050c6f59cbed645ac1b824d
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:19:43 2019 +0800

                判断模板保存前后是否相同

            commit a643a04284503f3491206a6da28f02e3b239bdfd
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:03:33 2019 +0800

                打印保存判断问题

            commit 665613f2a02a496e485917ee653ba58e4744fa7d
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 09:38:25 2019 +0800

                写死参数更改

            commit 3fe1212b9a37b328037ea87e8ed83b83bc71a5a6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:56:33 2019 +0800

                其他史提示无主诉时可输入bug修改

            commit d895d0391f5389858501b5be2d98c93516740f1a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:29:35 2019 +0800

                查体框可编辑状态删除

            commit 0ea49aca9cfc5399c0d074c81fe7a330a76ed40b
            Merge: 2799250 2facfcb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:19:21 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/containers/eleType.js
                #	src/store/async-actions/treat.js

            commit 2facfcb8073c095fa0b6ae3eb54566fb072d7c85
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:15:41 2019 +0800

                查体获取数据失败时可输入bug修改

            commit 141ab5430c47c52bcff13dc7d34cc5a7fa134d4c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 15:12:53 2019 +0800

                其他史查体搜索结果放前后bug修改

            commit 9572b216a7c48e9947d3ce028b10f5849cb72102
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 14:34:34 2019 +0800

                其他史搜索选中位置bug修改

            commit ee5b7c3eb6a0e6328e2ee500deca54b756d69848
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 13:48:27 2019 +0800

                搜索bug修改

            commit c7e0483300e2188b162ce41063d38a50706979aa
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 16:34:50 2019 +0800

                11

            commit 7a7882300853f5a273686f709ab0462ad706a8f0
            Merge: 420bcf7 2799250
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 15:28:00 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 27992500bd6cd1d92f6cc4411a8436f36ef565d0
            Merge: 9573ac3 945c448
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:57:17 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit 9573ac3a696fa8e206e5a46e588dc4daad049381
            Merge: c90d43b fbbb8fb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:57:10 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit c90d43b677ba6dbaad86bd1fc8d4731eb46165b5
            Merge: d2c86ef 81e413f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:56:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/containers/OtherHistory.js

            commit 81e413f1f4296fc8bcc22485e5779ddb776478f1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:53:45 2019 +0800

                之前修改的bug找回

            commit 420bcf750b1e316f23b750de4985441221ef0a5c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 14:53:11 2019 +0800

                修改同类药物样式

            commit 3bf089d9605e75bf7511e9d42fa6b03c9c6066b1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:44:35 2019 +0800

                改为全局弹窗显示

            commit fbbb8fbbb040b404ee7307b1b95505cea783626a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 14:38:23 2019 +0800

                修改添加诊断推送

            commit e1240a8e9f409aa5e4382e2bc0ef63ed6ff0a1dd
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:20:22 2019 +0800

                弹窗高度动态设置

            commit d2c86efb89cba523db9c587e7d8435a4b2be8531
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 11:16:53 2019 +0800

                无选中项体温输入bug修改

            commit aa6d15a7c141f10f275f1fc470d0eba476ffc4b2
            Merge: 9f91346 1fccd43
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:57:06 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 9f91346e73a2a64ce463baf32723a8c9e3b9cc05
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:55:41 2019 +0800

                bug修改

            commit 1fccd439ee53729685732eeb6fbbfe1be0eda80d
            Merge: 986a3cf 2e25c1b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 09:58:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 3385c2c2a41d0b223136f5f176487cce09e1c082
            Merge: b876b6b 2e25c1b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 09:51:36 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/otherHis

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit e697f350f7724505282d06dfa0dc2ae001ea9c09
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 09:46:57 2019 +0800

                 删除console

            commit 2e25c1bb7076358b6e4063ced5731c3f456eb704
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 09:40:43 2019 +0800

                诊断第一个为复诊添加到主诉

            commit 986a3cf5976bfec9bce6afb554bab1f4a1a2a49d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:33:59 2019 +0800

                合并

            commit c900ae632d99d0c0fb2e2e5f9788707ada02745a
            Merge: 31ef38b b7bfe2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:18:38 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/components/AddInspect/index.jsx
                #	src/components/CopyRight/index.less
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Inspect/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/Treat/index.jsx
                #	src/components/Treat/index.less
                #	src/containers/NumberUnitDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/diagnosticList.js
                #	src/store/async-actions/treat.js
                #	src/utils/tools.js

            commit 31ef38b3d5b46612b64866687214c2b9d1651b03
            Merge: 44fbf2b d6751d9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/CopyRight/index.less
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Inspect/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/PushItems/index.less
                #	src/components/SpreadDrop/index.jsx
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/utils/tools.js

            commit 44fbf2b8d8f90640a9af8abe4da55c2af7efa319
            Merge: db4e755 935c0cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:52:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/components/PreviewBody/index.jsx

            commit db4e7559fb2bc15434058503ca8d1a1e3ffe8ad6
            Merge: edb84b0 9483642
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:44:26 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/components/TreatDesc/DrugInfo/index.less
                #	src/store/async-actions/treat.js
                #	src/store/reducers/treat.js

            commit edb84b07adad34cdd5c94a592e543127d20eaec1
            Merge: b876b6b 6b71cd5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:35:50 2019 +0800

                更新

            commit b876b6b8dc6afe12ae2a90c990d147e32221d02c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 14:38:05 2019 +0800

                其他史有伴无排序

            commit f8ab9c103e8266a6ab44466a7fadbc1f0a91ceca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 14:06:33 2019 +0800

                查体搜索自由文本位置bug修改

            commit e45296e22263659c86f60d031bc5246c7f1be726
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:51:40 2019 +0800

                复诊主诉文本模式bug

            commit f5cae58692247cad7c0b3ff8966a2f7d5213069c
            Merge: 960317d d3e160a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:39:27 2019 +0800

                Merge branch 'dev/new1' into dev/otherHis

                # Conflicts:
                #	src/components/SpreadDrop/index.jsx

            commit 960317de925978075041b722cd3500488ce924fd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:36:13 2019 +0800

                双击隐藏下拉

            commit 06571b04a337a3805d723e22e964c5ba683293f5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 10:28:18 2019 +0800

                主诉saveText无值则判断为空,查体其他史聚焦提示

            commit 94836425d1dc9b9cf5cc1f2ce6f3bdc3706fd578
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:50:58 2019 +0800

                修改版本信息样式

            commit e0092d7003c2bcfecc38a77350d29ddc1a92dbf2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:40:32 2019 +0800

                关闭药品说明书时清除内容

            commit a921420ddd0b8c4c8101b1d5bb1d7fec8e422341
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:01:15 2019 +0800

                修改治疗方案和药品说明书样式

            commit 935c0cf687389a50aeef502b97f07685e675bd1d
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 17:16:52 2019 +0800

                滚动兼容

            commit 6b71cd51bbafd8c4283b1c16fae3a538a88f5651
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:54:56 2019 +0800

                现病史病程变化

            commit 91c3713c62e8eb4b9437b00d754133e87561d8cc
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:36:48 2019 +0800

                注释scrollTo

            commit 2123a1e9839af1052e1405d6a005ddf521041c9d
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:10:44 2019 +0800

                Squashed commit of the following:

                commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 16:00:51 2019 +0800

                    打印医生签名自动获取

                commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 14:09:41 2019 +0800

                    样式调整

                commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 14:02:27 2019 +0800

                    化验填写单清空按钮,弹窗还在

                commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 13:46:36 2019 +0800

                    模板列表获取时机

                commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 13:34:03 2019 +0800

                    模板名称重复弹窗不关闭

                commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 10:46:13 2019 +0800

                    模板保存跟之前所有保存的模板作对比

                commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:35:01 2019 +0800

                    底部几个按钮换行设置最小宽度

                commit 7400613a1eb642e1d01004c7818883fd73c2350c
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:28:45 2019 +0800

                    历史病例时间和按钮不能共存

                commit eda3f4b08a3460360541cd2af1c2ca071681c595
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:12:47 2019 +0800

                    bug修改

                commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 15:54:49 2019 +0800

                    还是符号处理...

                commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 14:17:40 2019 +0800

                    顿号去重

                commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                Merge: 4095b3f b09559b
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:59:54 2019 +0800

                    Merge branch 'dev/new1' into dev/byll

                commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:55:47 2019 +0800

                    样式宽度更改和逗号处理

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

                # Conflicts:
                #	src/utils/tools.js

            commit 6df92ea9ddd29c14979874f2f0e7eac54d032eaf
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:07:27 2019 +0800

                Squashed commit of the following:

                commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 15:20:06 2019 +0800

                    治疗方案样式

                commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 15:18:20 2019 +0800

                    修改治疗方案样式

                commit 859a7364a96569f6aa92360efbce5a19b40681cb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:32:44 2019 +0800

                    修改治疗方案小标题样式

                commit 99789b23f06c18e5b588552066faf7f2ccacf198
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:07:48 2019 +0800

                    修改治疗方案同类药物

                commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:00:40 2019 +0800

                    修改弹窗IE8不居中

                commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 20:30:39 2019 +0800

                    治疗方案高度自适应

                commit c000d83fb6ac5f265951c0e1377b627d24d2da10
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 17:27:30 2019 +0800

                    修改治疗方案边框

                commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:58:28 2019 +0800

                    导入化验结果,第一次添加诊断为主诉时不往主诉添加字符串

                commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:56:03 2019 +0800

                    治疗方案标题添加疾病名称

                commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:22:37 2019 +0800

                    修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:41:20 2019 +0800

                    ie8治疗方案遮罩

                commit fee35d5473b69aafb5335759006a93fea8d14145
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:05:16 2019 +0800

                    治疗方案遮罩IE8

                commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:04:58 2019 +0800

                    修改右侧推送字体大小

                commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 13:26:56 2019 +0800

                    修改化验项开单逗号问题

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

                # Conflicts:
                #	src/components/Treat/index.jsx
                #	src/components/Treat/index.less
                #	src/store/async-actions/diagnosticList.js
                #	src/store/async-actions/treat.js

            commit 20f96c311119b635dad33f6c9222d94d8563bbfe
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:02:31 2019 +0800

                Squashed commit of the following:

                commit 27178b569e9575d450bbf1ce329e069d4c4b4b8c
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 30 15:57:20 2019 +0800

                    ie8现病史添加症状报错的问题&查体血压选中不变黑的问题

                commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 18:17:15 2019 +0800

                    查体模板添加逗号,主诉两个时间处理
                    Squashed commit of the following:

                    commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:51:09 2019 +0800

                        Squashed commit of the following:

                        commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 14:17:40 2019 +0800

                            顿号去重

                        commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                        Merge: 4095b3f b09559b
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:59:54 2019 +0800

                            Merge branch 'dev/new1' into dev/byll

                        commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:55:47 2019 +0800

                            样式宽度更改和逗号处理

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit fea9a721ccb5afb9f1873c2111e3722d7330d394
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:50:07 2019 +0800

                        Squashed commit of the following:

                        commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 15:22:37 2019 +0800

                            修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                        commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:41:20 2019 +0800

                            ie8治疗方案遮罩

                        commit fee35d5473b69aafb5335759006a93fea8d14145
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:05:16 2019 +0800

                            治疗方案遮罩IE8

                        commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:04:58 2019 +0800

                            修改右侧推送字体大小

                        commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 13:26:56 2019 +0800

                            修改化验项开单逗号问题

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                        # Conflicts:
                        #	src/components/PushItems/index.jsx

                    commit 2c70e41e7a5254838436b499b1ad787f523585f8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:42:54 2019 +0800

                        Squashed commit of the following:

                        commit 519f23c91954f87e836cbd400b158f774c498ba6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Tue Jan 29 15:35:59 2019 +0800

                            文本删除又出现的问题
                            Squashed commit of the following:

                            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Tue Jan 29 11:44:56 2019 +0800

                                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:41:03 2019 +0800

                                Squashed commit of the following:

                                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                                Author: Luolei <16657115156@163.com>
                                Date:   Fri Jan 25 14:06:09 2019 +0800

                                    date修改

                            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:38:40 2019 +0800

                                Squashed commit of the following:

                                commit 29b2499b796085a682a936d82c97decc35edf891
                                Author: zhangxc <zhangxc@zjlantone.com>
                                Date:   Fri Jan 25 13:50:07 2019 +0800

                                    修改版本信息和免责声明位置

                            commit e36f2f1b811d6978117161f50b16dd5bae298547
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:33:30 2019 +0800

                                Squashed commit of the following:

                                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 15:59:14 2019 +0800

                                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 14:21:41 2019 +0800

                                    Squashed commit of the following:

                                    commit d3e160a516240b77576567b993223816a68231a6
                                    Merge: 79e63ed c7e9e73
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:48 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:16 2019 +0800

                                        化验辅捡ie8搜索卡死修改

                                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:12:43 2019 +0800

                                        默认host地址删除

                                    commit e01035349f92405572238a0a97d80bb557dda802
                                    Merge: 8a8015d caad36f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 11:45:20 2019 +0800

                                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 10:59:52 2019 +0800

                                        修改样式

                                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:46:01 2019 +0800

                                        合并报错修改

                                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                                    Merge: bbe85ff 58e0fdd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:42:51 2019 +0800

                                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                                    Merge: b86268a 3bfa819
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:30:05 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/containers/SpreadDrop.js

                                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                                    Merge: 79c59d3 105488f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:25:44 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                        # Conflicts:
                                        #	src/store/async-actions/treat.js

                                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                                    Merge: db90e04 de190a5
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:24:40 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 20:18:42 2019 +0800

                                        中英文逗号

                                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 18:31:55 2019 +0800

                                        去掉英文逗号

                                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 17:22:34 2019 +0800

                                        修改治疗方案

                                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 16:49:10 2019 +0800

                                        下拉项间距调整,ie8事件兼容

                                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:09:49 2019 +0800

                                        药品说明书样式

                                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:08:17 2019 +0800

                                        修改药品说明书

                                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:06:17 2019 +0800

                                        修改开单样式

                                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:02:30 2019 +0800

                                        修改获取患者信息路径

                                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:43:38 2019 +0800

                                        添加诊断判断有没有治疗方案

                                    commit f617e5c267246786e7a6801cc87811f0d2527235
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:39:13 2019 +0800

                                        merge from 'dev/zxc'

                                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 10:33:44 2019 +0800

                                        提示语

                                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                                    Merge: d3ade00 95e9a94
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:09:57 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                        # Conflicts:
                                        #	src/components/DiagnosticList/index.jsx
                                        #	src/components/Operation/index.jsx
                                        #	src/containers/SpreadDrop.js
                                        #	src/store/actions/otherHistory.js
                                        #	src/store/async-actions/treat.js
                                        #	src/store/types/checkBody.js

                                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                                    Merge: 2fd497e 2458ea1
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:05:17 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:03:28 2019 +0800

                                        提示语消失默认时间改为2秒

                                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 10:02:00 2019 +0800

                                        治疗方案置灰

                                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:59:16 2019 +0800

                                        治疗方案

                                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                                    Merge: 62bd7fb 38f9720
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:47:47 2019 +0800

                                        Merge branch 'dev/new' into dev/zhangxc

                                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:32 2019 +0800

                                        Revert "Revert "修改药品说明样式""

                                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                                    Merge: 28c364a c37d1cc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:00 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:45:29 2019 +0800

                                        Revert "修改药品说明样式"

                                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:25:58 2019 +0800

                                        搜索列表显示样式更改

                                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:15:40 2019 +0800

                                        样式调整

                                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:22:29 2019 +0800

                                        修改导入host

                                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:15:44 2019 +0800

                                        临时修改版本弹窗高度

                                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:10:27 2019 +0800

                                        化验导入删除填值推送

                                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:43:48 2019 +0800

                                        添加删除辅捡右侧推送

                                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:30:50 2019 +0800

                                        修改杂音选中项bug

                                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                                    Merge: b489e52 6a1a3df
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:58:07 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:57:50 2019 +0800

                                        既往史无殊选中bug

                                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 18:57:03 2019 +0800

                                        css

                                    commit 96efc7b8118a99db629f898960621b98786bd42e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:26:40 2019 +0800

                                        合罗磊分支

                                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:49:02 2019 +0800

                                        回退

                                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                                    Merge: 6732dbb 1dd6c92
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:44:02 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/TailInlineTag/index.less
                                        #	src/common/components/Textarea/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx
                                        #	src/containers/OtherHistory.js
                                        #	src/store/actions/otherHistory.js

                                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                                    Merge: bc168f8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:36:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx

                                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                                    Merge: 3559798 6d55c59
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:34:30 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:31:13 2019 +0800

                                        既往史下拉滚动条添加

                                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:22:01 2019 +0800

                                        修改请求地址

                                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 17:16:22 2019 +0800

                                        辅检横向滚动

                                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                                    Merge: adc853a 45b1158
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 16:53:11 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit cf97be2f425bdef386a137e92929969c321ab047
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:08:25 2019 +0800

                                        去掉一个字

                                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:01:26 2019 +0800

                                        bug

                                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 15:58:40 2019 +0800

                                        其他史高血压选中bug修改

                                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 15:16:32 2019 +0800

                                        删除项有问题

                                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                                    Merge: d2eca9d 1a6bf74
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:59:26 2019 +0800

                                        Merge branch 'dev/liucf' into dev/luolei

                                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 14:51:07 2019 +0800

                                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:43:46 2019 +0800

                                        日期bug

                                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:46:29 2019 +0800

                                        请求地址修改-刚才反了

                                    commit 70e9420d59b745c59f3abe04c33100777184d024
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:44:13 2019 +0800

                                        请求地址修改

                                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:39:05 2019 +0800

                                        打印图标

                                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:31:48 2019 +0800

                                        其他史高血压数据展开

                                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:00:06 2019 +0800

                                        查体type修改

                                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:58:27 2019 +0800

                                        查体type修改

                                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                                    Merge: 4b8aa34 540b6a8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:51:52 2019 +0800

                                        Merge branch 'dev/new' into dev/luolei

                                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:47:15 2019 +0800

                                        搜索弹窗被遮挡问题解决

                                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:23:04 2019 +0800

                                        地址临时修改

                                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:20:05 2019 +0800

                                        版本信息弹窗高度限制

                                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:13:40 2019 +0800

                                        推送接口主诉现病史合并,治疗方案容错

                                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                                    Merge: 4a897b4 5a39d90
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                                    Merge: 7f1c7c8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:43 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/common/components/ItemBox/index.jsx
                                        #	src/components/AddInspect/index.jsx
                                        #	src/components/Diagnosis/index.jsx
                                        #	src/components/Diagnosis/index.less

                                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:52:01 2019 +0800

                                        层级问题

                                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                                    Merge: e5d0122 7f1c7c8
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:34 2019 +0800

                                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:21 2019 +0800

                                        11

                                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:39:50 2019 +0800

                                        修改请求地址

                                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:38:05 2019 +0800

                                        修改请求地址

                                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                                    Merge: df67559 a82d18c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                                    Merge: ff817bf 6805811
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:39 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                    commit 68058110e041e72b8c95979a4fd23e690912746b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:43:26 2019 +0800

                                        遮罩统一0.6透明度

                                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:34:59 2019 +0800

                                        透明度ie8

                                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:24:39 2019 +0800

                                        修改治疗方案无内容按钮置灰

                                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                                    Merge: 9c0e078 84ec971
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:09:22 2019 +0800

                                        merge from 'lcf'

                                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 19:01:31 2019 +0800

                                        修改药品说明样式

                                    commit ff817bf6d6d928b98557371362374859bec3aabd
                                    Merge: d50ffe0 b2e679a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:52:34 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:50:45 2019 +0800

                                        导入ie8暂时先灰掉

                                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                                    Merge: 573f0b5 b286d0a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:25:09 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:23:57 2019 +0800

                                        文本模式ie8onInput存值,搜索下拉项样式

                                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 15:30:07 2019 +0800

                                        修改开单项到医嘱逗号

                                    commit 573f0b59ff517de16f94296240572544e31c9f46
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:23:46 2019 +0800

                                        合并后报错处理

                                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                                    Merge: 55d15d6 fbab9de
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:18:22 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                        # Conflicts:
                                        #	src/components/CurrentIll/index.jsx
                                        #	src/containers/EditableSpan.js
                                        #	src/store/actions/currentIll.js
                                        #	src/store/reducers/checkBody.js
                                        #	src/utils/ajax.js
                                        #	src/utils/config.js

                                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                                    Merge: 2d40e6e ad68815
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:10:38 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/components/MainSuit/index.jsx

                                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:02:18 2019 +0800

                                        ie8的onInput代替函数

                                    commit ad688156064254d6b615284642882ba5486ff764
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 10:29:36 2019 +0800

                                        init

                                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:13:57 2019 +0800

                                        updata pro

                                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:12:21 2019 +0800

                                        test

                                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 13:13:11 2019 +0800

                                    单选和多选编辑失焦时调用推送接口

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                            # Conflicts:
                            #	src/components/AddInspect/index.jsx
                            #	src/components/Inspect/index.jsx
                            #	src/components/PushItems/index.less
                            #	src/store/actions/checkBody.js
                            #	src/store/actions/currentIll.js
                            #	src/store/actions/mainSuit.js
                            #	src/store/actions/otherHistory.js

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/NumberDrop/index.jsx
                        #	src/components/NumberUnitDrop/index.jsx
                        #	src/store/actions/mainSuit.js

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/PushItems/index.jsx
                    #	src/utils/tools.js

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

                # Conflicts:
                #	src/containers/NumberUnitDrop.js
                #	src/store/actions/checkBody.js

            commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 16:00:51 2019 +0800

                打印医生签名自动获取

            commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 15:20:06 2019 +0800

                治疗方案样式

            commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 15:18:20 2019 +0800

                修改治疗方案样式

            commit 859a7364a96569f6aa92360efbce5a19b40681cb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:32:44 2019 +0800

                修改治疗方案小标题样式

            commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 14:09:41 2019 +0800

                样式调整

            commit 99789b23f06c18e5b588552066faf7f2ccacf198
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:07:48 2019 +0800

                修改治疗方案同类药物

            commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 14:02:27 2019 +0800

                化验填写单清空按钮,弹窗还在

            commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:00:40 2019 +0800

                修改弹窗IE8不居中

            commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 13:46:36 2019 +0800

                模板列表获取时机

            commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 13:34:03 2019 +0800

                模板名称重复弹窗不关闭

            commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 10:46:13 2019 +0800

                模板保存跟之前所有保存的模板作对比

            commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 20:30:39 2019 +0800

                治疗方案高度自适应

            commit 3e1c705ef6c2b2d0944ced37b8fa3f7c01307e25
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 18:20:27 2019 +0800

                Squashed commit of the following:

                commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 18:17:15 2019 +0800

                    查体模板添加逗号,主诉两个时间处理
                    Squashed commit of the following:

                    commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:51:09 2019 +0800

                        Squashed commit of the following:

                        commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 14:17:40 2019 +0800

                            顿号去重

                        commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                        Merge: 4095b3f b09559b
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:59:54 2019 +0800

                            Merge branch 'dev/new1' into dev/byll

                        commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:55:47 2019 +0800

                            样式宽度更改和逗号处理

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit fea9a721ccb5afb9f1873c2111e3722d7330d394
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:50:07 2019 +0800

                        Squashed commit of the following:

                        commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 15:22:37 2019 +0800

                            修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                        commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:41:20 2019 +0800

                            ie8治疗方案遮罩

                        commit fee35d5473b69aafb5335759006a93fea8d14145
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:05:16 2019 +0800

                            治疗方案遮罩IE8

                        commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:04:58 2019 +0800

                            修改右侧推送字体大小

                        commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 13:26:56 2019 +0800

                            修改化验项开单逗号问题

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                        # Conflicts:
                        #	src/components/PushItems/index.jsx

                    commit 2c70e41e7a5254838436b499b1ad787f523585f8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:42:54 2019 +0800

                        Squashed commit of the following:

                        commit 519f23c91954f87e836cbd400b158f774c498ba6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Tue Jan 29 15:35:59 2019 +0800

                            文本删除又出现的问题
                            Squashed commit of the following:

                            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Tue Jan 29 11:44:56 2019 +0800

                                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:41:03 2019 +0800

                                Squashed commit of the following:

                                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                                Author: Luolei <16657115156@163.com>
                                Date:   Fri Jan 25 14:06:09 2019 +0800

                                    date修改

                            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:38:40 2019 +0800

                                Squashed commit of the following:

                                commit 29b2499b796085a682a936d82c97decc35edf891
                                Author: zhangxc <zhangxc@zjlantone.com>
                                Date:   Fri Jan 25 13:50:07 2019 +0800

                                    修改版本信息和免责声明位置

                            commit e36f2f1b811d6978117161f50b16dd5bae298547
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:33:30 2019 +0800

                                Squashed commit of the following:

                                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 15:59:14 2019 +0800

                                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 14:21:41 2019 +0800

                                    Squashed commit of the following:

                                    commit d3e160a516240b77576567b993223816a68231a6
                                    Merge: 79e63ed c7e9e73
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:48 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:16 2019 +0800

                                        化验辅捡ie8搜索卡死修改

                                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:12:43 2019 +0800

                                        默认host地址删除

                                    commit e01035349f92405572238a0a97d80bb557dda802
                                    Merge: 8a8015d caad36f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 11:45:20 2019 +0800

                                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 10:59:52 2019 +0800

                                        修改样式

                                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:46:01 2019 +0800

                                        合并报错修改

                                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                                    Merge: bbe85ff 58e0fdd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:42:51 2019 +0800

                                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                                    Merge: b86268a 3bfa819
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:30:05 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/containers/SpreadDrop.js

                                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                                    Merge: 79c59d3 105488f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:25:44 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                        # Conflicts:
                                        #	src/store/async-actions/treat.js

                                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                                    Merge: db90e04 de190a5
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:24:40 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 20:18:42 2019 +0800

                                        中英文逗号

                                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 18:31:55 2019 +0800

                                        去掉英文逗号

                                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 17:22:34 2019 +0800

                                        修改治疗方案

                                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 16:49:10 2019 +0800

                                        下拉项间距调整,ie8事件兼容

                                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:09:49 2019 +0800

                                        药品说明书样式

                                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:08:17 2019 +0800

                                        修改药品说明书

                                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:06:17 2019 +0800

                                        修改开单样式

                                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:02:30 2019 +0800

                                        修改获取患者信息路径

                                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:43:38 2019 +0800

                                        添加诊断判断有没有治疗方案

                                    commit f617e5c267246786e7a6801cc87811f0d2527235
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:39:13 2019 +0800

                                        merge from 'dev/zxc'

                                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 10:33:44 2019 +0800

                                        提示语

                                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                                    Merge: d3ade00 95e9a94
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:09:57 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                        # Conflicts:
                                        #	src/components/DiagnosticList/index.jsx
                                        #	src/components/Operation/index.jsx
                                        #	src/containers/SpreadDrop.js
                                        #	src/store/actions/otherHistory.js
                                        #	src/store/async-actions/treat.js
                                        #	src/store/types/checkBody.js

                                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                                    Merge: 2fd497e 2458ea1
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:05:17 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:03:28 2019 +0800

                                        提示语消失默认时间改为2秒

                                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 10:02:00 2019 +0800

                                        治疗方案置灰

                                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:59:16 2019 +0800

                                        治疗方案

                                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                                    Merge: 62bd7fb 38f9720
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:47:47 2019 +0800

                                        Merge branch 'dev/new' into dev/zhangxc

                                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:32 2019 +0800

                                        Revert "Revert "修改药品说明样式""

                                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                                    Merge: 28c364a c37d1cc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:00 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:45:29 2019 +0800

                                        Revert "修改药品说明样式"

                                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:25:58 2019 +0800

                                        搜索列表显示样式更改

                                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:15:40 2019 +0800

                                        样式调整

                                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:22:29 2019 +0800

                                        修改导入host

                                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:15:44 2019 +0800

                                        临时修改版本弹窗高度

                                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:10:27 2019 +0800

                                        化验导入删除填值推送

                                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:43:48 2019 +0800

                                        添加删除辅捡右侧推送

                                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:30:50 2019 +0800

                                        修改杂音选中项bug

                                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                                    Merge: b489e52 6a1a3df
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:58:07 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:57:50 2019 +0800

                                        既往史无殊选中bug

                                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 18:57:03 2019 +0800

                                        css

                                    commit 96efc7b8118a99db629f898960621b98786bd42e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:26:40 2019 +0800

                                        合罗磊分支

                                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:49:02 2019 +0800

                                        回退

                                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                                    Merge: 6732dbb 1dd6c92
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:44:02 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/TailInlineTag/index.less
                                        #	src/common/components/Textarea/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx
                                        #	src/containers/OtherHistory.js
                                        #	src/store/actions/otherHistory.js

                                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                                    Merge: bc168f8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:36:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx

                                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                                    Merge: 3559798 6d55c59
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:34:30 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:31:13 2019 +0800

                                        既往史下拉滚动条添加

                                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:22:01 2019 +0800

                                        修改请求地址

                                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 17:16:22 2019 +0800

                                        辅检横向滚动

                                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                                    Merge: adc853a 45b1158
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 16:53:11 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit cf97be2f425bdef386a137e92929969c321ab047
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:08:25 2019 +0800

                                        去掉一个字

                                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:01:26 2019 +0800

                                        bug

                                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 15:58:40 2019 +0800

                                        其他史高血压选中bug修改

                                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 15:16:32 2019 +0800

                                        删除项有问题

                                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                                    Merge: d2eca9d 1a6bf74
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:59:26 2019 +0800

                                        Merge branch 'dev/liucf' into dev/luolei

                                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 14:51:07 2019 +0800

                                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:43:46 2019 +0800

                                        日期bug

                                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:46:29 2019 +0800

                                        请求地址修改-刚才反了

                                    commit 70e9420d59b745c59f3abe04c33100777184d024
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:44:13 2019 +0800

                                        请求地址修改

                                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:39:05 2019 +0800

                                        打印图标

                                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:31:48 2019 +0800

                                        其他史高血压数据展开

                                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:00:06 2019 +0800

                                        查体type修改

                                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:58:27 2019 +0800

                                        查体type修改

                                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                                    Merge: 4b8aa34 540b6a8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:51:52 2019 +0800

                                        Merge branch 'dev/new' into dev/luolei

                                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:47:15 2019 +0800

                                        搜索弹窗被遮挡问题解决

                                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:23:04 2019 +0800

                                        地址临时修改

                                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:20:05 2019 +0800

                                        版本信息弹窗高度限制

                                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:13:40 2019 +0800

                                        推送接口主诉现病史合并,治疗方案容错

                                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                                    Merge: 4a897b4 5a39d90
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                                    Merge: 7f1c7c8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:43 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/common/components/ItemBox/index.jsx
                                        #	src/components/AddInspect/index.jsx
                                        #	src/components/Diagnosis/index.jsx
                                        #	src/components/Diagnosis/index.less

                                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:52:01 2019 +0800

                                        层级问题

                                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                                    Merge: e5d0122 7f1c7c8
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:34 2019 +0800

                                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:21 2019 +0800

                                        11

                                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:39:50 2019 +0800

                                        修改请求地址

                                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:38:05 2019 +0800

                                        修改请求地址

                                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                                    Merge: df67559 a82d18c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                                    Merge: ff817bf 6805811
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:39 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                    commit 68058110e041e72b8c95979a4fd23e690912746b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:43:26 2019 +0800

                                        遮罩统一0.6透明度

                                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:34:59 2019 +0800

                                        透明度ie8

                                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:24:39 2019 +0800

                                        修改治疗方案无内容按钮置灰

                                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                                    Merge: 9c0e078 84ec971
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:09:22 2019 +0800

                                        merge from 'lcf'

                                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 19:01:31 2019 +0800

                                        修改药品说明样式

                                    commit ff817bf6d6d928b98557371362374859bec3aabd
                                    Merge: d50ffe0 b2e679a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:52:34 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:50:45 2019 +0800

                                        导入ie8暂时先灰掉

                                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                                    Merge: 573f0b5 b286d0a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:25:09 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:23:57 2019 +0800

                                        文本模式ie8onInput存值,搜索下拉项样式

                                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 15:30:07 2019 +0800

                                        修改开单项到医嘱逗号

                                    commit 573f0b59ff517de16f94296240572544e31c9f46
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:23:46 2019 +0800

                                        合并后报错处理

                                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                                    Merge: 55d15d6 fbab9de
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:18:22 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                        # Conflicts:
                                        #	src/components/CurrentIll/index.jsx
                                        #	src/containers/EditableSpan.js
                                        #	src/store/actions/currentIll.js
                                        #	src/store/reducers/checkBody.js
                                        #	src/utils/ajax.js
                                        #	src/utils/config.js

                                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                                    Merge: 2d40e6e ad68815
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:10:38 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/components/MainSuit/index.jsx

                                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:02:18 2019 +0800

                                        ie8的onInput代替函数

                                    commit ad688156064254d6b615284642882ba5486ff764
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 10:29:36 2019 +0800

                                        init

                                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:13:57 2019 +0800

                                        updata pro

                                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:12:21 2019 +0800

                                        test

                                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 13:13:11 2019 +0800

                                    单选和多选编辑失焦时调用推送接口

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                            # Conflicts:
                            #	src/components/AddInspect/index.jsx
                            #	src/components/Inspect/index.jsx
                            #	src/components/PushItems/index.less
                            #	src/store/actions/checkBody.js
                            #	src/store/actions/currentIll.js
                            #	src/store/actions/mainSuit.js
                            #	src/store/actions/otherHistory.js

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/NumberDrop/index.jsx
                        #	src/components/NumberUnitDrop/index.jsx
                        #	src/store/actions/mainSuit.js

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/PushItems/index.jsx
                    #	src/utils/tools.js

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:35:01 2019 +0800

                底部几个按钮换行设置最小宽度

            commit 7400613a1eb642e1d01004c7818883fd73c2350c
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:28:45 2019 +0800

                历史病例时间和按钮不能共存

            commit c000d83fb6ac5f265951c0e1377b627d24d2da10
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 17:27:30 2019 +0800

                修改治疗方案边框

            commit eda3f4b08a3460360541cd2af1c2ca071681c595
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:12:47 2019 +0800

                bug修改

            commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 15:54:49 2019 +0800

                还是符号处理...

            commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:58:28 2019 +0800

                导入化验结果,第一次添加诊断为主诉时不往主诉添加字符串

            commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:56:03 2019 +0800

                治疗方案标题添加疾病名称

            commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:51:09 2019 +0800

                Squashed commit of the following:

                commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 14:17:40 2019 +0800

                    顿号去重

                commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                Merge: 4095b3f b09559b
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:59:54 2019 +0800

                    Merge branch 'dev/new1' into dev/byll

                commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:55:47 2019 +0800

                    样式宽度更改和逗号处理

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit fea9a721ccb5afb9f1873c2111e3722d7330d394
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:50:07 2019 +0800

                Squashed commit of the following:

                commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:22:37 2019 +0800

                    修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:41:20 2019 +0800

                    ie8治疗方案遮罩

                commit fee35d5473b69aafb5335759006a93fea8d14145
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:05:16 2019 +0800

                    治疗方案遮罩IE8

                commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:04:58 2019 +0800

                    修改右侧推送字体大小

                commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 13:26:56 2019 +0800

                    修改化验项开单逗号问题

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

                # Conflicts:
                #	src/components/PushItems/index.jsx

            commit 2c70e41e7a5254838436b499b1ad787f523585f8
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:42:54 2019 +0800

                Squashed commit of the following:

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/NumberDrop/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/store/actions/mainSuit.js

            commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:22:37 2019 +0800

                修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

            commit 799eef5c34a21f9d90bc82a40240838cf10ba601
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:41:20 2019 +0800

                ie8治疗方案遮罩

            commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 14:17:40 2019 +0800

                顿号去重

            commit fee35d5473b69aafb5335759006a93fea8d14145
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:05:16 2019 +0800

                治疗方案遮罩IE8

            commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:04:58 2019 +0800

                修改右侧推送字体大小

            commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
            Merge: 4095b3f b09559b
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:59:54 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:55:47 2019 +0800

                样式宽度更改和逗号处理

            commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 13:26:56 2019 +0800

                修改化验项开单逗号问题

            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 11:44:56 2019 +0800

                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:41:03 2019 +0800

                Squashed commit of the following:

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:38:40 2019 +0800

                Squashed commit of the following:

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

            commit e36f2f1b811d6978117161f50b16dd5bae298547
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:33:30 2019 +0800

                Squashed commit of the following:

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit d6751d916bd9aff60373a28ce2240bc078809e9a
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 09:51:31 2019 +0800

                合并new1分支
                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit caad36f002904aa859a0d780eefdf5b9cdc9011e
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 11:24:02 2019 +0800

                    时间单位组件IE兼容

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit 58e0fdd1ab99664163923ff7ae455efff5850195
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 09:20:30 2019 +0800

                    主诉IE兼容性处理

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/containers/SpreadDrop.js

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                    # Conflicts:
                    #	src/store/async-actions/treat.js

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整,ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

                    Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/components/AddAssistCheck/index.jsx

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并,治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/new' into dev/new

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

                    Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值,搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/components/MainSuit/index.jsx

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

        commit f353eaef8074a17ee8977dd3ac1f9cf7685e713e
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 09:32:28 2019 +0800

            Squashed commit of the following:

            commit 70e968a78a10c520fa092cd979e0e03475523dc4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 09:25:57 2019 +0800

                修改诊断搜索参数

            commit 77ca8b29d1fc647e6765ebe0330b52ea88bd606f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 18:12:20 2019 +0800

                合并错误修改

            commit a20149638473c75479c56deb365db7c328a558cb
            Merge: cfc64ea 6b7dfbb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 18:08:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/store/async-actions/homePage.js

            commit cfc64eaaaf0c98941c04be7b355aa646ecb3c560
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:27:09 2019 +0800

                标点加英问号

            commit 6b7dfbb33bd85d54dff60649f913b2fef6f8ce0c
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 17:24:55 2019 +0800

                bug提交

            commit 35a9c17b604893b2d97c45143128e5ea4d8d15bc
            Merge: 11d0086 a0beff1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:17:00 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit 11d00865399c3ba8bf5afe096ca3f3856c86be36
            Merge: 4f214b2 422c5cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:16:54 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/components/DiagResultSearch/index.jsx

            commit 4f214b2a23fd9bacb6671e191f7e42544c7b87af
            Merge: c721d35 9378eb8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:15:36 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c721d35ada039c262724106b4b8d0342573e36ec
            Merge: b8f144b 0f0c391
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:15:32 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 9378eb8bfca2571b7ed6e83560f2decaded45f2c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 16:55:33 2019 +0800

                其他史selecteds为空bug修改

            commit f6fec4a2b2f25e1b8d89b62601baa63a2cefe968
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 16:38:02 2019 +0800

                修改清空后第一次点击键盘不触发click事件bug

            commit c11b47d06e11c024a17f02b5648a800405d88ff5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 10:28:17 2019 +0800

                其他史文本模式数据bug修改

            commit 422c5cfdfaa0312d65cce2c717de1f1b2f63755b
            Merge: b479e52 b8f144b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 10:25:45 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit b479e52191221be49d4417308014517a821d8d41
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 10:21:39 2019 +0800

                修改诊断搜索

            commit b8f144b7c2c1fb60d208525d29dc1a1a38280edb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 09:44:49 2019 +0800

                去重标点添加

            commit 345ea481613f2fe5beb8aacdc117ce022a60f1b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 09:23:31 2019 +0800

                修改常用药物慎用标识透明度

            commit 0f0c3911304b587351e1d53627a9f1a314f9173a
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 09:08:54 2019 +0800

                11

            commit 58d128cb772f05fbf90974b0187ce2fa91905f76
            Merge: 5ec2c5b 21e2bf6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:55 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 5ec2c5be9b99f40fd7322ea4299a8ef5ddbfbf5a
            Merge: e3965b6 f388f66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:51 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit e3965b6f49b9325a9a6aa6f9e3382d8e6be8b6b9
            Merge: ba2209b b37ea33
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:28:18 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit ba2209baa70ce98557956e4ee5e24659537b4e41
            Merge: c7033dc 2fc00bd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:22:41 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2fc00bd2a0c2c83d0b3a763147a5196f36ed2513
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 17:56:22 2019 +0800

                病例滚动条上面不遮挡导入按钮上移

            commit 21e2bf63e19461fc8956c991678d11ada4abad61
            Merge: 56412f4 c7033dc
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 28 15:49:11 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 56412f467c018e2ce22415a54a36be230126b5fe
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 28 15:47:21 2019 +0800

                注释查看药品说明书

            commit 7a306c9f203aa3e7c67a6c2138adbe2602b9aa56
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 15:44:55 2019 +0800

                修改其他史查体杂音类选中bug

            commit f388f660e2062b82ac39984f21bcd1603982f911
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 12:28:02 2019 +0800

                1

            commit c7033dc0fa9b576fd44ad580a70d9dc3c9abbc21
            Merge: 24781b3 9b8aba5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:47 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 24781b351a21c98c7f0185b808c6cb2c8459cab8
            Merge: dd471cd 686d0e6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:41 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit dd471cd31cd4f5e8bee1cc4394afc2d1ec645d27
            Merge: fdfd012 beee05d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:32 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit fdfd0120716eea088da637b233700b07e6865f53
            Merge: 47805f3 6c7eff1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 12:26:16 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 6c7eff13a7a93e7e50d569a72155a280973c1053
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 09:59:02 2019 +0800

                excel导入日期时间戳格式转换

            commit 92eb95e4a13cc141cf115fd59ba96eb9c4ad81f8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 09:35:49 2019 +0800

                化验清空只清空数据

            commit 9b8aba56d77ce741849edf60453f395ec7a17959
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 17:00:35 2019 +0800

                清空后其他史杂音类选中状态bug修改

            commit cca4e2b37197823231e6cbe1407b93ab2c1cb49e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:38:03 2019 +0800

                标点补充

            commit 686d0e6888cbe437c6126b079f546c5a7b811ae7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 16:34:13 2019 +0800

                点击开单项到医嘱

            commit 47805f396f0acda35a73a8fbe23a2b290af60a84
            Merge: dbfbe54 0ab03d2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:20:13 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit dbfbe549b65f8dea75579b10e02d7a4d022929a2
            Merge: ba95b15 24a72ee
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:20:08 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit ba95b154cd8f0acb6ac3cbdd0f56c2b5cd128a51
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:17:59 2019 +0800

                主诉合并错误修改

            commit 545d910e9331f21ab16be77ab7ac326ad3de580d
            Merge: a261f0c 48728c3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 16:15:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/components/MainSuit/index.jsx
                #	src/components/PreviewBody/index.jsx
                #	src/components/PrintPreview/index.jsx
                #	src/components/TreatDesc/DrugInfo/index.jsx
                #	src/store/actions/diagnosticList.js
                #	src/store/actions/otherHistory.js
                #	src/store/reducers/assistCheck.js
                #	src/store/reducers/otherHistory.js

            commit 6b6082ca9ad86cab359874b6089815719b51d7d4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 16:04:10 2019 +0800

                Revert "第一个诊断为复诊添加到诊断调用推送接口"

                This reverts commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d.

            commit a261f0c60ae06808381dd443b5d8cef42760d953
            Merge: f2cb210 7e81b63
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:58:46 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 0ab03d2eba0865ebdda8c8b9eb84e5dea7f07b59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:53:28 2019 +0800

                标点规则:中间连续标点保留第一个,开头去掉,结尾保留第一个,灰色不显示

            commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 15:40:32 2019 +0800

                第一个诊断为复诊添加到诊断调用推送接口

            commit cd02a522c6054deb9ade0fed202338dd1ce9021b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:26:16 2019 +0800

                输入再删除输入不搜索bug修改

            commit e62e0aa6083ed13edbbfc36124ff79363ddaba38
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:16:58 2019 +0800

                推送参数加主诉

            commit 134276afd973d5b5d8e07389cee27eb9391e9247
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 15:14:00 2019 +0800

                双击编辑状态关闭bug

            commit 769c60daabd81ef48f37f5227e9a55fb205ce5ee
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 14:11:43 2019 +0800

                化验颜色不一致

            commit e3ad8a2d18a21cc770b9c303d92146bbe78e4d8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 14:10:40 2019 +0800

                有选中无殊未灰bug修改

            commit 581c9dbc6f714c5e795a45102cb095cf84738522
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 27 14:04:07 2019 +0800

                杂音类单选bug修改

            commit 20a3edfe13f4c24c2748758f28bd488aa2ca6ea1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 09:37:07 2019 +0800

                推荐检查项没内容时,开单按钮置灰

            commit 970c4d7db52af55f2e9d39ce3401289683a8f297
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 17:39:35 2019 +0800

                常用药物治疗添加类名置灰状态

            commit 7e81b634b0952dc237048ee99f41364e360cea84
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 17:38:04 2019 +0800

                清除添加化验辅按钮浮动,打印医生名字位置,辅检标题小屏幕换行,模板接口进入页面没有调用问题

            commit f2cb21089d2c321a9cc6b5e666627c6a75e275db
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 17:25:29 2019 +0800

                数字键盘在组合中样式bug修改

            commit dd03327ec3396302fb66f3f60f7b24c0ff730e6c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 16:53:48 2019 +0800

                点击开单聚焦到医嘱

            commit 179d7080d06e284ed973d59c5a76ed3dc6a26daf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 16:43:01 2019 +0800

                重复修改,回退

            commit 7beb5f11bab81ae4535eaf2e61136ab71d06e0aa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 16:41:17 2019 +0800

                修改1024样式bug

            commit 7ad8183615802729dc3bbb6507c864a376e79bb6
            Merge: fca4a15 66e5e26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 16:07:59 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit fca4a15e3ab974f4c684496f43f76afa606a23bc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 26 16:06:12 2019 +0800

                回读div里的模拟placeholder清空,辅检出现两次,模板列表为空高度问题,火狐div清空还有个换行符去掉

            commit 66e5e26b6541d8923222f43852e56d91252a1c84
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:20:20 2019 +0800

                修改提示信息疾病说明菜单按钮光标形状

            commit ef15ad95e416155b911c474742cf526bbad9b041
            Merge: c051e01 8911ac8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:15:58 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit c051e0198219bc143a535bac13afa3dfcd90696c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 15:14:39 2019 +0800

                药品说明书多个Id查询

            commit 8911ac8887de34bdef955a59462f260fc2c6962b
            Merge: d31a749 37f085a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 13:19:19 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit d31a749c48b6f6b1e6725575fd09f84f71ebfd9b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 13:19:06 2019 +0800

                搜索后加标点测回

            commit 30000aad93762077ef746ef683fd2a47c14b3853
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 11:22:11 2019 +0800

                其他史查体搜索的标签后加逗号

            commit 37f085a3d788fd707c76bca36d9cd714f0d03742
            Merge: 9112336 13dce94
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 11:17:23 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 9112336c27d8e2c1c143b75b8d8bf03f85b528f1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 11:16:40 2019 +0800

                修改推送添加到诊断

            commit 13dce94fec6b39d0ddf4d0b0322bd84fadddc860
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 10:14:36 2019 +0800

                1024合并bug修改

            commit d1cb01259d8eab3933cd5166c6e39c6e9ec85516
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 10:12:56 2019 +0800

                同类药判断添加名称判断(有的同类药id为null)

            commit 536ab1e7dc67936fa9a586f8d55ad1c6d2ee60ba
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:41:41 2019 +0800

                修改药品说明书标题宽度

            commit c855d6416f7509f8ac7d6cb437790a11ad8d93d9
            Merge: feceb08 25a000f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:41:03 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 25a000f38ba5cdfb6fdb174c54341f9b058f2dd7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:40:26 2019 +0800

                Revert "修改药品说明书标题宽度"

                This reverts commit 576b54554b36e37ea0eb80e815ad381772b19cc5.

            commit 576b54554b36e37ea0eb80e815ad381772b19cc5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:38:52 2019 +0800

                修改药品说明书标题宽度

            commit 51a04b0d5f4f7124e9ae63240a32ed39b945f50b
            Merge: 644d713 0236d09
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:58 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 644d7138c63af93af0e0286644367726d3da2ba0
            Merge: fa1380f c7236c8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:37 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7236c894382e11b0a4051f097643e857bf8f065
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:19:06 2019 +0800

                两边对齐火狐兼容

            commit fa1380f7bafb00efe15a3c1e487f162f2594a913
            Merge: e0bc863 96ced84
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:12:10 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit feceb083da47d70c70db09cc69ce6359e907ecb2
            Merge: 0236d09 e0bc863
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 20:10:43 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 0236d096817f2a3b0b04a67a3a44b3394014e267
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 20:01:41 2019 +0800

                药品禁用状态i图标不置灰

            commit 96ced84b7cd01fecf31a546ef58a2375bdfb2e37
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 20:00:10 2019 +0800

                说明书标题去空格

            commit a073a592d34258a699b123e4dec909cc0c4c73a8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:52:14 2019 +0800

                药品说明书排版

            commit e0bc863cca36de3ab8f8398352f72642780728d9
            Merge: 853319f 3fd13c2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:18:29 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 3fd13c27d56310fc94d46f4e14f374a4de4dd8fa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:18:02 2019 +0800

                数字框蓝色背景显示修改

            commit 853319fd0394943edd4945e24701e837f71cf1ac
            Merge: 6211dfd 07d7ab9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:14:47 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 07d7ab98655cbe928b1ac037bcd3889e59918dbb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 19:14:09 2019 +0800

                数字键盘输入优化,bug修改

            commit 6211dfdbb509b4fa4b555899887b119e2333ef41
            Merge: ca9f83c 4c41407
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 18:36:49 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit ca9f83c2e9296cb408f91cd53cdf7eae22a39993
            Merge: 2897015 d8fc333
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 18:35:58 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/utils/tools.js

            commit d8fc333a180f46d4b4fad31cd39e1362e3b1f206
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 18:17:49 2019 +0800

                火狐placeholder模拟

            commit 4c414071774ef37e1ac57739d72e4b35e8456a8d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 17:43:26 2019 +0800

                双击删除标签时删除后面的标点

            commit 2897015cc3d9fd4bc687c88de707a965d30f1f80
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 17:07:24 2019 +0800

                清空等条件判断

            commit 298014e4aefc250ce60555d316be355b469abad5
            Merge: d8b2728 54ed95b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:55:02 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/components/EMRContainer/index.less
                #	src/components/MainSuit/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/Operation/index.less

            commit d8b2728b1c4484c4327ea2fd1c5be54a87e802f5
            Merge: 827b9fe 6ff3c2f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:49:36 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 6ff3c2f91b7a21f20081c4feb7cdbeb0fe94f61b
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 16:46:01 2019 +0800

                性别判断提示位置更改

            commit 827b9feb46ed370019aef767270dc98240a3a60d
            Merge: 3164918 f18aff0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 16:21:51 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit f18aff0c73b774231f1894446b877e67f7bf1bcf
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 16:15:52 2019 +0800

                其他史数据判断补充

            commit 3164918c9c57afd13cd89077ee356ed0541458f0
            Merge: a3c6497 0adcc7b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:42:23 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 0adcc7bf5f39b10a3c2254cf1633d9ffd05e6073
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 15:40:14 2019 +0800

                数据判断有误

            commit a3c649762af9a4d8b66db4f678e62c708cca301b
            Merge: af35906 fa664ff
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:12:20 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/components/PushContainer/index.less

            commit af359067b1d3c08d5329f89ab0565d9eeaa8d49d
            Merge: 4785b29 c33cd61
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 15:06:45 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c33cd619b6aca13ec5a5fadbe66bfe4b71f5ed81
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 14:51:06 2019 +0800

                双击编辑蓝色边框

            commit 4785b29ea0eb3c58b5f508ddf9e2a65fd5b96247
            Merge: 942579e e665919
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:41:56 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/components/PreviewBody/index.less

            commit e6659190bc72350a2b1848d30d1098aa61f29849
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 13:37:52 2019 +0800

                模板部分滚动条显示出来

            commit 942579e843fef29e00e4764d4acac312a51496ec
            Merge: 2b7ce81 7a014d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:35:56 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 7a014d0d797d7e90f88a8d0f939c9845096b0411
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:35:18 2019 +0800

                有糖尿病bug修改

            commit a66f41acdd18acfa5dd6343178571743f1193226
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 13:32:44 2019 +0800

                其他史查体回读bug修改

            commit fa664ffcfa65bd1438999b0f9e79f99c80f7d531
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 11:30:05 2019 +0800

                删除诊断没有id时(添加名称判断)

            commit 86720794a59da37c8700f72e96740bcdf1906dc8
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 11:27:23 2019 +0800

                bug

            commit 3de2cf0c7fae1a0f1a994ee604f696d1f64c191e
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 11:09:44 2019 +0800

                1024下历史病例显示问题,清空主诉聚焦不在span

            commit 3f9e94c357e549318c1e79a04842a4c477d58974
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 10:03:29 2019 +0800

                pushContainer添加定位信息

            commit ec0a210bc616de96a0ed48df41300fcf95f6b1f3
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 10:02:01 2019 +0800

                预览宽度有误

            commit 2b7ce81ae4a157abf013f3b2f156b5d280f9403e
            Merge: 78fe295 de5b6f2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 25 09:52:32 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/components/OtherHistory/index.jsx
                #	src/components/PreviewBody/index.jsx

            commit de5b6f2da0953c8bce31d166490d633f5c8d39c4
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:41:50 2019 +0800

                模板男女弹窗样式调整

            commit b2b959689c9b48b7e82b07766b7320952d649dbd
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:25:31 2019 +0800

                弹窗高度动态变化

            commit a2006f9c3a15df6225e8f5664e3f8330e9def1b7
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 25 09:22:25 2019 +0800

                弹窗宽度变化

            commit c6d4ec0ba654f8ed6d25c92f592c11fa8dfc0491
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 16:51:25 2019 +0800

                bug

            commit 8bfb380ec8366c43dbd2d3a0078ccc9f13816d62
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 11:10:18 2019 +0800

                连续两个句号处理

            commit fb65e9d6a4af98dcfafc8008963a59e9ef368dbb
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 10:45:55 2019 +0800

                判断是否为空只判断文本不判断结构

            commit 1749ad61e39543920defb0e8be1d7ce61a03a7bb
            Author: Luolei <16657115156@163.com>
            Date:   Sun Feb 24 10:34:52 2019 +0800

                男女模板区分

            commit ef798e435a077495c1e84d3ca6893a7e78470119
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 17:28:30 2019 +0800

                模板性别

            commit 78fe295b3e69c7e7720b73ea67d3ffcc347f8554
            Merge: d5b22a1 3abdfe7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:25:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit d5b22a1659068387f4fd1cd0a76d10da296f9511
            Merge: 52a81ab e073408
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:24:55 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/components/CheckBody/index.jsx
                #	src/components/MainSuit/index.jsx
                #	src/components/SpreadDrop/index.jsx

            commit 52a81abd66ca014880035ac04d229f22c54f9768
            Merge: 6b572c4 b133db8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 17:16:29 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 3abdfe7396e7375d4d9a5fbafe0d11705494a101
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:35:13 2019 +0800

                其他史查体删到只剩一个文本标签时整行可落光标

            commit 65bf32b0cedb716f36c2d9bcba9cc79993a35cbc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:24:27 2019 +0800

                删除多余代码

            commit 333360a86405a53dc566e1db80812c62e9ada9df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 16:18:58 2019 +0800

                其他史查体提示优化,未获取到数据的情况优化

            commit b133db8b2ebe68183f0fca8a934b79e037ab2702
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 15:14:08 2019 +0800

                11

            commit 6b572c48f1c7b75e669aa328ab8d0c8271cd6a5f
            Merge: d7668cb 3131b2d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 15:12:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 3131b2d66e39cb5df50b50a1512f3b3d7878cc83
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 22 10:56:58 2019 +0800

                主诉搜索框位置

            commit d7668cbc0bb1a57218083423f483367f6b6a1bbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 10:13:02 2019 +0800

                杂音类变量串bug

            commit 5ef7897748fe81cfc3a1e9e30a9cad9eb8576fac
            Merge: 77daf9d 0de92f7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:46:01 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/components/NumberDrop/index.jsx

            commit 77daf9d197cf583de16612dbc20339502081545f
            Merge: bd64c01 5479437
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:28:15 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/SpreadDrop/index.jsx

            commit bd64c01ccec1e2ee37ad148b84aed1d064ae85d3
            Merge: 7dfd62a b380174
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 22 09:20:27 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b3801745fb6938eb8bd727cc5b32ed7086dffdbd
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 20:15:51 2019 +0800

                化验文字太长显示省略号

            commit 33b3ef1bccc633bd90a57721429bcba5a4a71803
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 20:04:17 2019 +0800

                ie滚动

            commit 0de92f7a8175bb40e3ab8dc32b38ccc2b62d5cb4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 19:17:48 2019 +0800

                其他史查体提示bug修改

            commit ad5200304ddeec1bc1cead1e49f550319b1feff8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 19:04:44 2019 +0800

                单选双击编辑删光后失焦存值bug修改

            commit c1b9af5899a71f7398b2fd94a42770a59f77c7bc
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 18:59:06 2019 +0800

                数字带单位弹窗问题

            commit 7dfd62a2a867fd19a1ad80521c077eddd75bb484
            Merge: b901e9e a599e98
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 18:43:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit b901e9ed954d6502578623c1f28ea9edfe83dfbd
            Merge: b8b4174 a99d722
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 18:42:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/CheckBody/index.jsx
                #	src/containers/eleType.js

            commit a99d722b957624438e91fb405418e8637f83f52f
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 21 18:32:09 2019 +0800

                滚动条弹窗调整

            commit ad1e46d28fbb2eeb3d894e82af6402aa8f4bf83e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 16:07:32 2019 +0800

                数字组件事件优化

            commit a599e98ab469a915bf759d3c08693ee313c13fa6
            Merge: 0d67c39 b8b4174
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 15:03:38 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 0d67c39cf1c0cb0949f3e98869b660c5de42ebd3
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 15:00:24 2019 +0800

                修改治疗方案药物治疗类名字段

            commit 27aced28537943a5b75cdaec24ad1f65ccec9477
            Merge: bc555b0 b8b4174
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:40:18 2019 +0800

                Merge branch 'dev/new1' into dev/otherHis

            commit b8b4174d5b561c963a269b29d737eec0a58f6889
            Merge: 27d6b1a e11a555
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:19:59 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 27d6b1aed64dbe80fe158dbe620f1c8f9ecda70f
            Merge: 5ae0fe1 1a7645e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 13:19:36 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/store/reducers/checkBody.js
                #	src/store/types/checkBody.js

            commit 5ae0fe1ebf36274d45e5a7d70709f655a54fa0be
            Merge: 6af13c9 bfad6c4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 09:46:23 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit e11a555129229f1ddb189c1a912f1d781270eac9
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 09:45:41 2019 +0800

                搜索结果去除诊断中已有诊断

            commit bc555b0a62f3d06017256e567738e1796f254a82
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 21 09:41:47 2019 +0800

                其他史删除不必要事件

            commit 8638209c04be43066a35ad6fab211e92bbd637b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 20:03:29 2019 +0800

                删除console

            commit 08da5c25ae264534d19e3c4fa7c5e370b3e0d456
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 20:01:46 2019 +0800

                诊断搜索添加同义词

            commit 9f0f76b675ccb06b8cb0d3655680a238d7cc4ae3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 19:46:31 2019 +0800

                ie8子标签灰显bug

            commit 10ec058189f5bbee4d5dcb47a45001988ca3d870
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 19:28:05 2019 +0800

                修改版本号和免责声明字体颜色

            commit e627b67e63d6fa3c1d4faa9ab492c0bf4d8ee1c1
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 19:22:48 2019 +0800

                开单项没选择时,不跳到医嘱

            commit c60e17b33180d7485a46ca9e98c0ed16c7775f2a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 18:32:50 2019 +0800

                注释同类药物双击打开药品说明

            commit bfad6c404134c5268b07a2c79f1f8a386f952bc8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 18:20:17 2019 +0800

                诊断延迟搜索

            commit 69b02c93e3b2afb26f44733c2ef9558e2852047e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 17:04:52 2019 +0800

                查体既往史类事件处理添加

            commit bdc074220b4d662818d430e56e7f9796efd06537
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:58:12 2019 +0800

                其他史乙肝有高血压顺序勾选bug修改

            commit 48abc323e58cf8f400c0371b5cdff14fdf54b4d9
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 16:57:11 2019 +0800

                nothing to do

            commit f6f6e023919d536dd60b746e6f3b0b3267c332c2
            Merge: 3b8fdf4 6af13c9
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:51:35 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 3b8fdf425f7cd93dbb736cfe8bcb90ac72b900bf
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:48:56 2019 +0800

                通过ID搜索药品说明书(添加数据时查看药品说明书用)

            commit 6af13c94c3cb901fbc0e49f77ecb45f1950b4fbc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:26:45 2019 +0800

                翠加

            commit e1af9c88f74e6483b81850953f1af2051040e677
            Merge: 5ae9b8f 012bb7f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:21:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 5ae9b8fae1e7d1f56f160b6f2d621b8d6e53658d
            Merge: 8decc9d 5b1feca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:21:38 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/common/components/SearchOption/index.jsx
                #	src/common/js/func.js
                #	src/components/CheckBody/index.jsx
                #	src/containers/CurrentIll.js
                #	src/store/async-actions/homePage.js

            commit 8decc9d3e8255de2c81420a833e69582686aafdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 16:19:15 2019 +0800

                罗磊修改

            commit 012bb7f0ea4d0ec66f313834b0e97beed46c028f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 16:17:54 2019 +0800

                药品说明图标增加鼠标进入状态

            commit c4ea61552060862a541493087ec096a413cbca2c
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 16:12:30 2019 +0800

                高度计算有误

            commit 50769d9e8a9845954a58145e5b7041b131729b67
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 15:59:38 2019 +0800

                标点预览

            commit 4a8b8a17d9b784225eaa07d67925752339418ee1
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 15:49:58 2019 +0800

                滚动条问题

            commit a4f1c2776effa4bfb1c9628d48cee2a755d8558b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:36:47 2019 +0800

                诊断搜索增加搜索值为空情况

            commit cd77c307ae34abe8cfb6fb53f235beb8f43d884d
            Merge: ac44ed4 f7ec699
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:28:05 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit cee1138681863aa93e2374d48707171b294c0032
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 15:24:41 2019 +0800

                预览行内样式部分修改到less中

            commit ac44ed44fed7b42457e2dfc60b9ab13c97e0ced5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 15:06:10 2019 +0800

                提示信息疾病详情页右侧菜单

            commit 816fa09299c0177beac8573e50be4c86495a37f2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 14:59:20 2019 +0800

                标点灰显bug修改,下拉对应标签高亮颜色修改

            commit 3330385dd3ea7b2b419f5dbb92f05f8a20bc3c39
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 14:09:59 2019 +0800

                标点符号跟前一个标签灰显黑显

            commit b77a4e183b8413cbac1b663233b3382c7641857d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 13:43:26 2019 +0800

                修改诊断搜索参数

            commit b1f56da5d60d2944c4bbc8a8ccc61548f08b55e1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 13:26:29 2019 +0800

                纯标点符号不搜索,查体获取数据bug修改

            commit d6849d30404fe7d3346909a7e10bc894d1f2ba33
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 11:39:43 2019 +0800

                只有标点符号时不搜索

            commit 4f7c951a117bec49fa853071847422a8dbf51e9a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 11:23:42 2019 +0800

                单选组件双击编辑删完后失焦显示重复值bug修改

            commit d771a09a5fc4e3e7af92e3ff3c85ed44975b2648
            Merge: 28cd3ba f7ec699
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 11:13:20 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 28cd3bac18b0daa796f8a1a9292db3a24cb8e862
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 20 10:41:36 2019 +0800

                主诉数组多个空格元素处理

            commit 790d34dc38e886c3df1e67603922838f904e4ea7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 09:48:25 2019 +0800

                药品说明书鼠标指向方式

            commit f7ec699eb2b493c4bbbd0ee60194b639a6c8b8e8
            Merge: 6c245fb 909ab25
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:43:41 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 6c245fb0901d2234a0aef7568039651dd4cdf91e
            Merge: 96cc574 e36be2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:43:15 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/common/components/SearchOption/index.jsx
                #	src/common/js/func.js
                #	src/common/less/variables.less
                #	src/components/Operation/index.jsx
                #	src/components/PreviewBody/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/SpreadDrop/index.jsx
                #	src/containers/CurrentIll.js
                #	src/store/async-actions/patInfo.js
                #	src/store/reducers/assistCheck.js

            commit 197b0e5b453fa4446f71b728768baa67e5ab4700
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 20 09:42:48 2019 +0800

                修改版本信息字体大小

            commit 96cc574ab24f3da14e1f89610e6c5a1e451fa051
            Merge: 5a2d97b fe9e87d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 20 09:35:47 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/common/less/variables.less
                #	src/components/PushContainer/index.jsx
                #	src/utils/tools.js

            commit fe9e87d5e0735c356cc4041292dad4ce9cce18dc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 17:30:38 2019 +0800

                搜索为空清除列表数据

            commit 909ab253717bafa4c9ffb3164441d8554e17ed03
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:27:10 2019 +0800

                输入框添加行高

            commit c870ce40e66ec3471bd8ab660346d41ca6374891
            Merge: 82c0130 cb47bc5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:12:48 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 82c013012b1ec9adad9ea974c609c785bae349b2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:12:26 2019 +0800

                删除console

            commit 656a2e69d55a87696a52780074cdb97ebf72c3e5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 17:03:22 2019 +0800

                提示信息详情页弹窗显示

            commit 94a46327141d7b22d245afbfef4908fca8b852df
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 15:50:52 2019 +0800

                化验没有参考值正常显示

            commit 5a2d97b0f644ef6172cce575e520ca3000cef9b0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 15:28:39 2019 +0800

                ie8点开下拉未选值存值bug修改

            commit 23f6f91a57f4c57826e5cd4adc6aea676a21751e
            Author: Luolei <16657115156@163.com>
            Date:   Tue Feb 19 15:19:16 2019 +0800

                1.ie8自动转换中文为unicode导致判断有误
                2.阴影改为边框
                3.主诉现病史删除得到数组里有空元素处理

            commit 5e1184e69747c823a1ce3bba657332f1443f802b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 15:15:35 2019 +0800

                回读无查体点击唤出模板

            commit 48a9a00b3b5b31e499d32f8f6edbbda57390e721
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 14:30:22 2019 +0800

                切换模式其他史数据bug

            commit 4717362f96dd641518ca546c2b270a2c3f6d5002
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 19 11:38:42 2019 +0800

                血压类文本子标签存值

            commit 08f9160a8e26952c695d9563ece0cef09d7e6164
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 19 10:59:43 2019 +0800

                清除移除患者信息缓存

            commit cb47bc5b79d7f6e319a1b837d27012841925c678
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:16:42 2019 +0800

                翠翠分支未合单独添加

            commit 2a770d6266f8c7f5f0bd892befa6fa69166487bd
            Merge: 3e68866 86e1d1d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 3e688668bdaf2d376901cfa70a90a3587ad7ff69
            Merge: dc08557 4f90da8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit dc0855703def7c3a0c56c74d0b033b42657cb62e
            Merge: 13db5c1 db268fc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 17:14:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 4f90da88492079a14a3c167d364cc6b0160c668c
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 16:58:38 2019 +0800

                弹窗关闭时机

            commit 13db5c1cccec8c7f3ac5cb72d19aaf05a5bb63e4
            Merge: 58cffc8 6e906e0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 16:56:59 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 6e906e06753a119829e67db34a0e32e1c2d1a4db
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 16:23:12 2019 +0800

                查体选中杂音血压选中状态bug修改

            commit 1e57bc5dc0b63eaaa040d59d53c9f1a9409d2030
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 15:42:03 2019 +0800

                单选组件下拉项可和名称相同

            commit 9318dc730440ce833cd1317aed52699572208224
            Merge: 58cffc8 db268fc
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 14:21:22 2019 +0800

                Merge branch 'dev/byll' into dev/new1

            commit db268fc6f4c11065e36e4405170bd08e667ce6fa
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 14:19:41 2019 +0800

                ie8搜索单个文字删除报错问题

            commit 86e1d1df0baee680a7c5bf99e8d6cbae4284c83c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 14:15:14 2019 +0800

                治疗方案药品说明显示方式

            commit 1391edf5cda27a44817030cb9fef6486da15b51e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 14:14:41 2019 +0800

                下拉框打开时标签边框蓝色

            commit 758555c01c184adde48fb869909a1b9fdb77f4b1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 18 13:50:39 2019 +0800

                箭头函数传值性能问题修改

            commit 8e25532ad88b1ca014acaaffb61155f3f62e8c64
            Merge: 7a78823 58cffc8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 09:48:15 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 58cffc89d51661f2edbd21e1424fdd29afd590f9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 18:21:01 2019 +0800

                上次提交回退

            commit 4ca59db29b1a256c9b3015646301c0105cead455
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 18:13:57 2019 +0800

                数字组件ie8输入报错参数无效bug修改

            commit 5afd59399265b3a516e35317687946d2df551c9b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:59:35 2019 +0800

                删除多余代码

            commit d56b647e2f32fc9e5a50e58376d1677076b9c5c0
            Merge: deb3340 e5ee60b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:57:54 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/containers/CurrentIll.js
                #	src/store/actions/mainSuit.js

            commit 6c4e29739d3dbe45b1843f5a5fb2c054784d0739
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 16:55:03 2019 +0800

                ie8右浮动不生效

            commit deb33405ce270e3b1495e51fd537fa6d56f1a615
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:54:34 2019 +0800

                免责声明弹窗层级bug修改

            commit 15718f043d724dd440aab0d23c6eaf3cf54d2059
            Merge: c2f5a1e 0ca5c1f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:34:51 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit c2f5a1e29bd29942c2faa59fd4fd645bbe50a814
            Merge: a1c28c3 19f31f4
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:17:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/components/AddAssistCheck/Textarea/index.jsx

            commit 0ca5c1f1aa7ce0b7c558cd53b0c4fc19ad096f90
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 16:13:59 2019 +0800

                11

            commit a1c28c3d77f4d5d27b7ec1ef0ceb1aaf8a6afdb4
            Merge: 8bc39fc 3dbeabd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:13:41 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 3dbeabd15713010eb953dcee9c619e0cb4e89baa
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 16:10:56 2019 +0800

                弹窗层级修改

            commit b34feffbe308202a21d56c822371d5900e4d784c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 15:53:02 2019 +0800

                其他史无主诉第一次提示后不再提示bug修改

            commit 541a45685981ece9caf11ef7ee13d871e1aaaf27
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 15:47:44 2019 +0800

                搜索框下拉位置bug修改,杂音文字为多行时下拉遮挡文字bug修改

            commit b9bb9cba1fe356d94bdc64a1caa4b60460bdef68
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 15:36:55 2019 +0800

                复制内容样式乱掉问题解决

            commit 9641e6a1c9fd1fefa66a4324401cf38d60e29cf3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 14:37:35 2019 +0800

                无殊选中状态遗留bug修改

            commit 641c5762b7f7f98d532eb23fc97f881d33575222
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 14:18:44 2019 +0800

                打印相关样式修改ie待测

            commit e93c7c1557bee766ff94dfa4952cdf2f69c4e926
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 13:51:30 2019 +0800

                用户信息banner不被下拉框遮挡,杂音选中样式修改

            commit 64d1cffdb7e562263084ba5827df988a099ec7b7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 13:26:25 2019 +0800

                杂音类型下拉样式优化

            commit 08ab0d25e5c54f3535156e248de5063ff4454a2f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 11:31:31 2019 +0800

                其他史查体tagType4类型搜索选中展开

            commit a96e98a90f83c7d0e625f973b79cb65d33792623
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 15 10:48:50 2019 +0800

                获取模板接口放在获取病人信息回调中,确保参数不为空

            commit 19f31f4d19c841c9a0a86be849d749815e27a1c1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 09:43:48 2019 +0800

                修改标题点击enter问题

            commit 8bc39fc836e6f24fc599d8d679164f7412ac71f3
            Merge: 993eaf0 6fe34e5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:56:44 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/components/AddAssistCheck/index.jsx
                #	src/components/Inspect/index.less
                #	src/components/NumberDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/store/actions/checkBody.js
                #	src/store/actions/mainSuit.js
                #	src/store/reducers/assistCheck.js

            commit 993eaf02f2d5d2b0244587ed7096d1fcf9659465
            Merge: 11260ee 6ca010f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:52:56 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 6ca010f83a2b882163bfaf3ee7f125f45e8d5ce3
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 17:36:47 2019 +0800

                字体不一样,button问题

            commit 8433d68d9027b2c31c5db2da33182c1507f08f9b
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 17:12:29 2019 +0800

                更改中文冒号,修改辅检div样式,添加搜索ie8兼

            commit 11260eeb9c9958368e933981df83e4e097a04c9d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 17:08:07 2019 +0800

                杂音类型双击编辑blur后重复输入值bug修改

            commit 2911db7154036da7df72eb04b6e2a35b32c71106
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:48:08 2019 +0800

                双击编辑前后缀bug修改

            commit 6eef6a051d230f9f52a1df2ae6b5e3044c7b3505
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:33:58 2019 +0800

                主诉-其他史组件双击编辑前后缀存值

            commit 00f2e00fb09170526cd4101b320ece3b694e28f3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 16:07:49 2019 +0800

                查体数字组件双击编辑前后缀存值,血压类型标签双击编辑时不显示下拉框

            commit 8019239ea85bf8e66de7adff69d1fcc9b94eb226
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 14 13:57:24 2019 +0800

                修改ie8多[]bug

            commit 70689ffbb3b43af0bcd21e0c6898855ede313faa
            Merge: aca9d8f 3fe1212
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:36:41 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit aca9d8f6b118a3653050c6f59cbed645ac1b824d
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:19:43 2019 +0800

                判断模板保存前后是否相同

            commit a643a04284503f3491206a6da28f02e3b239bdfd
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 11:03:33 2019 +0800

                打印保存判断问题

            commit 665613f2a02a496e485917ee653ba58e4744fa7d
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 14 09:38:25 2019 +0800

                写死参数更改

            commit 3fe1212b9a37b328037ea87e8ed83b83bc71a5a6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:56:33 2019 +0800

                其他史提示无主诉时可输入bug修改

            commit d895d0391f5389858501b5be2d98c93516740f1a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:29:35 2019 +0800

                查体框可编辑状态删除

            commit 0ea49aca9cfc5399c0d074c81fe7a330a76ed40b
            Merge: 2799250 2facfcb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:19:21 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/containers/eleType.js
                #	src/store/async-actions/treat.js

            commit 2facfcb8073c095fa0b6ae3eb54566fb072d7c85
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 17:15:41 2019 +0800

                查体获取数据失败时可输入bug修改

            commit 141ab5430c47c52bcff13dc7d34cc5a7fa134d4c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 15:12:53 2019 +0800

                其他史查体搜索结果放前后bug修改

            commit 9572b216a7c48e9947d3ce028b10f5849cb72102
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 14:34:34 2019 +0800

                其他史搜索选中位置bug修改

            commit ee5b7c3eb6a0e6328e2ee500deca54b756d69848
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 13:48:27 2019 +0800

                搜索bug修改

            commit c7e0483300e2188b162ce41063d38a50706979aa
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 16:34:50 2019 +0800

                11

            commit 7a7882300853f5a273686f709ab0462ad706a8f0
            Merge: 420bcf7 2799250
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 15:28:00 2019 +0800

                Merge branch 'dev/new1' into dev/zhangxc1

            commit 27992500bd6cd1d92f6cc4411a8436f36ef565d0
            Merge: 9573ac3 945c448
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:57:17 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit 9573ac3a696fa8e206e5a46e588dc4daad049381
            Merge: c90d43b fbbb8fb
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:57:10 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit c90d43b677ba6dbaad86bd1fc8d4731eb46165b5
            Merge: d2c86ef 81e413f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 14:56:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/containers/OtherHistory.js

            commit 81e413f1f4296fc8bcc22485e5779ddb776478f1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:53:45 2019 +0800

                之前修改的bug找回

            commit 420bcf750b1e316f23b750de4985441221ef0a5c
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 14:53:11 2019 +0800

                修改同类药物样式

            commit 3bf089d9605e75bf7511e9d42fa6b03c9c6066b1
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:44:35 2019 +0800

                改为全局弹窗显示

            commit fbbb8fbbb040b404ee7307b1b95505cea783626a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 14:38:23 2019 +0800

                修改添加诊断推送

            commit e1240a8e9f409aa5e4382e2bc0ef63ed6ff0a1dd
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 14:20:22 2019 +0800

                弹窗高度动态设置

            commit d2c86efb89cba523db9c587e7d8435a4b2be8531
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 11:16:53 2019 +0800

                无选中项体温输入bug修改

            commit aa6d15a7c141f10f275f1fc470d0eba476ffc4b2
            Merge: 9f91346 1fccd43
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:57:06 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 9f91346e73a2a64ce463baf32723a8c9e3b9cc05
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:55:41 2019 +0800

                bug修改

            commit 1fccd439ee53729685732eeb6fbbfe1be0eda80d
            Merge: 986a3cf 2e25c1b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 09:58:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            commit 3385c2c2a41d0b223136f5f176487cce09e1c082
            Merge: b876b6b 2e25c1b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 09:51:36 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/otherHis

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit e697f350f7724505282d06dfa0dc2ae001ea9c09
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 09:46:57 2019 +0800

                 删除console

            commit 2e25c1bb7076358b6e4063ced5731c3f456eb704
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 1 09:40:43 2019 +0800

                诊断第一个为复诊添加到主诉

            commit 986a3cf5976bfec9bce6afb554bab1f4a1a2a49d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:33:59 2019 +0800

                合并

            commit c900ae632d99d0c0fb2e2e5f9788707ada02745a
            Merge: 31ef38b b7bfe2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:18:38 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                # Conflicts:
                #	src/components/AddInspect/index.jsx
                #	src/components/CopyRight/index.less
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Inspect/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/Treat/index.jsx
                #	src/components/Treat/index.less
                #	src/containers/NumberUnitDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/diagnosticList.js
                #	src/store/async-actions/treat.js
                #	src/utils/tools.js

            commit 31ef38b3d5b46612b64866687214c2b9d1651b03
            Merge: 44fbf2b d6751d9
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 17:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/CopyRight/index.less
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Inspect/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/components/Operation/index.jsx
                #	src/components/PushContainer/index.jsx
                #	src/components/PushItems/index.less
                #	src/components/SpreadDrop/index.jsx
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/utils/tools.js

            commit 44fbf2b8d8f90640a9af8abe4da55c2af7efa319
            Merge: db4e755 935c0cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:52:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                # Conflicts:
                #	src/components/PreviewBody/index.jsx

            commit db4e7559fb2bc15434058503ca8d1a1e3ffe8ad6
            Merge: edb84b0 9483642
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:44:26 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/components/TreatDesc/DrugInfo/index.less
                #	src/store/async-actions/treat.js
                #	src/store/reducers/treat.js

            commit edb84b07adad34cdd5c94a592e543127d20eaec1
            Merge: b876b6b 6b71cd5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 15:35:50 2019 +0800

                更新

            commit b876b6b8dc6afe12ae2a90c990d147e32221d02c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 14:38:05 2019 +0800

                其他史有伴无排序

            commit f8ab9c103e8266a6ab44466a7fadbc1f0a91ceca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 14:06:33 2019 +0800

                查体搜索自由文本位置bug修改

            commit e45296e22263659c86f60d031bc5246c7f1be726
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:51:40 2019 +0800

                复诊主诉文本模式bug

            commit f5cae58692247cad7c0b3ff8966a2f7d5213069c
            Merge: 960317d d3e160a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:39:27 2019 +0800

                Merge branch 'dev/new1' into dev/otherHis

                # Conflicts:
                #	src/components/SpreadDrop/index.jsx

            commit 960317de925978075041b722cd3500488ce924fd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 13:36:13 2019 +0800

                双击隐藏下拉

            commit 06571b04a337a3805d723e22e964c5ba683293f5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 31 10:28:18 2019 +0800

                主诉saveText无值则判断为空,查体其他史聚焦提示

            commit 94836425d1dc9b9cf5cc1f2ce6f3bdc3706fd578
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:50:58 2019 +0800

                修改版本信息样式

            commit e0092d7003c2bcfecc38a77350d29ddc1a92dbf2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:40:32 2019 +0800

                关闭药品说明书时清除内容

            commit a921420ddd0b8c4c8101b1d5bb1d7fec8e422341
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 19:01:15 2019 +0800

                修改治疗方案和药品说明书样式

            commit 935c0cf687389a50aeef502b97f07685e675bd1d
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 17:16:52 2019 +0800

                滚动兼容

            commit 6b71cd51bbafd8c4283b1c16fae3a538a88f5651
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:54:56 2019 +0800

                现病史病程变化

            commit 91c3713c62e8eb4b9437b00d754133e87561d8cc
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:36:48 2019 +0800

                注释scrollTo

            commit 2123a1e9839af1052e1405d6a005ddf521041c9d
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:10:44 2019 +0800

                Squashed commit of the following:

                commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 16:00:51 2019 +0800

                    打印医生签名自动获取

                commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 14:09:41 2019 +0800

                    样式调整

                commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 14:02:27 2019 +0800

                    化验填写单清空按钮,弹窗还在

                commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 13:46:36 2019 +0800

                    模板列表获取时机

                commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 13:34:03 2019 +0800

                    模板名称重复弹窗不关闭

                commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 30 10:46:13 2019 +0800

                    模板保存跟之前所有保存的模板作对比

                commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:35:01 2019 +0800

                    底部几个按钮换行设置最小宽度

                commit 7400613a1eb642e1d01004c7818883fd73c2350c
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:28:45 2019 +0800

                    历史病例时间和按钮不能共存

                commit eda3f4b08a3460360541cd2af1c2ca071681c595
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 17:12:47 2019 +0800

                    bug修改

                commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 15:54:49 2019 +0800

                    还是符号处理...

                commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 14:17:40 2019 +0800

                    顿号去重

                commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                Merge: 4095b3f b09559b
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:59:54 2019 +0800

                    Merge branch 'dev/new1' into dev/byll

                commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:55:47 2019 +0800

                    样式宽度更改和逗号处理

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

                # Conflicts:
                #	src/utils/tools.js

            commit 6df92ea9ddd29c14979874f2f0e7eac54d032eaf
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:07:27 2019 +0800

                Squashed commit of the following:

                commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 15:20:06 2019 +0800

                    治疗方案样式

                commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 15:18:20 2019 +0800

                    修改治疗方案样式

                commit 859a7364a96569f6aa92360efbce5a19b40681cb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:32:44 2019 +0800

                    修改治疗方案小标题样式

                commit 99789b23f06c18e5b588552066faf7f2ccacf198
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:07:48 2019 +0800

                    修改治疗方案同类药物

                commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Wed Jan 30 14:00:40 2019 +0800

                    修改弹窗IE8不居中

                commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 20:30:39 2019 +0800

                    治疗方案高度自适应

                commit c000d83fb6ac5f265951c0e1377b627d24d2da10
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 17:27:30 2019 +0800

                    修改治疗方案边框

                commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:58:28 2019 +0800

                    导入化验结果,第一次添加诊断为主诉时不往主诉添加字符串

                commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:56:03 2019 +0800

                    治疗方案标题添加疾病名称

                commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:22:37 2019 +0800

                    修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:41:20 2019 +0800

                    ie8治疗方案遮罩

                commit fee35d5473b69aafb5335759006a93fea8d14145
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:05:16 2019 +0800

                    治疗方案遮罩IE8

                commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:04:58 2019 +0800

                    修改右侧推送字体大小

                commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 13:26:56 2019 +0800

                    修改化验项开单逗号问题

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

                # Conflicts:
                #	src/components/Treat/index.jsx
                #	src/components/Treat/index.less
                #	src/store/async-actions/diagnosticList.js
                #	src/store/async-actions/treat.js

            commit 20f96c311119b635dad33f6c9222d94d8563bbfe
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 30 16:02:31 2019 +0800

                Squashed commit of the following:

                commit 27178b569e9575d450bbf1ce329e069d4c4b4b8c
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 30 15:57:20 2019 +0800

                    ie8现病史添加症状报错的问题&查体血压选中不变黑的问题

                commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 18:17:15 2019 +0800

                    查体模板添加逗号,主诉两个时间处理
                    Squashed commit of the following:

                    commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:51:09 2019 +0800

                        Squashed commit of the following:

                        commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 14:17:40 2019 +0800

                            顿号去重

                        commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                        Merge: 4095b3f b09559b
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:59:54 2019 +0800

                            Merge branch 'dev/new1' into dev/byll

                        commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:55:47 2019 +0800

                            样式宽度更改和逗号处理

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit fea9a721ccb5afb9f1873c2111e3722d7330d394
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:50:07 2019 +0800

                        Squashed commit of the following:

                        commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 15:22:37 2019 +0800

                            修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                        commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:41:20 2019 +0800

                            ie8治疗方案遮罩

                        commit fee35d5473b69aafb5335759006a93fea8d14145
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:05:16 2019 +0800

                            治疗方案遮罩IE8

                        commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:04:58 2019 +0800

                            修改右侧推送字体大小

                        commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 13:26:56 2019 +0800

                            修改化验项开单逗号问题

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                        # Conflicts:
                        #	src/components/PushItems/index.jsx

                    commit 2c70e41e7a5254838436b499b1ad787f523585f8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:42:54 2019 +0800

                        Squashed commit of the following:

                        commit 519f23c91954f87e836cbd400b158f774c498ba6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Tue Jan 29 15:35:59 2019 +0800

                            文本删除又出现的问题
                            Squashed commit of the following:

                            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Tue Jan 29 11:44:56 2019 +0800

                                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:41:03 2019 +0800

                                Squashed commit of the following:

                                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                                Author: Luolei <16657115156@163.com>
                                Date:   Fri Jan 25 14:06:09 2019 +0800

                                    date修改

                            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:38:40 2019 +0800

                                Squashed commit of the following:

                                commit 29b2499b796085a682a936d82c97decc35edf891
                                Author: zhangxc <zhangxc@zjlantone.com>
                                Date:   Fri Jan 25 13:50:07 2019 +0800

                                    修改版本信息和免责声明位置

                            commit e36f2f1b811d6978117161f50b16dd5bae298547
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:33:30 2019 +0800

                                Squashed commit of the following:

                                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 15:59:14 2019 +0800

                                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 14:21:41 2019 +0800

                                    Squashed commit of the following:

                                    commit d3e160a516240b77576567b993223816a68231a6
                                    Merge: 79e63ed c7e9e73
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:48 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:16 2019 +0800

                                        化验辅捡ie8搜索卡死修改

                                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:12:43 2019 +0800

                                        默认host地址删除

                                    commit e01035349f92405572238a0a97d80bb557dda802
                                    Merge: 8a8015d caad36f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 11:45:20 2019 +0800

                                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 10:59:52 2019 +0800

                                        修改样式

                                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:46:01 2019 +0800

                                        合并报错修改

                                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                                    Merge: bbe85ff 58e0fdd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:42:51 2019 +0800

                                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                                    Merge: b86268a 3bfa819
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:30:05 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/containers/SpreadDrop.js

                                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                                    Merge: 79c59d3 105488f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:25:44 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                        # Conflicts:
                                        #	src/store/async-actions/treat.js

                                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                                    Merge: db90e04 de190a5
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:24:40 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 20:18:42 2019 +0800

                                        中英文逗号

                                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 18:31:55 2019 +0800

                                        去掉英文逗号

                                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 17:22:34 2019 +0800

                                        修改治疗方案

                                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 16:49:10 2019 +0800

                                        下拉项间距调整,ie8事件兼容

                                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:09:49 2019 +0800

                                        药品说明书样式

                                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:08:17 2019 +0800

                                        修改药品说明书

                                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:06:17 2019 +0800

                                        修改开单样式

                                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:02:30 2019 +0800

                                        修改获取患者信息路径

                                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:43:38 2019 +0800

                                        添加诊断判断有没有治疗方案

                                    commit f617e5c267246786e7a6801cc87811f0d2527235
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:39:13 2019 +0800

                                        merge from 'dev/zxc'

                                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 10:33:44 2019 +0800

                                        提示语

                                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                                    Merge: d3ade00 95e9a94
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:09:57 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                        # Conflicts:
                                        #	src/components/DiagnosticList/index.jsx
                                        #	src/components/Operation/index.jsx
                                        #	src/containers/SpreadDrop.js
                                        #	src/store/actions/otherHistory.js
                                        #	src/store/async-actions/treat.js
                                        #	src/store/types/checkBody.js

                                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                                    Merge: 2fd497e 2458ea1
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:05:17 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:03:28 2019 +0800

                                        提示语消失默认时间改为2秒

                                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 10:02:00 2019 +0800

                                        治疗方案置灰

                                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:59:16 2019 +0800

                                        治疗方案

                                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                                    Merge: 62bd7fb 38f9720
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:47:47 2019 +0800

                                        Merge branch 'dev/new' into dev/zhangxc

                                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:32 2019 +0800

                                        Revert "Revert "修改药品说明样式""

                                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                                    Merge: 28c364a c37d1cc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:00 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:45:29 2019 +0800

                                        Revert "修改药品说明样式"

                                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:25:58 2019 +0800

                                        搜索列表显示样式更改

                                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:15:40 2019 +0800

                                        样式调整

                                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:22:29 2019 +0800

                                        修改导入host

                                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:15:44 2019 +0800

                                        临时修改版本弹窗高度

                                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:10:27 2019 +0800

                                        化验导入删除填值推送

                                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:43:48 2019 +0800

                                        添加删除辅捡右侧推送

                                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:30:50 2019 +0800

                                        修改杂音选中项bug

                                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                                    Merge: b489e52 6a1a3df
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:58:07 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:57:50 2019 +0800

                                        既往史无殊选中bug

                                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 18:57:03 2019 +0800

                                        css

                                    commit 96efc7b8118a99db629f898960621b98786bd42e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:26:40 2019 +0800

                                        合罗磊分支

                                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:49:02 2019 +0800

                                        回退

                                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                                    Merge: 6732dbb 1dd6c92
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:44:02 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/TailInlineTag/index.less
                                        #	src/common/components/Textarea/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx
                                        #	src/containers/OtherHistory.js
                                        #	src/store/actions/otherHistory.js

                                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                                    Merge: bc168f8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:36:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx

                                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                                    Merge: 3559798 6d55c59
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:34:30 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:31:13 2019 +0800

                                        既往史下拉滚动条添加

                                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:22:01 2019 +0800

                                        修改请求地址

                                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 17:16:22 2019 +0800

                                        辅检横向滚动

                                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                                    Merge: adc853a 45b1158
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 16:53:11 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit cf97be2f425bdef386a137e92929969c321ab047
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:08:25 2019 +0800

                                        去掉一个字

                                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:01:26 2019 +0800

                                        bug

                                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 15:58:40 2019 +0800

                                        其他史高血压选中bug修改

                                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 15:16:32 2019 +0800

                                        删除项有问题

                                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                                    Merge: d2eca9d 1a6bf74
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:59:26 2019 +0800

                                        Merge branch 'dev/liucf' into dev/luolei

                                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 14:51:07 2019 +0800

                                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:43:46 2019 +0800

                                        日期bug

                                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:46:29 2019 +0800

                                        请求地址修改-刚才反了

                                    commit 70e9420d59b745c59f3abe04c33100777184d024
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:44:13 2019 +0800

                                        请求地址修改

                                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:39:05 2019 +0800

                                        打印图标

                                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:31:48 2019 +0800

                                        其他史高血压数据展开

                                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:00:06 2019 +0800

                                        查体type修改

                                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:58:27 2019 +0800

                                        查体type修改

                                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                                    Merge: 4b8aa34 540b6a8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:51:52 2019 +0800

                                        Merge branch 'dev/new' into dev/luolei

                                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:47:15 2019 +0800

                                        搜索弹窗被遮挡问题解决

                                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:23:04 2019 +0800

                                        地址临时修改

                                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:20:05 2019 +0800

                                        版本信息弹窗高度限制

                                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:13:40 2019 +0800

                                        推送接口主诉现病史合并,治疗方案容错

                                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                                    Merge: 4a897b4 5a39d90
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                                    Merge: 7f1c7c8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:43 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/common/components/ItemBox/index.jsx
                                        #	src/components/AddInspect/index.jsx
                                        #	src/components/Diagnosis/index.jsx
                                        #	src/components/Diagnosis/index.less

                                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:52:01 2019 +0800

                                        层级问题

                                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                                    Merge: e5d0122 7f1c7c8
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:34 2019 +0800

                                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:21 2019 +0800

                                        11

                                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:39:50 2019 +0800

                                        修改请求地址

                                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:38:05 2019 +0800

                                        修改请求地址

                                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                                    Merge: df67559 a82d18c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                                    Merge: ff817bf 6805811
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:39 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                    commit 68058110e041e72b8c95979a4fd23e690912746b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:43:26 2019 +0800

                                        遮罩统一0.6透明度

                                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:34:59 2019 +0800

                                        透明度ie8

                                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:24:39 2019 +0800

                                        修改治疗方案无内容按钮置灰

                                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                                    Merge: 9c0e078 84ec971
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:09:22 2019 +0800

                                        merge from 'lcf'

                                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 19:01:31 2019 +0800

                                        修改药品说明样式

                                    commit ff817bf6d6d928b98557371362374859bec3aabd
                                    Merge: d50ffe0 b2e679a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:52:34 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:50:45 2019 +0800

                                        导入ie8暂时先灰掉

                                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                                    Merge: 573f0b5 b286d0a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:25:09 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:23:57 2019 +0800

                                        文本模式ie8onInput存值,搜索下拉项样式

                                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 15:30:07 2019 +0800

                                        修改开单项到医嘱逗号

                                    commit 573f0b59ff517de16f94296240572544e31c9f46
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:23:46 2019 +0800

                                        合并后报错处理

                                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                                    Merge: 55d15d6 fbab9de
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:18:22 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                        # Conflicts:
                                        #	src/components/CurrentIll/index.jsx
                                        #	src/containers/EditableSpan.js
                                        #	src/store/actions/currentIll.js
                                        #	src/store/reducers/checkBody.js
                                        #	src/utils/ajax.js
                                        #	src/utils/config.js

                                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                                    Merge: 2d40e6e ad68815
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:10:38 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/components/MainSuit/index.jsx

                                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:02:18 2019 +0800

                                        ie8的onInput代替函数

                                    commit ad688156064254d6b615284642882ba5486ff764
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 10:29:36 2019 +0800

                                        init

                                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:13:57 2019 +0800

                                        updata pro

                                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:12:21 2019 +0800

                                        test

                                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 13:13:11 2019 +0800

                                    单选和多选编辑失焦时调用推送接口

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                            # Conflicts:
                            #	src/components/AddInspect/index.jsx
                            #	src/components/Inspect/index.jsx
                            #	src/components/PushItems/index.less
                            #	src/store/actions/checkBody.js
                            #	src/store/actions/currentIll.js
                            #	src/store/actions/mainSuit.js
                            #	src/store/actions/otherHistory.js

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/NumberDrop/index.jsx
                        #	src/components/NumberUnitDrop/index.jsx
                        #	src/store/actions/mainSuit.js

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/PushItems/index.jsx
                    #	src/utils/tools.js

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

                # Conflicts:
                #	src/containers/NumberUnitDrop.js
                #	src/store/actions/checkBody.js

            commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 16:00:51 2019 +0800

                打印医生签名自动获取

            commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 15:20:06 2019 +0800

                治疗方案样式

            commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 15:18:20 2019 +0800

                修改治疗方案样式

            commit 859a7364a96569f6aa92360efbce5a19b40681cb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:32:44 2019 +0800

                修改治疗方案小标题样式

            commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 14:09:41 2019 +0800

                样式调整

            commit 99789b23f06c18e5b588552066faf7f2ccacf198
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:07:48 2019 +0800

                修改治疗方案同类药物

            commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 14:02:27 2019 +0800

                化验填写单清空按钮,弹窗还在

            commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Jan 30 14:00:40 2019 +0800

                修改弹窗IE8不居中

            commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 13:46:36 2019 +0800

                模板列表获取时机

            commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 13:34:03 2019 +0800

                模板名称重复弹窗不关闭

            commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 30 10:46:13 2019 +0800

                模板保存跟之前所有保存的模板作对比

            commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 20:30:39 2019 +0800

                治疗方案高度自适应

            commit 3e1c705ef6c2b2d0944ced37b8fa3f7c01307e25
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 18:20:27 2019 +0800

                Squashed commit of the following:

                commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 18:17:15 2019 +0800

                    查体模板添加逗号,主诉两个时间处理
                    Squashed commit of the following:

                    commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:51:09 2019 +0800

                        Squashed commit of the following:

                        commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 14:17:40 2019 +0800

                            顿号去重

                        commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                        Merge: 4095b3f b09559b
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:59:54 2019 +0800

                            Merge branch 'dev/new1' into dev/byll

                        commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 29 13:55:47 2019 +0800

                            样式宽度更改和逗号处理

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit fea9a721ccb5afb9f1873c2111e3722d7330d394
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:50:07 2019 +0800

                        Squashed commit of the following:

                        commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 15:22:37 2019 +0800

                            修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                        commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:41:20 2019 +0800

                            ie8治疗方案遮罩

                        commit fee35d5473b69aafb5335759006a93fea8d14145
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:05:16 2019 +0800

                            治疗方案遮罩IE8

                        commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 14:04:58 2019 +0800

                            修改右侧推送字体大小

                        commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 29 13:26:56 2019 +0800

                            修改化验项开单逗号问题

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                        # Conflicts:
                        #	src/components/PushItems/index.jsx

                    commit 2c70e41e7a5254838436b499b1ad787f523585f8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 15:42:54 2019 +0800

                        Squashed commit of the following:

                        commit 519f23c91954f87e836cbd400b158f774c498ba6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Tue Jan 29 15:35:59 2019 +0800

                            文本删除又出现的问题
                            Squashed commit of the following:

                            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Tue Jan 29 11:44:56 2019 +0800

                                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:41:03 2019 +0800

                                Squashed commit of the following:

                                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                                Author: Luolei <16657115156@163.com>
                                Date:   Fri Jan 25 14:06:09 2019 +0800

                                    date修改

                            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:38:40 2019 +0800

                                Squashed commit of the following:

                                commit 29b2499b796085a682a936d82c97decc35edf891
                                Author: zhangxc <zhangxc@zjlantone.com>
                                Date:   Fri Jan 25 13:50:07 2019 +0800

                                    修改版本信息和免责声明位置

                            commit e36f2f1b811d6978117161f50b16dd5bae298547
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Mon Jan 28 10:33:30 2019 +0800

                                Squashed commit of the following:

                                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 15:59:14 2019 +0800

                                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 14:21:41 2019 +0800

                                    Squashed commit of the following:

                                    commit d3e160a516240b77576567b993223816a68231a6
                                    Merge: 79e63ed c7e9e73
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:48 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:46:16 2019 +0800

                                        化验辅捡ie8搜索卡死修改

                                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 13:12:43 2019 +0800

                                        默认host地址删除

                                    commit e01035349f92405572238a0a97d80bb557dda802
                                    Merge: 8a8015d caad36f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 11:45:20 2019 +0800

                                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 10:59:52 2019 +0800

                                        修改样式

                                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:46:01 2019 +0800

                                        合并报错修改

                                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                                    Merge: bbe85ff 58e0fdd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Fri Jan 25 09:42:51 2019 +0800

                                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                                    Merge: b86268a 3bfa819
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:30:05 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/containers/SpreadDrop.js

                                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                                    Merge: 79c59d3 105488f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:25:44 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                        # Conflicts:
                                        #	src/store/async-actions/treat.js

                                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                                    Merge: db90e04 de190a5
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 20:24:40 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 20:18:42 2019 +0800

                                        中英文逗号

                                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 18:31:55 2019 +0800

                                        去掉英文逗号

                                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 17:22:34 2019 +0800

                                        修改治疗方案

                                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 16:49:10 2019 +0800

                                        下拉项间距调整,ie8事件兼容

                                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:09:49 2019 +0800

                                        药品说明书样式

                                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:08:17 2019 +0800

                                        修改药品说明书

                                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:06:17 2019 +0800

                                        修改开单样式

                                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 14:02:30 2019 +0800

                                        修改获取患者信息路径

                                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:43:38 2019 +0800

                                        添加诊断判断有没有治疗方案

                                    commit f617e5c267246786e7a6801cc87811f0d2527235
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 13:39:13 2019 +0800

                                        merge from 'dev/zxc'

                                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 10:33:44 2019 +0800

                                        提示语

                                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                                    Merge: d3ade00 95e9a94
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:09:57 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                        # Conflicts:
                                        #	src/components/DiagnosticList/index.jsx
                                        #	src/components/Operation/index.jsx
                                        #	src/containers/SpreadDrop.js
                                        #	src/store/actions/otherHistory.js
                                        #	src/store/async-actions/treat.js
                                        #	src/store/types/checkBody.js

                                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                                    Merge: 2fd497e 2458ea1
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:05:17 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 10:03:28 2019 +0800

                                        提示语消失默认时间改为2秒

                                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 10:02:00 2019 +0800

                                        治疗方案置灰

                                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:59:16 2019 +0800

                                        治疗方案

                                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                                    Merge: 62bd7fb 38f9720
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:47:47 2019 +0800

                                        Merge branch 'dev/new' into dev/zhangxc

                                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:32 2019 +0800

                                        Revert "Revert "修改药品说明样式""

                                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                                    Merge: 28c364a c37d1cc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Thu Jan 24 09:46:00 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Thu Jan 24 09:45:29 2019 +0800

                                        Revert "修改药品说明样式"

                                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:25:58 2019 +0800

                                        搜索列表显示样式更改

                                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Thu Jan 24 09:15:40 2019 +0800

                                        样式调整

                                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:22:29 2019 +0800

                                        修改导入host

                                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:15:44 2019 +0800

                                        临时修改版本弹窗高度

                                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 21:10:27 2019 +0800

                                        化验导入删除填值推送

                                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:43:48 2019 +0800

                                        添加删除辅捡右侧推送

                                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 20:30:50 2019 +0800

                                        修改杂音选中项bug

                                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                                    Merge: b489e52 6a1a3df
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:58:07 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:57:50 2019 +0800

                                        既往史无殊选中bug

                                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 18:57:03 2019 +0800

                                        css

                                    commit 96efc7b8118a99db629f898960621b98786bd42e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 18:26:40 2019 +0800

                                        合罗磊分支

                                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:49:02 2019 +0800

                                        回退

                                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                                    Merge: 6732dbb 1dd6c92
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:44:02 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/TailInlineTag/index.less
                                        #	src/common/components/Textarea/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx
                                        #	src/containers/OtherHistory.js
                                        #	src/store/actions/otherHistory.js

                                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                                    Merge: bc168f8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:36:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                        # Conflicts:
                                        #	src/common/components/EditableSpan/index.jsx
                                        #	src/components/AddAssistCheck/index.jsx

                                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                                    Merge: 3559798 6d55c59
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:34:30 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:31:13 2019 +0800

                                        既往史下拉滚动条添加

                                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 17:22:01 2019 +0800

                                        修改请求地址

                                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 17:16:22 2019 +0800

                                        辅检横向滚动

                                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                                    Merge: adc853a 45b1158
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 16:53:11 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit cf97be2f425bdef386a137e92929969c321ab047
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:08:25 2019 +0800

                                        去掉一个字

                                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 16:01:26 2019 +0800

                                        bug

                                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 15:58:40 2019 +0800

                                        其他史高血压选中bug修改

                                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 15:16:32 2019 +0800

                                        删除项有问题

                                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                                    Merge: d2eca9d 1a6bf74
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:59:26 2019 +0800

                                        Merge branch 'dev/liucf' into dev/luolei

                                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 14:51:07 2019 +0800

                                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 14:43:46 2019 +0800

                                        日期bug

                                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:46:29 2019 +0800

                                        请求地址修改-刚才反了

                                    commit 70e9420d59b745c59f3abe04c33100777184d024
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:44:13 2019 +0800

                                        请求地址修改

                                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 13:39:05 2019 +0800

                                        打印图标

                                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:31:48 2019 +0800

                                        其他史高血压数据展开

                                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 11:00:06 2019 +0800

                                        查体type修改

                                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:58:27 2019 +0800

                                        查体type修改

                                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                                    Merge: 4b8aa34 540b6a8
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:51:52 2019 +0800

                                        Merge branch 'dev/new' into dev/luolei

                                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Wed Jan 23 10:47:15 2019 +0800

                                        搜索弹窗被遮挡问题解决

                                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:23:04 2019 +0800

                                        地址临时修改

                                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:20:05 2019 +0800

                                        版本信息弹窗高度限制

                                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 10:13:40 2019 +0800

                                        推送接口主诉现病史合并,治疗方案容错

                                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                                    Merge: 4a897b4 5a39d90
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                                    Merge: 7f1c7c8 abd1267
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:57:43 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/common/components/ItemBox/index.jsx
                                        #	src/components/AddInspect/index.jsx
                                        #	src/components/Diagnosis/index.jsx
                                        #	src/components/Diagnosis/index.less

                                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:52:01 2019 +0800

                                        层级问题

                                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                                    Merge: e5d0122 7f1c7c8
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:34 2019 +0800

                                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                                    Author: liucf <liucf@zjlantone.com>
                                    Date:   Wed Jan 23 09:43:21 2019 +0800

                                        11

                                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:39:50 2019 +0800

                                        修改请求地址

                                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:38:05 2019 +0800

                                        修改请求地址

                                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                                    Merge: df67559 a82d18c
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:50 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                                    Merge: ff817bf 6805811
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Wed Jan 23 09:26:39 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                    commit 68058110e041e72b8c95979a4fd23e690912746b
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:43:26 2019 +0800

                                        遮罩统一0.6透明度

                                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 20:34:59 2019 +0800

                                        透明度ie8

                                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:24:39 2019 +0800

                                        修改治疗方案无内容按钮置灰

                                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                                    Merge: 9c0e078 84ec971
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 20:09:22 2019 +0800

                                        merge from 'lcf'

                                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 19:01:31 2019 +0800

                                        修改药品说明样式

                                    commit ff817bf6d6d928b98557371362374859bec3aabd
                                    Merge: d50ffe0 b2e679a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:52:34 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:50:45 2019 +0800

                                        导入ie8暂时先灰掉

                                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                                    Merge: 573f0b5 b286d0a
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:25:09 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                        # Conflicts:
                                        #	src/utils/config.js

                                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 16:23:57 2019 +0800

                                        文本模式ie8onInput存值,搜索下拉项样式

                                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 15:30:07 2019 +0800

                                        修改开单项到医嘱逗号

                                    commit 573f0b59ff517de16f94296240572544e31c9f46
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:23:46 2019 +0800

                                        合并后报错处理

                                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                                    Merge: 55d15d6 fbab9de
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:18:22 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                        # Conflicts:
                                        #	src/components/CurrentIll/index.jsx
                                        #	src/containers/EditableSpan.js
                                        #	src/store/actions/currentIll.js
                                        #	src/store/reducers/checkBody.js
                                        #	src/utils/ajax.js
                                        #	src/utils/config.js

                                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                                    Merge: 2d40e6e ad68815
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:10:38 2019 +0800

                                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                        # Conflicts:
                                        #	src/components/MainSuit/index.jsx

                                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                                    Author: zhouna <zhouna@zjlantone.com>
                                    Date:   Tue Jan 22 15:02:18 2019 +0800

                                        ie8的onInput代替函数

                                    commit ad688156064254d6b615284642882ba5486ff764
                                    Author: zhangxc <zhangxc@zjlantone.com>
                                    Date:   Tue Jan 22 10:29:36 2019 +0800

                                        init

                                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:13:57 2019 +0800

                                        updata pro

                                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                                    Author: Luolei <16657115156@163.com>
                                    Date:   Tue Jan 22 10:12:21 2019 +0800

                                        test

                                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                                Author: liucf <liucf@zjlantone.com>
                                Date:   Fri Jan 25 13:13:11 2019 +0800

                                    单选和多选编辑失焦时调用推送接口

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                            # Conflicts:
                            #	src/components/AddInspect/index.jsx
                            #	src/components/Inspect/index.jsx
                            #	src/components/PushItems/index.less
                            #	src/store/actions/checkBody.js
                            #	src/store/actions/currentIll.js
                            #	src/store/actions/mainSuit.js
                            #	src/store/actions/otherHistory.js

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/NumberDrop/index.jsx
                        #	src/components/NumberUnitDrop/index.jsx
                        #	src/store/actions/mainSuit.js

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/PushItems/index.jsx
                    #	src/utils/tools.js

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:35:01 2019 +0800

                底部几个按钮换行设置最小宽度

            commit 7400613a1eb642e1d01004c7818883fd73c2350c
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:28:45 2019 +0800

                历史病例时间和按钮不能共存

            commit c000d83fb6ac5f265951c0e1377b627d24d2da10
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 17:27:30 2019 +0800

                修改治疗方案边框

            commit eda3f4b08a3460360541cd2af1c2ca071681c595
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 17:12:47 2019 +0800

                bug修改

            commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 15:54:49 2019 +0800

                还是符号处理...

            commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:58:28 2019 +0800

                导入化验结果,第一次添加诊断为主诉时不往主诉添加字符串

            commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:56:03 2019 +0800

                治疗方案标题添加疾病名称

            commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:51:09 2019 +0800

                Squashed commit of the following:

                commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 14:17:40 2019 +0800

                    顿号去重

                commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                Merge: 4095b3f b09559b
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:59:54 2019 +0800

                    Merge branch 'dev/new1' into dev/byll

                commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:55:47 2019 +0800

                    样式宽度更改和逗号处理

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit fea9a721ccb5afb9f1873c2111e3722d7330d394
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:50:07 2019 +0800

                Squashed commit of the following:

                commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:22:37 2019 +0800

                    修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:41:20 2019 +0800

                    ie8治疗方案遮罩

                commit fee35d5473b69aafb5335759006a93fea8d14145
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:05:16 2019 +0800

                    治疗方案遮罩IE8

                commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:04:58 2019 +0800

                    修改右侧推送字体大小

                commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 13:26:56 2019 +0800

                    修改化验项开单逗号问题

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

                # Conflicts:
                #	src/components/PushItems/index.jsx

            commit 2c70e41e7a5254838436b499b1ad787f523585f8
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:42:54 2019 +0800

                Squashed commit of the following:

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/NumberDrop/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/store/actions/mainSuit.js

            commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:22:37 2019 +0800

                修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

            commit 799eef5c34a21f9d90bc82a40240838cf10ba601
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:41:20 2019 +0800

                ie8治疗方案遮罩

            commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 14:17:40 2019 +0800

                顿号去重

            commit fee35d5473b69aafb5335759006a93fea8d14145
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:05:16 2019 +0800

                治疗方案遮罩IE8

            commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:04:58 2019 +0800

                修改右侧推送字体大小

            commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
            Merge: 4095b3f b09559b
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:59:54 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:55:47 2019 +0800

                样式宽度更改和逗号处理

            commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 13:26:56 2019 +0800

                修改化验项开单逗号问题

            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 11:44:56 2019 +0800

                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:41:03 2019 +0800

                Squashed commit of the following:

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:38:40 2019 +0800

                Squashed commit of the following:

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

            commit e36f2f1b811d6978117161f50b16dd5bae298547
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:33:30 2019 +0800

                Squashed commit of the following:

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit d6751d916bd9aff60373a28ce2240bc078809e9a
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 09:51:31 2019 +0800

                合并new1分支
                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit caad36f002904aa859a0d780eefdf5b9cdc9011e
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 11:24:02 2019 +0800

                    时间单位组件IE兼容

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit 58e0fdd1ab99664163923ff7ae455efff5850195
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 09:20:30 2019 +0800

                    主诉IE兼容性处理

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/containers/SpreadDrop.js

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                    # Conflicts:
                    #	src/store/async-actions/treat.js

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整,ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

                    Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/components/AddAssistCheck/index.jsx

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并,治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/new' into dev/new

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

                    Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值,搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/components/MainSuit/index.jsx

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

        commit 0dd720981dd0439560d143288ad3eca97fada9b2
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 09:29:01 2019 +0800

            光标没有落入span禁止默认事件

        # Conflicts:
        #	src/common/components/Textarea/index.less
        #	src/components/AddAssistCheck/Textarea/index.jsx
        #	src/components/AddAssistCheck/Textarea/index.less
        #	src/store/async-actions/homePage.js

    commit 7badd324c95ce9228e4bc77018b95ef12ce8b478
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 4 20:28:34 2019 +0800

        innerText兼容

    commit bae44fbc4ec23f87680a8a990bb7b4beafe76bdb
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 4 19:32:27 2019 +0800

        火狐div兼容

    commit 734d5a7daf56d94e86cef862cf1fe53ae024e28b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 17:40:09 2019 +0800

        诊断搜索去重

    commit ae75e0b94813e902df0cb9fcfdb010a077da2bcc
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 4 16:51:40 2019 +0800

        搜索结果位置变化,div换行问题

    commit c4b7f3caf26cc03ee94e500988fa561a4a8cb6d0
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 4 10:38:22 2019 +0800

        预览文字过多导致出现滚动条

    commit 67c2971080b85bdef5a695642163cf1f55aa315e
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 4 10:32:51 2019 +0800

        现病史查体其他史输入内容过多问题,默认回读辅检提示语

    commit d46dbe3c26d9c9872b7185ef1e60e3744627563b
    Merge: f122312 d1e8e89
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 10:19:23 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit f1223124e1703aafcddbc5c899da81c52624cc18
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 10:18:04 2019 +0800

        修改删除诊断弹窗不关闭

    commit d1e8e89be8c8cefd35dca10715ef19e627d17e6a
    Merge: c050c98 70e968a
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 4 10:03:38 2019 +0800

        loading弹窗时机,历史病例回读位置修改

    commit c050c982167c5a86ad8a69e46a082ba0f004d2cb
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 4 09:41:42 2019 +0800

        去掉聚焦事件

    commit 70e968a78a10c520fa092cd979e0e03475523dc4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 09:25:57 2019 +0800

        修改诊断搜索参数

    commit 145f11b16fac314478c7c447fca3899cc6dc591f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Sun Mar 3 16:58:58 2019 +0800

        修改诊断搜索参数

    commit 77ca8b29d1fc647e6765ebe0330b52ea88bd606f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 18:12:20 2019 +0800

        合并错误修改

    commit a20149638473c75479c56deb365db7c328a558cb
    Merge: cfc64ea 6b7dfbb
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 18:08:43 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        # Conflicts:
        #	src/store/async-actions/homePage.js

    commit a759daeed6f51e82341296b82790b76f02052f82
    Merge: 6b7dfbb 35a9c17
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 17:32:05 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit cfc64eaaaf0c98941c04be7b355aa646ecb3c560
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 17:27:09 2019 +0800

        标点加英问号

    commit 6b7dfbb33bd85d54dff60649f913b2fef6f8ce0c
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 17:24:55 2019 +0800

        bug提交

    commit 35a9c17b604893b2d97c45143128e5ea4d8d15bc
    Merge: 11d0086 a0beff1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 17:17:00 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

    commit 11d00865399c3ba8bf5afe096ca3f3856c86be36
    Merge: 4f214b2 422c5cf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 17:16:54 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

        # Conflicts:
        #	src/components/DiagResultSearch/index.jsx

    commit 4f214b2a23fd9bacb6671e191f7e42544c7b87af
    Merge: c721d35 9378eb8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 17:15:36 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit c721d35ada039c262724106b4b8d0342573e36ec
    Merge: b8f144b 0f0c391
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 17:15:32 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit 9378eb8bfca2571b7ed6e83560f2decaded45f2c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 16:55:33 2019 +0800

        其他史selecteds为空bug修改

    commit f6fec4a2b2f25e1b8d89b62601baa63a2cefe968
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 16:38:02 2019 +0800

        修改清空后第一次点击键盘不触发click事件bug

    commit c11b47d06e11c024a17f02b5648a800405d88ff5
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 10:28:17 2019 +0800

        其他史文本模式数据bug修改

    commit 422c5cfdfaa0312d65cce2c717de1f1b2f63755b
    Merge: b479e52 b8f144b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 10:25:45 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit b479e52191221be49d4417308014517a821d8d41
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 10:21:39 2019 +0800

        修改诊断搜索

    commit b8f144b7c2c1fb60d208525d29dc1a1a38280edb
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 09:44:49 2019 +0800

        去重标点添加

    commit 345ea481613f2fe5beb8aacdc117ce022a60f1b7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 09:23:31 2019 +0800

        修改常用药物慎用标识透明度

    commit 0f0c3911304b587351e1d53627a9f1a314f9173a
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 09:08:54 2019 +0800

        11

    commit 58d128cb772f05fbf90974b0187ce2fa91905f76
    Merge: 5ec2c5b 21e2bf6
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 20:28:55 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit 5ec2c5be9b99f40fd7322ea4299a8ef5ddbfbf5a
    Merge: e3965b6 f388f66
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 20:28:51 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit e3965b6f49b9325a9a6aa6f9e3382d8e6be8b6b9
    Merge: ba2209b b37ea33
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 20:28:18 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

    commit ba2209baa70ce98557956e4ee5e24659537b4e41
    Merge: c7033dc 2fc00bd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 20:22:41 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit 2fc00bd2a0c2c83d0b3a763147a5196f36ed2513
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 17:56:22 2019 +0800

        病例滚动条上面不遮挡导入按钮上移

    commit 21e2bf63e19461fc8956c991678d11ada4abad61
    Merge: 56412f4 c7033dc
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Feb 28 15:49:11 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 56412f467c018e2ce22415a54a36be230126b5fe
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Feb 28 15:47:21 2019 +0800

        注释查看药品说明书

    commit 7a306c9f203aa3e7c67a6c2138adbe2602b9aa56
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 15:44:55 2019 +0800

        修改其他史查体杂音类选中bug

    commit f388f660e2062b82ac39984f21bcd1603982f911
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 28 12:28:02 2019 +0800

        1

    commit c7033dc0fa9b576fd44ad580a70d9dc3c9abbc21
    Merge: 24781b3 9b8aba5
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 12:26:47 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit 24781b351a21c98c7f0185b808c6cb2c8459cab8
    Merge: dd471cd 686d0e6
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 12:26:41 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit dd471cd31cd4f5e8bee1cc4394afc2d1ec645d27
    Merge: fdfd012 beee05d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 12:26:32 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

    commit fdfd0120716eea088da637b233700b07e6865f53
    Merge: 47805f3 6c7eff1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 12:26:16 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit 6c7eff13a7a93e7e50d569a72155a280973c1053
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 28 09:59:02 2019 +0800

        excel导入日期时间戳格式转换

    commit 92eb95e4a13cc141cf115fd59ba96eb9c4ad81f8
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 28 09:35:49 2019 +0800

        化验清空只清空数据

    commit 9b8aba56d77ce741849edf60453f395ec7a17959
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 17:00:35 2019 +0800

        清空后其他史杂音类选中状态bug修改

    commit cca4e2b37197823231e6cbe1407b93ab2c1cb49e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 16:38:03 2019 +0800

        标点补充

    commit 686d0e6888cbe437c6126b079f546c5a7b811ae7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 27 16:34:13 2019 +0800

        点击开单项到医嘱

    commit 47805f396f0acda35a73a8fbe23a2b290af60a84
    Merge: dbfbe54 0ab03d2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 16:20:13 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit dbfbe549b65f8dea75579b10e02d7a4d022929a2
    Merge: ba95b15 24a72ee
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 16:20:08 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit ba95b154cd8f0acb6ac3cbdd0f56c2b5cd128a51
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 16:17:59 2019 +0800

        主诉合并错误修改

    commit 545d910e9331f21ab16be77ab7ac326ad3de580d
    Merge: a261f0c 48728c3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 16:15:51 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

        # Conflicts:
        #	src/components/MainSuit/index.jsx
        #	src/components/PreviewBody/index.jsx
        #	src/components/PrintPreview/index.jsx
        #	src/components/TreatDesc/DrugInfo/index.jsx
        #	src/store/actions/diagnosticList.js
        #	src/store/actions/otherHistory.js
        #	src/store/reducers/assistCheck.js
        #	src/store/reducers/otherHistory.js

    commit 6b6082ca9ad86cab359874b6089815719b51d7d4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 27 16:04:10 2019 +0800

        Revert "第一个诊断为复诊添加到诊断调用推送接口"

        This reverts commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d.

    commit a261f0c60ae06808381dd443b5d8cef42760d953
    Merge: f2cb210 7e81b63
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 15:58:46 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit 0ab03d2eba0865ebdda8c8b9eb84e5dea7f07b59
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 15:53:28 2019 +0800

        标点规则:中间连续标点保留第一个,开头去掉,结尾保留第一个,灰色不显示

    commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 27 15:40:32 2019 +0800

        第一个诊断为复诊添加到诊断调用推送接口

    commit cd02a522c6054deb9ade0fed202338dd1ce9021b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 15:26:16 2019 +0800

        输入再删除输入不搜索bug修改

    commit e62e0aa6083ed13edbbfc36124ff79363ddaba38
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 15:16:58 2019 +0800

        推送参数加主诉

    commit 134276afd973d5b5d8e07389cee27eb9391e9247
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 15:14:00 2019 +0800

        双击编辑状态关闭bug

    commit 769c60daabd81ef48f37f5227e9a55fb205ce5ee
    Author: Luolei <16657115156@163.com>
    Date:   Wed Feb 27 14:11:43 2019 +0800

        化验颜色不一致

    commit e3ad8a2d18a21cc770b9c303d92146bbe78e4d8c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 14:10:40 2019 +0800

        有选中无殊未灰bug修改

    commit 581c9dbc6f714c5e795a45102cb095cf84738522
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 27 14:04:07 2019 +0800

        杂音类单选bug修改

    commit 20a3edfe13f4c24c2748758f28bd488aa2ca6ea1
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 27 09:37:07 2019 +0800

        推荐检查项没内容时,开单按钮置灰

    commit 970c4d7db52af55f2e9d39ce3401289683a8f297
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 17:39:35 2019 +0800

        常用药物治疗添加类名置灰状态

    commit 7e81b634b0952dc237048ee99f41364e360cea84
    Author: Luolei <16657115156@163.com>
    Date:   Tue Feb 26 17:38:04 2019 +0800

        清除添加化验辅按钮浮动,打印医生名字位置,辅检标题小屏幕换行,模板接口进入页面没有调用问题

    commit f2cb21089d2c321a9cc6b5e666627c6a75e275db
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 26 17:25:29 2019 +0800

        数字键盘在组合中样式bug修改

    commit dd03327ec3396302fb66f3f60f7b24c0ff730e6c
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 16:53:48 2019 +0800

        点击开单聚焦到医嘱

    commit 179d7080d06e284ed973d59c5a76ed3dc6a26daf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 26 16:43:01 2019 +0800

        重复修改,回退

    commit 7beb5f11bab81ae4535eaf2e61136ab71d06e0aa
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 26 16:41:17 2019 +0800

        修改1024样式bug

    commit 7ad8183615802729dc3bbb6507c864a376e79bb6
    Merge: fca4a15 66e5e26
    Author: Luolei <16657115156@163.com>
    Date:   Tue Feb 26 16:07:59 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit fca4a15e3ab974f4c684496f43f76afa606a23bc
    Author: Luolei <16657115156@163.com>
    Date:   Tue Feb 26 16:06:12 2019 +0800

        回读div里的模拟placeholder清空,辅检出现两次,模板列表为空高度问题,火狐div清空还有个换行符去掉

    commit 66e5e26b6541d8923222f43852e56d91252a1c84
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 15:20:20 2019 +0800

        修改提示信息疾病说明菜单按钮光标形状

    commit ef15ad95e416155b911c474742cf526bbad9b041
    Merge: c051e01 8911ac8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 15:15:58 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit c051e0198219bc143a535bac13afa3dfcd90696c
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 15:14:39 2019 +0800

        药品说明书多个Id查询

    commit 8911ac8887de34bdef955a59462f260fc2c6962b
    Merge: d31a749 37f085a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 26 13:19:19 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit d31a749c48b6f6b1e6725575fd09f84f71ebfd9b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 26 13:19:06 2019 +0800

        搜索后加标点测回

    commit 30000aad93762077ef746ef683fd2a47c14b3853
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 26 11:22:11 2019 +0800

        其他史查体搜索的标签后加逗号

    commit 37f085a3d788fd707c76bca36d9cd714f0d03742
    Merge: 9112336 13dce94
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 11:17:23 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 9112336c27d8e2c1c143b75b8d8bf03f85b528f1
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 11:16:40 2019 +0800

        修改推送添加到诊断

    commit 13dce94fec6b39d0ddf4d0b0322bd84fadddc860
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 26 10:14:36 2019 +0800

        1024合并bug修改

    commit d1cb01259d8eab3933cd5166c6e39c6e9ec85516
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 10:12:56 2019 +0800

        同类药判断添加名称判断(有的同类药id为null)

    commit 536ab1e7dc67936fa9a586f8d55ad1c6d2ee60ba
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 09:41:41 2019 +0800

        修改药品说明书标题宽度

    commit c855d6416f7509f8ac7d6cb437790a11ad8d93d9
    Merge: feceb08 25a000f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 09:41:03 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 25a000f38ba5cdfb6fdb174c54341f9b058f2dd7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 09:40:26 2019 +0800

        Revert "修改药品说明书标题宽度"

        This reverts commit 576b54554b36e37ea0eb80e815ad381772b19cc5.

    commit 576b54554b36e37ea0eb80e815ad381772b19cc5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 09:38:52 2019 +0800

        修改药品说明书标题宽度

    commit 51a04b0d5f4f7124e9ae63240a32ed39b945f50b
    Merge: 644d713 0236d09
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 20:19:58 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit 644d7138c63af93af0e0286644367726d3da2ba0
    Merge: fa1380f c7236c8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 20:19:37 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit c7236c894382e11b0a4051f097643e857bf8f065
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 20:19:06 2019 +0800

        两边对齐火狐兼容

    commit fa1380f7bafb00efe15a3c1e487f162f2594a913
    Merge: e0bc863 96ced84
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 20:12:10 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit feceb083da47d70c70db09cc69ce6359e907ecb2
    Merge: 0236d09 e0bc863
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 25 20:10:43 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 0236d096817f2a3b0b04a67a3a44b3394014e267
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 25 20:01:41 2019 +0800

        药品禁用状态i图标不置灰

    commit 96ced84b7cd01fecf31a546ef58a2375bdfb2e37
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 20:00:10 2019 +0800

        说明书标题去空格

    commit a073a592d34258a699b123e4dec909cc0c4c73a8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 19:52:14 2019 +0800

        药品说明书排版

    commit e0bc863cca36de3ab8f8398352f72642780728d9
    Merge: 853319f 3fd13c2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 19:18:29 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit 3fd13c27d56310fc94d46f4e14f374a4de4dd8fa
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 19:18:02 2019 +0800

        数字框蓝色背景显示修改

    commit 853319fd0394943edd4945e24701e837f71cf1ac
    Merge: 6211dfd 07d7ab9
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 19:14:47 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit 07d7ab98655cbe928b1ac037bcd3889e59918dbb
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 19:14:09 2019 +0800

        数字键盘输入优化,bug修改

    commit 6211dfdbb509b4fa4b555899887b119e2333ef41
    Merge: ca9f83c 4c41407
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 18:36:49 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit ca9f83c2e9296cb408f91cd53cdf7eae22a39993
    Merge: 2897015 d8fc333
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 18:35:58 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        # Conflicts:
        #	src/utils/tools.js

    commit d8fc333a180f46d4b4fad31cd39e1362e3b1f206
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 25 18:17:49 2019 +0800

        火狐placeholder模拟

    commit 4c414071774ef37e1ac57739d72e4b35e8456a8d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 17:43:26 2019 +0800

        双击删除标签时删除后面的标点

    commit 2897015cc3d9fd4bc687c88de707a965d30f1f80
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 17:07:24 2019 +0800

        清空等条件判断

    commit 298014e4aefc250ce60555d316be355b469abad5
    Merge: d8b2728 54ed95b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 16:55:02 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

        # Conflicts:
        #	src/components/EMRContainer/index.less
        #	src/components/MainSuit/index.jsx
        #	src/components/Operation/index.jsx
        #	src/components/Operation/index.less

    commit d8b2728b1c4484c4327ea2fd1c5be54a87e802f5
    Merge: 827b9fe 6ff3c2f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 16:49:36 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit 6ff3c2f91b7a21f20081c4feb7cdbeb0fe94f61b
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 25 16:46:01 2019 +0800

        性别判断提示位置更改

    commit 827b9feb46ed370019aef767270dc98240a3a60d
    Merge: 3164918 f18aff0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 16:21:51 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit f18aff0c73b774231f1894446b877e67f7bf1bcf
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 25 16:15:52 2019 +0800

        其他史数据判断补充

    commit 3164918c9c57afd13cd89077ee356ed0541458f0
    Merge: a3c6497 0adcc7b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 15:42:23 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit 0adcc7bf5f39b10a3c2254cf1633d9ffd05e6073
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 25 15:40:14 2019 +0800

        数据判断有误

    commit a3c649762af9a4d8b66db4f678e62c708cca301b
    Merge: af35906 fa664ff
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 15:12:20 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

        # Conflicts:
        #	src/components/PushContainer/index.less

    commit af359067b1d3c08d5329f89ab0565d9eeaa8d49d
    Merge: 4785b29 c33cd61
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 15:06:45 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit c33cd619b6aca13ec5a5fadbe66bfe4b71f5ed81
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 14:51:06 2019 +0800

        双击编辑蓝色边框

    commit 4785b29ea0eb3c58b5f508ddf9e2a65fd5b96247
    Merge: 942579e e665919
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 13:41:56 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        # Conflicts:
        #	src/components/PreviewBody/index.less

    commit e6659190bc72350a2b1848d30d1098aa61f29849
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 25 13:37:52 2019 +0800

        模板部分滚动条显示出来

    commit 942579e843fef29e00e4764d4acac312a51496ec
    Merge: 2b7ce81 7a014d0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 13:35:56 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit 7a014d0d797d7e90f88a8d0f939c9845096b0411
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 13:35:18 2019 +0800

        有糖尿病bug修改

    commit a66f41acdd18acfa5dd6343178571743f1193226
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 13:32:44 2019 +0800

        其他史查体回读bug修改

    commit fa664ffcfa65bd1438999b0f9e79f99c80f7d531
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 25 11:30:05 2019 +0800

        删除诊断没有id时(添加名称判断)

    commit 86720794a59da37c8700f72e96740bcdf1906dc8
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 25 11:27:23 2019 +0800

        bug

    commit 3de2cf0c7fae1a0f1a994ee604f696d1f64c191e
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 25 11:09:44 2019 +0800

        1024下历史病例显示问题,清空主诉聚焦不在span

    commit 3f9e94c357e549318c1e79a04842a4c477d58974
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 25 10:03:29 2019 +0800

        pushContainer添加定位信息

    commit ec0a210bc616de96a0ed48df41300fcf95f6b1f3
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 25 10:02:01 2019 +0800

        预览宽度有误

    commit 2b7ce81ae4a157abf013f3b2f156b5d280f9403e
    Merge: 78fe295 de5b6f2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 25 09:52:32 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        # Conflicts:
        #	src/components/OtherHistory/index.jsx
        #	src/components/PreviewBody/index.jsx

    commit de5b6f2da0953c8bce31d166490d633f5c8d39c4
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 25 09:41:50 2019 +0800

        模板男女弹窗样式调整

    commit b2b959689c9b48b7e82b07766b7320952d649dbd
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 25 09:25:31 2019 +0800

        弹窗高度动态变化

    commit a2006f9c3a15df6225e8f5664e3f8330e9def1b7
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 25 09:22:25 2019 +0800

        弹窗宽度变化

    commit c6d4ec0ba654f8ed6d25c92f592c11fa8dfc0491
    Author: Luolei <16657115156@163.com>
    Date:   Sun Feb 24 16:51:25 2019 +0800

        bug

    commit 8bfb380ec8366c43dbd2d3a0078ccc9f13816d62
    Author: Luolei <16657115156@163.com>
    Date:   Sun Feb 24 11:10:18 2019 +0800

        连续两个句号处理

    commit fb65e9d6a4af98dcfafc8008963a59e9ef368dbb
    Author: Luolei <16657115156@163.com>
    Date:   Sun Feb 24 10:45:55 2019 +0800

        判断是否为空只判断文本不判断结构

    commit 1749ad61e39543920defb0e8be1d7ce61a03a7bb
    Author: Luolei <16657115156@163.com>
    Date:   Sun Feb 24 10:34:52 2019 +0800

        男女模板区分

    commit ef798e435a077495c1e84d3ca6893a7e78470119
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 22 17:28:30 2019 +0800

        模板性别

    commit 78fe295b3e69c7e7720b73ea67d3ffcc347f8554
    Merge: d5b22a1 3abdfe7
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 22 17:25:11 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit d5b22a1659068387f4fd1cd0a76d10da296f9511
    Merge: 52a81ab e073408
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 22 17:24:55 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

        # Conflicts:
        #	src/components/CheckBody/index.jsx
        #	src/components/MainSuit/index.jsx
        #	src/components/SpreadDrop/index.jsx

    commit 52a81abd66ca014880035ac04d229f22c54f9768
    Merge: 6b572c4 b133db8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 22 17:16:29 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit 3abdfe7396e7375d4d9a5fbafe0d11705494a101
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 22 16:35:13 2019 +0800

        其他史查体删到只剩一个文本标签时整行可落光标

    commit 65bf32b0cedb716f36c2d9bcba9cc79993a35cbc
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 22 16:24:27 2019 +0800

        删除多余代码

    commit 333360a86405a53dc566e1db80812c62e9ada9df
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 22 16:18:58 2019 +0800

        其他史查体提示优化,未获取到数据的情况优化

    commit b133db8b2ebe68183f0fca8a934b79e037ab2702
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 22 15:14:08 2019 +0800

        11

    commit 6b572c48f1c7b75e669aa328ab8d0c8271cd6a5f
    Merge: d7668cb 3131b2d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 22 15:12:02 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit 3131b2d66e39cb5df50b50a1512f3b3d7878cc83
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 22 10:56:58 2019 +0800

        主诉搜索框位置

    commit d7668cbc0bb1a57218083423f483367f6b6a1bbd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 22 10:13:02 2019 +0800

        杂音类变量串bug

    commit 5ef7897748fe81cfc3a1e9e30a9cad9eb8576fac
    Merge: 77daf9d 0de92f7
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 22 09:46:01 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        # Conflicts:
        #	src/components/NumberDrop/index.jsx

    commit 77daf9d197cf583de16612dbc20339502081545f
    Merge: bd64c01 5479437
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 22 09:28:15 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx
        #	src/components/NumberUnitDrop/index.jsx
        #	src/components/SpreadDrop/index.jsx

    commit bd64c01ccec1e2ee37ad148b84aed1d064ae85d3
    Merge: 7dfd62a b380174
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 22 09:20:27 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit b3801745fb6938eb8bd727cc5b32ed7086dffdbd
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 21 20:15:51 2019 +0800

        化验文字太长显示省略号

    commit 33b3ef1bccc633bd90a57721429bcba5a4a71803
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 21 20:04:17 2019 +0800

        ie滚动

    commit 0de92f7a8175bb40e3ab8dc32b38ccc2b62d5cb4
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 21 19:17:48 2019 +0800

        其他史查体提示bug修改

    commit ad5200304ddeec1bc1cead1e49f550319b1feff8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 21 19:04:44 2019 +0800

        单选双击编辑删光后失焦存值bug修改

    commit c1b9af5899a71f7398b2fd94a42770a59f77c7bc
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 21 18:59:06 2019 +0800

        数字带单位弹窗问题

    commit 7dfd62a2a867fd19a1ad80521c077eddd75bb484
    Merge: b901e9e a599e98
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 21 18:43:39 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit b901e9ed954d6502578623c1f28ea9edfe83dfbd
    Merge: b8b4174 a99d722
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 21 18:42:02 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx
        #	src/components/CheckBody/index.jsx
        #	src/containers/eleType.js

    commit a99d722b957624438e91fb405418e8637f83f52f
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 21 18:32:09 2019 +0800

        滚动条弹窗调整

    commit ad1e46d28fbb2eeb3d894e82af6402aa8f4bf83e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 21 16:07:32 2019 +0800

        数字组件事件优化

    commit a599e98ab469a915bf759d3c08693ee313c13fa6
    Merge: 0d67c39 b8b4174
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Feb 21 15:03:38 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 0d67c39cf1c0cb0949f3e98869b660c5de42ebd3
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Feb 21 15:00:24 2019 +0800

        修改治疗方案药物治疗类名字段

    commit 27aced28537943a5b75cdaec24ad1f65ccec9477
    Merge: bc555b0 b8b4174
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 21 13:40:18 2019 +0800

        Merge branch 'dev/new1' into dev/otherHis

    commit b8b4174d5b561c963a269b29d737eec0a58f6889
    Merge: 27d6b1a e11a555
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 21 13:19:59 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit 27d6b1aed64dbe80fe158dbe620f1c8f9ecda70f
    Merge: 5ae0fe1 1a7645e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 21 13:19:36 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx
        #	src/store/reducers/checkBody.js
        #	src/store/types/checkBody.js

    commit 5ae0fe1ebf36274d45e5a7d70709f655a54fa0be
    Merge: 6af13c9 bfad6c4
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 21 09:46:23 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit e11a555129229f1ddb189c1a912f1d781270eac9
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Feb 21 09:45:41 2019 +0800

        搜索结果去除诊断中已有诊断

    commit bc555b0a62f3d06017256e567738e1796f254a82
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 21 09:41:47 2019 +0800

        其他史删除不必要事件

    commit 8638209c04be43066a35ad6fab211e92bbd637b7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 20:03:29 2019 +0800

        删除console

    commit 08da5c25ae264534d19e3c4fa7c5e370b3e0d456
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 20:01:46 2019 +0800

        诊断搜索添加同义词

    commit 9f0f76b675ccb06b8cb0d3655680a238d7cc4ae3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 19:46:31 2019 +0800

        ie8子标签灰显bug

    commit 10ec058189f5bbee4d5dcb47a45001988ca3d870
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 19:28:05 2019 +0800

        修改版本号和免责声明字体颜色

    commit e627b67e63d6fa3c1d4faa9ab492c0bf4d8ee1c1
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 19:22:48 2019 +0800

        开单项没选择时,不跳到医嘱

    commit c60e17b33180d7485a46ca9e98c0ed16c7775f2a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 18:32:50 2019 +0800

        注释同类药物双击打开药品说明

    commit bfad6c404134c5268b07a2c79f1f8a386f952bc8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 18:20:17 2019 +0800

        诊断延迟搜索

    commit 69b02c93e3b2afb26f44733c2ef9558e2852047e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 17:04:52 2019 +0800

        查体既往史类事件处理添加

    commit bdc074220b4d662818d430e56e7f9796efd06537
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 16:58:12 2019 +0800

        其他史乙肝有高血压顺序勾选bug修改

    commit 48abc323e58cf8f400c0371b5cdff14fdf54b4d9
    Author: Luolei <16657115156@163.com>
    Date:   Wed Feb 20 16:57:11 2019 +0800

        nothing to do

    commit f6f6e023919d536dd60b746e6f3b0b3267c332c2
    Merge: 3b8fdf4 6af13c9
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 16:51:35 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 3b8fdf425f7cd93dbb736cfe8bcb90ac72b900bf
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 16:48:56 2019 +0800

        通过ID搜索药品说明书(添加数据时查看药品说明书用)

    commit 6af13c94c3cb901fbc0e49f77ecb45f1950b4fbc
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 16:26:45 2019 +0800

        翠加

    commit e1af9c88f74e6483b81850953f1af2051040e677
    Merge: 5ae9b8f 012bb7f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 16:21:57 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit 5ae9b8fae1e7d1f56f160b6f2d621b8d6e53658d
    Merge: 8decc9d 5b1feca
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 16:21:38 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

        # Conflicts:
        #	src/common/components/SearchOption/index.jsx
        #	src/common/js/func.js
        #	src/components/CheckBody/index.jsx
        #	src/containers/CurrentIll.js
        #	src/store/async-actions/homePage.js

    commit 8decc9d3e8255de2c81420a833e69582686aafdd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 16:19:15 2019 +0800

        罗磊修改

    commit 012bb7f0ea4d0ec66f313834b0e97beed46c028f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 16:17:54 2019 +0800

        药品说明图标增加鼠标进入状态

    commit c4ea61552060862a541493087ec096a413cbca2c
    Author: Luolei <16657115156@163.com>
    Date:   Wed Feb 20 16:12:30 2019 +0800

        高度计算有误

    commit 50769d9e8a9845954a58145e5b7041b131729b67
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 15:59:38 2019 +0800

        标点预览

    commit 4a8b8a17d9b784225eaa07d67925752339418ee1
    Author: Luolei <16657115156@163.com>
    Date:   Wed Feb 20 15:49:58 2019 +0800

        滚动条问题

    commit a4f1c2776effa4bfb1c9628d48cee2a755d8558b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 15:36:47 2019 +0800

        诊断搜索增加搜索值为空情况

    commit cd77c307ae34abe8cfb6fb53f235beb8f43d884d
    Merge: ac44ed4 f7ec699
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 15:28:05 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit cee1138681863aa93e2374d48707171b294c0032
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 15:24:41 2019 +0800

        预览行内样式部分修改到less中

    commit ac44ed44fed7b42457e2dfc60b9ab13c97e0ced5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 15:06:10 2019 +0800

        提示信息疾病详情页右侧菜单

    commit 816fa09299c0177beac8573e50be4c86495a37f2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 14:59:20 2019 +0800

        标点灰显bug修改,下拉对应标签高亮颜色修改

    commit 3330385dd3ea7b2b419f5dbb92f05f8a20bc3c39
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 14:09:59 2019 +0800

        标点符号跟前一个标签灰显黑显

    commit b77a4e183b8413cbac1b663233b3382c7641857d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 13:43:26 2019 +0800

        修改诊断搜索参数

    commit b1f56da5d60d2944c4bbc8a8ccc61548f08b55e1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 13:26:29 2019 +0800

        纯标点符号不搜索,查体获取数据bug修改

    commit d6849d30404fe7d3346909a7e10bc894d1f2ba33
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 11:39:43 2019 +0800

        只有标点符号时不搜索

    commit 4f7c951a117bec49fa853071847422a8dbf51e9a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 11:23:42 2019 +0800

        单选组件双击编辑删完后失焦显示重复值bug修改

    commit d771a09a5fc4e3e7af92e3ff3c85ed44975b2648
    Merge: 28cd3ba f7ec699
    Author: Luolei <16657115156@163.com>
    Date:   Wed Feb 20 11:13:20 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit 28cd3bac18b0daa796f8a1a9292db3a24cb8e862
    Author: Luolei <16657115156@163.com>
    Date:   Wed Feb 20 10:41:36 2019 +0800

        主诉数组多个空格元素处理

    commit 790d34dc38e886c3df1e67603922838f904e4ea7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 09:48:25 2019 +0800

        药品说明书鼠标指向方式

    commit f7ec699eb2b493c4bbbd0ee60194b639a6c8b8e8
    Merge: 6c245fb 909ab25
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 09:43:41 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit 6c245fb0901d2234a0aef7568039651dd4cdf91e
    Merge: 96cc574 e36be2b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 09:43:15 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

        # Conflicts:
        #	src/common/components/SearchOption/index.jsx
        #	src/common/js/func.js
        #	src/common/less/variables.less
        #	src/components/Operation/index.jsx
        #	src/components/PreviewBody/index.jsx
        #	src/components/PushContainer/index.jsx
        #	src/components/SpreadDrop/index.jsx
        #	src/containers/CurrentIll.js
        #	src/store/async-actions/patInfo.js
        #	src/store/reducers/assistCheck.js

    commit 197b0e5b453fa4446f71b728768baa67e5ab4700
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 20 09:42:48 2019 +0800

        修改版本信息字体大小

    commit 96cc574ab24f3da14e1f89610e6c5a1e451fa051
    Merge: 5a2d97b fe9e87d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 20 09:35:47 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        # Conflicts:
        #	src/common/less/variables.less
        #	src/components/PushContainer/index.jsx
        #	src/utils/tools.js

    commit fe9e87d5e0735c356cc4041292dad4ce9cce18dc
    Author: Luolei <16657115156@163.com>
    Date:   Tue Feb 19 17:30:38 2019 +0800

        搜索为空清除列表数据

    commit 909ab253717bafa4c9ffb3164441d8554e17ed03
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 19 17:27:10 2019 +0800

        输入框添加行高

    commit c870ce40e66ec3471bd8ab660346d41ca6374891
    Merge: 82c0130 cb47bc5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 19 17:12:48 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 82c013012b1ec9adad9ea974c609c785bae349b2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 19 17:12:26 2019 +0800

        删除console

    commit 656a2e69d55a87696a52780074cdb97ebf72c3e5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 19 17:03:22 2019 +0800

        提示信息详情页弹窗显示

    commit 94a46327141d7b22d245afbfef4908fca8b852df
    Author: Luolei <16657115156@163.com>
    Date:   Tue Feb 19 15:50:52 2019 +0800

        化验没有参考值正常显示

    commit 5a2d97b0f644ef6172cce575e520ca3000cef9b0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 19 15:28:39 2019 +0800

        ie8点开下拉未选值存值bug修改

    commit 23f6f91a57f4c57826e5cd4adc6aea676a21751e
    Author: Luolei <16657115156@163.com>
    Date:   Tue Feb 19 15:19:16 2019 +0800

        1.ie8自动转换中文为unicode导致判断有误
        2.阴影改为边框
        3.主诉现病史删除得到数组里有空元素处理

    commit 5e1184e69747c823a1ce3bba657332f1443f802b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 19 15:15:35 2019 +0800

        回读无查体点击唤出模板

    commit 48a9a00b3b5b31e499d32f8f6edbbda57390e721
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 19 14:30:22 2019 +0800

        切换模式其他史数据bug

    commit 4717362f96dd641518ca546c2b270a2c3f6d5002
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 19 11:38:42 2019 +0800

        血压类文本子标签存值

    commit 08f9160a8e26952c695d9563ece0cef09d7e6164
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 19 10:59:43 2019 +0800

        清除移除患者信息缓存

    commit cb47bc5b79d7f6e319a1b837d27012841925c678
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 18 17:16:42 2019 +0800

        翠翠分支未合单独添加

    commit 2a770d6266f8c7f5f0bd892befa6fa69166487bd
    Merge: 3e68866 86e1d1d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 18 17:14:17 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit 3e688668bdaf2d376901cfa70a90a3587ad7ff69
    Merge: dc08557 4f90da8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 18 17:14:11 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit dc0855703def7c3a0c56c74d0b033b42657cb62e
    Merge: 13db5c1 db268fc
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 18 17:14:02 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit 4f90da88492079a14a3c167d364cc6b0160c668c
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 18 16:58:38 2019 +0800

        弹窗关闭时机

    commit 13db5c1cccec8c7f3ac5cb72d19aaf05a5bb63e4
    Merge: 58cffc8 6e906e0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 18 16:56:59 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit 6e906e06753a119829e67db34a0e32e1c2d1a4db
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 18 16:23:12 2019 +0800

        查体选中杂音血压选中状态bug修改

    commit 1e57bc5dc0b63eaaa040d59d53c9f1a9409d2030
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 18 15:42:03 2019 +0800

        单选组件下拉项可和名称相同

    commit 9318dc730440ce833cd1317aed52699572208224
    Merge: 58cffc8 db268fc
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 18 14:21:22 2019 +0800

        Merge branch 'dev/byll' into dev/new1

    commit db268fc6f4c11065e36e4405170bd08e667ce6fa
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 18 14:19:41 2019 +0800

        ie8搜索单个文字删除报错问题

    commit 86e1d1df0baee680a7c5bf99e8d6cbae4284c83c
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 18 14:15:14 2019 +0800

        治疗方案药品说明显示方式

    commit 1391edf5cda27a44817030cb9fef6486da15b51e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 18 14:14:41 2019 +0800

        下拉框打开时标签边框蓝色

    commit 758555c01c184adde48fb869909a1b9fdb77f4b1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 18 13:50:39 2019 +0800

        箭头函数传值性能问题修改

    commit 8e25532ad88b1ca014acaaffb61155f3f62e8c64
    Merge: 7a78823 58cffc8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 18 09:48:15 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 58cffc89d51661f2edbd21e1424fdd29afd590f9
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 18:21:01 2019 +0800

        上次提交回退

    commit 4ca59db29b1a256c9b3015646301c0105cead455
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 18:13:57 2019 +0800

        数字组件ie8输入报错参数无效bug修改

    commit 5afd59399265b3a516e35317687946d2df551c9b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 16:59:35 2019 +0800

        删除多余代码

    commit d56b647e2f32fc9e5a50e58376d1677076b9c5c0
    Merge: deb3340 e5ee60b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 16:57:54 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

        # Conflicts:
        #	src/containers/CurrentIll.js
        #	src/store/actions/mainSuit.js

    commit 6c4e29739d3dbe45b1843f5a5fb2c054784d0739
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 15 16:55:03 2019 +0800

        ie8右浮动不生效

    commit deb33405ce270e3b1495e51fd537fa6d56f1a615
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 16:54:34 2019 +0800

        免责声明弹窗层级bug修改

    commit 15718f043d724dd440aab0d23c6eaf3cf54d2059
    Merge: c2f5a1e 0ca5c1f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 16:34:51 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit c2f5a1e29bd29942c2faa59fd4fd645bbe50a814
    Merge: a1c28c3 19f31f4
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 16:17:11 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        # Conflicts:
        #	src/components/AddAssistCheck/Textarea/index.jsx

    commit 0ca5c1f1aa7ce0b7c558cd53b0c4fc19ad096f90
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 15 16:13:59 2019 +0800

        11

    commit a1c28c3d77f4d5d27b7ec1ef0ceb1aaf8a6afdb4
    Merge: 8bc39fc 3dbeabd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 16:13:41 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit 3dbeabd15713010eb953dcee9c619e0cb4e89baa
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 16:10:56 2019 +0800

        弹窗层级修改

    commit b34feffbe308202a21d56c822371d5900e4d784c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 15:53:02 2019 +0800

        其他史无主诉第一次提示后不再提示bug修改

    commit 541a45685981ece9caf11ef7ee13d871e1aaaf27
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 15:47:44 2019 +0800

        搜索框下拉位置bug修改,杂音文字为多行时下拉遮挡文字bug修改

    commit b9bb9cba1fe356d94bdc64a1caa4b60460bdef68
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 15 15:36:55 2019 +0800

        复制内容样式乱掉问题解决

    commit 9641e6a1c9fd1fefa66a4324401cf38d60e29cf3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 14:37:35 2019 +0800

        无殊选中状态遗留bug修改

    commit 641c5762b7f7f98d532eb23fc97f881d33575222
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 15 14:18:44 2019 +0800

        打印相关样式修改ie待测

    commit e93c7c1557bee766ff94dfa4952cdf2f69c4e926
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 13:51:30 2019 +0800

        用户信息banner不被下拉框遮挡,杂音选中样式修改

    commit 64d1cffdb7e562263084ba5827df988a099ec7b7
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 13:26:25 2019 +0800

        杂音类型下拉样式优化

    commit 08ab0d25e5c54f3535156e248de5063ff4454a2f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 11:31:31 2019 +0800

        其他史查体tagType4类型搜索选中展开

    commit a96e98a90f83c7d0e625f973b79cb65d33792623
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 15 10:48:50 2019 +0800

        获取模板接口放在获取病人信息回调中,确保参数不为空

    commit 19f31f4d19c841c9a0a86be849d749815e27a1c1
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 15 09:43:48 2019 +0800

        修改标题点击enter问题

    commit 8bc39fc836e6f24fc599d8d679164f7412ac71f3
    Merge: 993eaf0 6fe34e5
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 14 17:56:44 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

        # Conflicts:
        #	src/components/AddAssistCheck/index.jsx
        #	src/components/Inspect/index.less
        #	src/components/NumberDrop/index.jsx
        #	src/components/Operation/index.jsx
        #	src/store/actions/checkBody.js
        #	src/store/actions/mainSuit.js
        #	src/store/reducers/assistCheck.js

    commit 993eaf02f2d5d2b0244587ed7096d1fcf9659465
    Merge: 11260ee 6ca010f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 14 17:52:56 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit 6ca010f83a2b882163bfaf3ee7f125f45e8d5ce3
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 14 17:36:47 2019 +0800

        字体不一样,button问题

    commit 8433d68d9027b2c31c5db2da33182c1507f08f9b
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 14 17:12:29 2019 +0800

        更改中文冒号,修改辅检div样式,添加搜索ie8兼

    commit 11260eeb9c9958368e933981df83e4e097a04c9d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 14 17:08:07 2019 +0800

        杂音类型双击编辑blur后重复输入值bug修改

    commit 2911db7154036da7df72eb04b6e2a35b32c71106
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 14 16:48:08 2019 +0800

        双击编辑前后缀bug修改

    commit 6eef6a051d230f9f52a1df2ae6b5e3044c7b3505
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 14 16:33:58 2019 +0800

        主诉-其他史组件双击编辑前后缀存值

    commit 00f2e00fb09170526cd4101b320ece3b694e28f3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 14 16:07:49 2019 +0800

        查体数字组件双击编辑前后缀存值,血压类型标签双击编辑时不显示下拉框

    commit 8019239ea85bf8e66de7adff69d1fcc9b94eb226
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 14 13:57:24 2019 +0800

        修改ie8多[]bug

    commit 70689ffbb3b43af0bcd21e0c6898855ede313faa
    Merge: aca9d8f 3fe1212
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 14 11:36:41 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit aca9d8f6b118a3653050c6f59cbed645ac1b824d
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 14 11:19:43 2019 +0800

        判断模板保存前后是否相同

    commit a643a04284503f3491206a6da28f02e3b239bdfd
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 14 11:03:33 2019 +0800

        打印保存判断问题

    commit 665613f2a02a496e485917ee653ba58e4744fa7d
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 14 09:38:25 2019 +0800

        写死参数更改

    commit 3fe1212b9a37b328037ea87e8ed83b83bc71a5a6
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 12 17:56:33 2019 +0800

        其他史提示无主诉时可输入bug修改

    commit d895d0391f5389858501b5be2d98c93516740f1a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 12 17:29:35 2019 +0800

        查体框可编辑状态删除

    commit 0ea49aca9cfc5399c0d074c81fe7a330a76ed40b
    Merge: 2799250 2facfcb
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 12 17:19:21 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        # Conflicts:
        #	src/containers/eleType.js
        #	src/store/async-actions/treat.js

    commit 2facfcb8073c095fa0b6ae3eb54566fb072d7c85
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 12 17:15:41 2019 +0800

        查体获取数据失败时可输入bug修改

    commit 141ab5430c47c52bcff13dc7d34cc5a7fa134d4c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 12 15:12:53 2019 +0800

        其他史查体搜索结果放前后bug修改

    commit 9572b216a7c48e9947d3ce028b10f5849cb72102
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 12 14:34:34 2019 +0800

        其他史搜索选中位置bug修改

    commit ee5b7c3eb6a0e6328e2ee500deca54b756d69848
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 12 13:48:27 2019 +0800

        搜索bug修改

    commit c7e0483300e2188b162ce41063d38a50706979aa
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 1 16:34:50 2019 +0800

        11

    commit 7a7882300853f5a273686f709ab0462ad706a8f0
    Merge: 420bcf7 2799250
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Feb 1 15:28:00 2019 +0800

        Merge branch 'dev/new1' into dev/zhangxc1

    commit 27992500bd6cd1d92f6cc4411a8436f36ef565d0
    Merge: 9573ac3 945c448
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 1 14:57:17 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

    commit 9573ac3a696fa8e206e5a46e588dc4daad049381
    Merge: c90d43b fbbb8fb
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 1 14:57:10 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit c90d43b677ba6dbaad86bd1fc8d4731eb46165b5
    Merge: d2c86ef 81e413f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 1 14:56:09 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        # Conflicts:
        #	src/containers/OtherHistory.js

    commit 81e413f1f4296fc8bcc22485e5779ddb776478f1
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 1 14:53:45 2019 +0800

        之前修改的bug找回

    commit 420bcf750b1e316f23b750de4985441221ef0a5c
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Feb 1 14:53:11 2019 +0800

        修改同类药物样式

    commit 3bf089d9605e75bf7511e9d42fa6b03c9c6066b1
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 1 14:44:35 2019 +0800

        改为全局弹窗显示

    commit fbbb8fbbb040b404ee7307b1b95505cea783626a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Feb 1 14:38:23 2019 +0800

        修改添加诊断推送

    commit e1240a8e9f409aa5e4382e2bc0ef63ed6ff0a1dd
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 1 14:20:22 2019 +0800

        弹窗高度动态设置

    commit d2c86efb89cba523db9c587e7d8435a4b2be8531
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 1 11:16:53 2019 +0800

        无选中项体温输入bug修改

    commit aa6d15a7c141f10f275f1fc470d0eba476ffc4b2
    Merge: 9f91346 1fccd43
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 1 10:57:06 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit 9f91346e73a2a64ce463baf32723a8c9e3b9cc05
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 1 10:55:41 2019 +0800

        bug修改

    commit 1fccd439ee53729685732eeb6fbbfe1be0eda80d
    Merge: 986a3cf 2e25c1b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 1 09:58:11 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    commit 3385c2c2a41d0b223136f5f176487cce09e1c082
    Merge: b876b6b 2e25c1b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 1 09:51:36 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/otherHis

        # Conflicts:
        #	src/store/async-actions/treat.js

    commit e697f350f7724505282d06dfa0dc2ae001ea9c09
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Feb 1 09:46:57 2019 +0800

         删除console

    commit 2e25c1bb7076358b6e4063ced5731c3f456eb704
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Feb 1 09:40:43 2019 +0800

        诊断第一个为复诊添加到主诉

    commit 986a3cf5976bfec9bce6afb554bab1f4a1a2a49d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 17:33:59 2019 +0800

        合并

    commit c900ae632d99d0c0fb2e2e5f9788707ada02745a
    Merge: 31ef38b b7bfe2b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 17:18:38 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

        # Conflicts:
        #	src/components/AddInspect/index.jsx
        #	src/components/CopyRight/index.less
        #	src/components/DiagnosticList/index.jsx
        #	src/components/Inspect/index.jsx
        #	src/components/NumberUnitDrop/index.jsx
        #	src/components/Operation/index.jsx
        #	src/components/PushContainer/index.jsx
        #	src/components/Treat/index.jsx
        #	src/components/Treat/index.less
        #	src/containers/NumberUnitDrop.js
        #	src/store/actions/otherHistory.js
        #	src/store/async-actions/diagnosticList.js
        #	src/store/async-actions/treat.js
        #	src/utils/tools.js

    commit 31ef38b3d5b46612b64866687214c2b9d1651b03
    Merge: 44fbf2b d6751d9
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 17:05:17 2019 +0800

        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx
        #	src/components/AddInspect/index.jsx
        #	src/components/CopyRight/index.less
        #	src/components/DiagnosticList/index.jsx
        #	src/components/Inspect/index.jsx
        #	src/components/NumberUnitDrop/index.jsx
        #	src/components/Operation/index.jsx
        #	src/components/PushContainer/index.jsx
        #	src/components/PushItems/index.less
        #	src/components/SpreadDrop/index.jsx
        #	src/store/actions/otherHistory.js
        #	src/store/async-actions/treat.js
        #	src/utils/tools.js

    commit 44fbf2b8d8f90640a9af8abe4da55c2af7efa319
    Merge: db4e755 935c0cf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 15:52:43 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        # Conflicts:
        #	src/components/PreviewBody/index.jsx

    commit db4e7559fb2bc15434058503ca8d1a1e3ffe8ad6
    Merge: edb84b0 9483642
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 15:44:26 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

        # Conflicts:
        #	src/components/TreatDesc/DrugInfo/index.less
        #	src/store/async-actions/treat.js
        #	src/store/reducers/treat.js

    commit edb84b07adad34cdd5c94a592e543127d20eaec1
    Merge: b876b6b 6b71cd5
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 15:35:50 2019 +0800

        更新

    commit b876b6b8dc6afe12ae2a90c990d147e32221d02c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 14:38:05 2019 +0800

        其他史有伴无排序

    commit f8ab9c103e8266a6ab44466a7fadbc1f0a91ceca
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 14:06:33 2019 +0800

        查体搜索自由文本位置bug修改

    commit e45296e22263659c86f60d031bc5246c7f1be726
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 13:51:40 2019 +0800

        复诊主诉文本模式bug

    commit f5cae58692247cad7c0b3ff8966a2f7d5213069c
    Merge: 960317d d3e160a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 13:39:27 2019 +0800

        Merge branch 'dev/new1' into dev/otherHis

        # Conflicts:
        #	src/components/SpreadDrop/index.jsx

    commit 960317de925978075041b722cd3500488ce924fd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 13:36:13 2019 +0800

        双击隐藏下拉

    commit 06571b04a337a3805d723e22e964c5ba683293f5
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 31 10:28:18 2019 +0800

        主诉saveText无值则判断为空,查体其他史聚焦提示

    commit 94836425d1dc9b9cf5cc1f2ce6f3bdc3706fd578
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 19:50:58 2019 +0800

        修改版本信息样式

    commit e0092d7003c2bcfecc38a77350d29ddc1a92dbf2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 19:40:32 2019 +0800

        关闭药品说明书时清除内容

    commit a921420ddd0b8c4c8101b1d5bb1d7fec8e422341
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 19:01:15 2019 +0800

        修改治疗方案和药品说明书样式

    commit 935c0cf687389a50aeef502b97f07685e675bd1d
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 17:16:52 2019 +0800

        滚动兼容

    commit 6b71cd51bbafd8c4283b1c16fae3a538a88f5651
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 30 16:54:56 2019 +0800

        现病史病程变化

    commit 91c3713c62e8eb4b9437b00d754133e87561d8cc
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 30 16:36:48 2019 +0800

        注释scrollTo

    commit 2123a1e9839af1052e1405d6a005ddf521041c9d
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 30 16:10:44 2019 +0800

        Squashed commit of the following:

        commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 30 16:00:51 2019 +0800

            打印医生签名自动获取

        commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 30 14:09:41 2019 +0800

            样式调整

        commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 30 14:02:27 2019 +0800

            化验填写单清空按钮,弹窗还在

        commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 30 13:46:36 2019 +0800

            模板列表获取时机

        commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 30 13:34:03 2019 +0800

            模板名称重复弹窗不关闭

        commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 30 10:46:13 2019 +0800

            模板保存跟之前所有保存的模板作对比

        commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 29 17:35:01 2019 +0800

            底部几个按钮换行设置最小宽度

        commit 7400613a1eb642e1d01004c7818883fd73c2350c
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 29 17:28:45 2019 +0800

            历史病例时间和按钮不能共存

        commit eda3f4b08a3460360541cd2af1c2ca071681c595
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 29 17:12:47 2019 +0800

            bug修改

        commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 29 15:54:49 2019 +0800

            还是符号处理...

        commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 29 14:17:40 2019 +0800

            顿号去重

        commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
        Merge: 4095b3f b09559b
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 29 13:59:54 2019 +0800

            Merge branch 'dev/new1' into dev/byll

        commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 29 13:55:47 2019 +0800

            样式宽度更改和逗号处理

        commit 79e0195a9b13069db729afe732bc5b466d43a37f
        Author: Luolei <16657115156@163.com>
        Date:   Fri Jan 25 14:06:09 2019 +0800

            date修改

        # Conflicts:
        #	src/utils/tools.js

    commit 6df92ea9ddd29c14979874f2f0e7eac54d032eaf
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 30 16:07:27 2019 +0800

        Squashed commit of the following:

        commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Wed Jan 30 15:20:06 2019 +0800

            治疗方案样式

        commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Wed Jan 30 15:18:20 2019 +0800

            修改治疗方案样式

        commit 859a7364a96569f6aa92360efbce5a19b40681cb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Wed Jan 30 14:32:44 2019 +0800

            修改治疗方案小标题样式

        commit 99789b23f06c18e5b588552066faf7f2ccacf198
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Wed Jan 30 14:07:48 2019 +0800

            修改治疗方案同类药物

        commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Wed Jan 30 14:00:40 2019 +0800

            修改弹窗IE8不居中

        commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 20:30:39 2019 +0800

            治疗方案高度自适应

        commit c000d83fb6ac5f265951c0e1377b627d24d2da10
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 17:27:30 2019 +0800

            修改治疗方案边框

        commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 15:58:28 2019 +0800

            导入化验结果,第一次添加诊断为主诉时不往主诉添加字符串

        commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 15:56:03 2019 +0800

            治疗方案标题添加疾病名称

        commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 15:22:37 2019 +0800

            修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

        commit 799eef5c34a21f9d90bc82a40240838cf10ba601
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 14:41:20 2019 +0800

            ie8治疗方案遮罩

        commit fee35d5473b69aafb5335759006a93fea8d14145
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 14:05:16 2019 +0800

            治疗方案遮罩IE8

        commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 14:04:58 2019 +0800

            修改右侧推送字体大小

        commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 13:26:56 2019 +0800

            修改化验项开单逗号问题

        commit 29b2499b796085a682a936d82c97decc35edf891
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Fri Jan 25 13:50:07 2019 +0800

            修改版本信息和免责声明位置

        # Conflicts:
        #	src/components/Treat/index.jsx
        #	src/components/Treat/index.less
        #	src/store/async-actions/diagnosticList.js
        #	src/store/async-actions/treat.js

    commit 20f96c311119b635dad33f6c9222d94d8563bbfe
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 30 16:02:31 2019 +0800

        Squashed commit of the following:

        commit 27178b569e9575d450bbf1ce329e069d4c4b4b8c
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 30 15:57:20 2019 +0800

            ie8现病史添加症状报错的问题&查体血压选中不变黑的问题

        commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 18:17:15 2019 +0800

            查体模板添加逗号,主诉两个时间处理
            Squashed commit of the following:

            commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:51:09 2019 +0800

                Squashed commit of the following:

                commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 14:17:40 2019 +0800

                    顿号去重

                commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                Merge: 4095b3f b09559b
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:59:54 2019 +0800

                    Merge branch 'dev/new1' into dev/byll

                commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:55:47 2019 +0800

                    样式宽度更改和逗号处理

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit fea9a721ccb5afb9f1873c2111e3722d7330d394
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:50:07 2019 +0800

                Squashed commit of the following:

                commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:22:37 2019 +0800

                    修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:41:20 2019 +0800

                    ie8治疗方案遮罩

                commit fee35d5473b69aafb5335759006a93fea8d14145
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:05:16 2019 +0800

                    治疗方案遮罩IE8

                commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:04:58 2019 +0800

                    修改右侧推送字体大小

                commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 13:26:56 2019 +0800

                    修改化验项开单逗号问题

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

                # Conflicts:
                #	src/components/PushItems/index.jsx

            commit 2c70e41e7a5254838436b499b1ad787f523585f8
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:42:54 2019 +0800

                Squashed commit of the following:

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/NumberDrop/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/store/actions/mainSuit.js

            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 11:44:56 2019 +0800

                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:41:03 2019 +0800

                Squashed commit of the following:

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:38:40 2019 +0800

                Squashed commit of the following:

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

            commit e36f2f1b811d6978117161f50b16dd5bae298547
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:33:30 2019 +0800

                Squashed commit of the following:

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

            # Conflicts:
            #	src/components/PushItems/index.jsx
            #	src/utils/tools.js

        commit 519f23c91954f87e836cbd400b158f774c498ba6
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:35:59 2019 +0800

            文本删除又出现的问题
            Squashed commit of the following:

            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 11:44:56 2019 +0800

                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:41:03 2019 +0800

                Squashed commit of the following:

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:38:40 2019 +0800

                Squashed commit of the following:

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

            commit e36f2f1b811d6978117161f50b16dd5bae298547
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:33:30 2019 +0800

                Squashed commit of the following:

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

            # Conflicts:
            #	src/components/AddInspect/index.jsx
            #	src/components/Inspect/index.jsx
            #	src/components/PushItems/index.less
            #	src/store/actions/checkBody.js
            #	src/store/actions/currentIll.js
            #	src/store/actions/mainSuit.js
            #	src/store/actions/otherHistory.js

        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 15:59:14 2019 +0800

            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 14:21:41 2019 +0800

            Squashed commit of the following:

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 13:13:11 2019 +0800

            单选和多选编辑失焦时调用推送接口

        # Conflicts:
        #	src/containers/NumberUnitDrop.js
        #	src/store/actions/checkBody.js

    commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 16:00:51 2019 +0800

        打印医生签名自动获取

    commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 15:20:06 2019 +0800

        治疗方案样式

    commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 15:18:20 2019 +0800

        修改治疗方案样式

    commit 859a7364a96569f6aa92360efbce5a19b40681cb
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 14:32:44 2019 +0800

        修改治疗方案小标题样式

    commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 14:09:41 2019 +0800

        样式调整

    commit 99789b23f06c18e5b588552066faf7f2ccacf198
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 14:07:48 2019 +0800

        修改治疗方案同类药物

    commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 14:02:27 2019 +0800

        化验填写单清空按钮,弹窗还在

    commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 14:00:40 2019 +0800

        修改弹窗IE8不居中

    commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 13:46:36 2019 +0800

        模板列表获取时机

    commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 13:34:03 2019 +0800

        模板名称重复弹窗不关闭

    commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 10:46:13 2019 +0800

        模板保存跟之前所有保存的模板作对比

    commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 20:30:39 2019 +0800

        治疗方案高度自适应

    commit 3e1c705ef6c2b2d0944ced37b8fa3f7c01307e25
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 18:20:27 2019 +0800

        Squashed commit of the following:

        commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 18:17:15 2019 +0800

            查体模板添加逗号,主诉两个时间处理
            Squashed commit of the following:

            commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:51:09 2019 +0800

                Squashed commit of the following:

                commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 14:17:40 2019 +0800

                    顿号去重

                commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
                Merge: 4095b3f b09559b
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:59:54 2019 +0800

                    Merge branch 'dev/new1' into dev/byll

                commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 29 13:55:47 2019 +0800

                    样式宽度更改和逗号处理

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit fea9a721ccb5afb9f1873c2111e3722d7330d394
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:50:07 2019 +0800

                Squashed commit of the following:

                commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 15:22:37 2019 +0800

                    修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

                commit 799eef5c34a21f9d90bc82a40240838cf10ba601
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:41:20 2019 +0800

                    ie8治疗方案遮罩

                commit fee35d5473b69aafb5335759006a93fea8d14145
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:05:16 2019 +0800

                    治疗方案遮罩IE8

                commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 14:04:58 2019 +0800

                    修改右侧推送字体大小

                commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 29 13:26:56 2019 +0800

                    修改化验项开单逗号问题

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

                # Conflicts:
                #	src/components/PushItems/index.jsx

            commit 2c70e41e7a5254838436b499b1ad787f523585f8
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:42:54 2019 +0800

                Squashed commit of the following:

                commit 519f23c91954f87e836cbd400b158f774c498ba6
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 15:35:59 2019 +0800

                    文本删除又出现的问题
                    Squashed commit of the following:

                    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Tue Jan 29 11:44:56 2019 +0800

                        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

                    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:41:03 2019 +0800

                        Squashed commit of the following:

                        commit 79e0195a9b13069db729afe732bc5b466d43a37f
                        Author: Luolei <16657115156@163.com>
                        Date:   Fri Jan 25 14:06:09 2019 +0800

                            date修改

                    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:38:40 2019 +0800

                        Squashed commit of the following:

                        commit 29b2499b796085a682a936d82c97decc35edf891
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Fri Jan 25 13:50:07 2019 +0800

                            修改版本信息和免责声明位置

                    commit e36f2f1b811d6978117161f50b16dd5bae298547
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Mon Jan 28 10:33:30 2019 +0800

                        Squashed commit of the following:

                        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 15:59:14 2019 +0800

                            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 14:21:41 2019 +0800

                            Squashed commit of the following:

                            commit d3e160a516240b77576567b993223816a68231a6
                            Merge: 79e63ed c7e9e73
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:48 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:46:16 2019 +0800

                                化验辅捡ie8搜索卡死修改

                            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 13:12:43 2019 +0800

                                默认host地址删除

                            commit e01035349f92405572238a0a97d80bb557dda802
                            Merge: 8a8015d caad36f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 11:45:20 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 10:59:52 2019 +0800

                                修改样式

                            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:46:01 2019 +0800

                                合并报错修改

                            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                            Merge: bbe85ff 58e0fdd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Fri Jan 25 09:42:51 2019 +0800

                                Merge remote-tracking branch 'origin/IE_test' into dev/new1

                            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                            Merge: b86268a 3bfa819
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:30:05 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/containers/SpreadDrop.js

                            commit b86268a57afae26c7972b4b2362ae656a6784a8d
                            Merge: 79c59d3 105488f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:25:44 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                                # Conflicts:
                                #	src/store/async-actions/treat.js

                            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                            Merge: db90e04 de190a5
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 20:24:40 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 20:18:42 2019 +0800

                                中英文逗号

                            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 18:31:55 2019 +0800

                                去掉英文逗号

                            commit 105488feef9e89309ecc23f2c9bce944da3490fb
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 17:22:34 2019 +0800

                                修改治疗方案

                            commit db90e04f23baf95466e34498ca06101f49a7ac7e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 16:49:10 2019 +0800

                                下拉项间距调整,ie8事件兼容

                            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:09:49 2019 +0800

                                药品说明书样式

                            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:08:17 2019 +0800

                                修改药品说明书

                            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:06:17 2019 +0800

                                修改开单样式

                            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 14:02:30 2019 +0800

                                修改获取患者信息路径

                            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:43:38 2019 +0800

                                添加诊断判断有没有治疗方案

                            commit f617e5c267246786e7a6801cc87811f0d2527235
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 13:39:13 2019 +0800

                                merge from 'dev/zxc'

                            commit 87e941c29ed951540497c18c0a493c55b222ce00
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 10:33:44 2019 +0800

                                提示语

                            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                            Merge: d3ade00 95e9a94
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:09:57 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/components/DiagnosticList/index.jsx
                                #	src/components/Operation/index.jsx
                                #	src/containers/SpreadDrop.js
                                #	src/store/actions/otherHistory.js
                                #	src/store/async-actions/treat.js
                                #	src/store/types/checkBody.js

                            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                            Merge: 2fd497e 2458ea1
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:05:17 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 10:03:28 2019 +0800

                                提示语消失默认时间改为2秒

                            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 10:02:00 2019 +0800

                                治疗方案置灰

                            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:59:16 2019 +0800

                                治疗方案

                            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                            Merge: 62bd7fb 38f9720
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:47:47 2019 +0800

                                Merge branch 'dev/new' into dev/zhangxc

                            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:46:32 2019 +0800

                                Revert "Revert "修改药品说明样式""

                                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                            Merge: 28c364a c37d1cc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Thu Jan 24 09:46:00 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit 1cba16137b012f54873b193ab6b16968022d0c96
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Thu Jan 24 09:45:29 2019 +0800

                                Revert "修改药品说明样式"

                                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:25:58 2019 +0800

                                搜索列表显示样式更改

                            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                            Author: Luolei <16657115156@163.com>
                            Date:   Thu Jan 24 09:15:40 2019 +0800

                                样式调整

                            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:22:29 2019 +0800

                                修改导入host

                            commit f75c649c857013b890959fa7e1d3992912ddd1ca
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:15:44 2019 +0800

                                临时修改版本弹窗高度

                            commit e0376902fb956ee58c40b86ae97b924ce5955e75
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 21:10:27 2019 +0800

                                化验导入删除填值推送

                            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:43:48 2019 +0800

                                添加删除辅捡右侧推送

                            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 20:30:50 2019 +0800

                                修改杂音选中项bug

                            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                            Merge: b489e52 6a1a3df
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:58:07 2019 +0800

                                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:57:50 2019 +0800

                                既往史无殊选中bug

                            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 18:57:03 2019 +0800

                                css

                            commit 96efc7b8118a99db629f898960621b98786bd42e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 18:26:40 2019 +0800

                                合罗磊分支

                            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:49:02 2019 +0800

                                回退

                            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                            Merge: 6732dbb 1dd6c92
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:44:02 2019 +0800

                                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                                # Conflicts:
                                #	src/common/components/TailInlineTag/index.less
                                #	src/common/components/Textarea/index.jsx
                                #	src/components/AddAssistCheck/index.jsx
                                #	src/containers/OtherHistory.js
                                #	src/store/actions/otherHistory.js

                            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                            Merge: bc168f8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:36:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                                # Conflicts:
                                #	src/common/components/EditableSpan/index.jsx
                                #	src/components/AddAssistCheck/index.jsx

                            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                            Merge: 3559798 6d55c59
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:34:30 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            commit 3559798c04e69583c1f05fc9125c812a9933892f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:31:13 2019 +0800

                                既往史下拉滚动条添加

                            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 17:22:01 2019 +0800

                                修改请求地址

                            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 17:16:22 2019 +0800

                                辅检横向滚动

                            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                            Merge: adc853a 45b1158
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 16:53:11 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                                # Conflicts:
                                #	src/utils/config.js

                            commit cf97be2f425bdef386a137e92929969c321ab047
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:08:25 2019 +0800

                                去掉一个字

                            commit 1a8521d3c3019063a3124a142e3241f84b43c409
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 16:01:26 2019 +0800

                                bug

                            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 15:58:40 2019 +0800

                                其他史高血压选中bug修改

                            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 15:16:32 2019 +0800

                                删除项有问题

                            commit ac64b868290f94c0a30e3242110a38cda67249eb
                            Merge: d2eca9d 1a6bf74
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:59:26 2019 +0800

                                Merge branch 'dev/liucf' into dev/luolei

                            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 14:51:07 2019 +0800

                                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 14:43:46 2019 +0800

                                日期bug

                            commit 38f972082b4a6b58e73f17d4d15302045cd48981
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:46:29 2019 +0800

                                请求地址修改-刚才反了

                            commit 70e9420d59b745c59f3abe04c33100777184d024
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:44:13 2019 +0800

                                请求地址修改

                            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 13:39:05 2019 +0800

                                打印图标

                            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:31:48 2019 +0800

                                其他史高血压数据展开

                            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 11:00:06 2019 +0800

                                查体type修改

                            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:58:27 2019 +0800

                                查体type修改

                            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                            Merge: 4b8aa34 540b6a8
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:51:52 2019 +0800

                                Merge branch 'dev/new' into dev/luolei

                            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                            Author: Luolei <16657115156@163.com>
                            Date:   Wed Jan 23 10:47:15 2019 +0800

                                搜索弹窗被遮挡问题解决

                            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:23:04 2019 +0800

                                地址临时修改

                            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:20:05 2019 +0800

                                版本信息弹窗高度限制

                            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 10:13:40 2019 +0800

                                推送接口主诉现病史合并,治疗方案容错

                            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                            Merge: 4a897b4 5a39d90
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/new' into dev/new

                            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                            Merge: 7f1c7c8 abd1267
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:57:43 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/common/components/ItemBox/index.jsx
                                #	src/components/AddInspect/index.jsx
                                #	src/components/Diagnosis/index.jsx
                                #	src/components/Diagnosis/index.less

                            commit 5a39d90dd616740bce7e833646a455b713f5e579
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:52:01 2019 +0800

                                层级问题

                            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                            Merge: e5d0122 7f1c7c8
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:34 2019 +0800

                                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                            commit e5d0122382957b2f9157a83b72adfb651b355f96
                            Author: liucf <liucf@zjlantone.com>
                            Date:   Wed Jan 23 09:43:21 2019 +0800

                                11

                            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:39:50 2019 +0800

                                修改请求地址

                            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:38:05 2019 +0800

                                修改请求地址

                            commit b14968d42d5ed583714b5941365dc97fe24ea61b
                            Merge: df67559 a82d18c
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:50 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            commit df67559cc42c79c6ed6b27254ce12178918e32b0
                            Merge: ff817bf 6805811
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Wed Jan 23 09:26:39 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit 68058110e041e72b8c95979a4fd23e690912746b
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:43:26 2019 +0800

                                遮罩统一0.6透明度

                            commit 625ca181024a268f16f32eb2773ea337cf62db43
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 20:34:59 2019 +0800

                                透明度ie8

                            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:24:39 2019 +0800

                                修改治疗方案无内容按钮置灰

                            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                            Merge: 9c0e078 84ec971
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 20:09:22 2019 +0800

                                merge from 'lcf'

                            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 19:01:31 2019 +0800

                                修改药品说明样式

                            commit ff817bf6d6d928b98557371362374859bec3aabd
                            Merge: d50ffe0 b2e679a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:52:34 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            commit b2e679a35e0ff4831f689758eb14521541f967e2
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:50:45 2019 +0800

                                导入ie8暂时先灰掉

                            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                            Merge: 573f0b5 b286d0a
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:25:09 2019 +0800

                                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                                # Conflicts:
                                #	src/utils/config.js

                            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 16:23:57 2019 +0800

                                文本模式ie8onInput存值,搜索下拉项样式

                            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 15:30:07 2019 +0800

                                修改开单项到医嘱逗号

                            commit 573f0b59ff517de16f94296240572544e31c9f46
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:23:46 2019 +0800

                                合并后报错处理

                            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                            Merge: 55d15d6 fbab9de
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:18:22 2019 +0800

                                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                                # Conflicts:
                                #	src/components/CurrentIll/index.jsx
                                #	src/containers/EditableSpan.js
                                #	src/store/actions/currentIll.js
                                #	src/store/reducers/checkBody.js
                                #	src/utils/ajax.js
                                #	src/utils/config.js

                            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                            Merge: 2d40e6e ad68815
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:10:38 2019 +0800

                                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                                # Conflicts:
                                #	src/components/MainSuit/index.jsx

                            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                            Author: zhouna <zhouna@zjlantone.com>
                            Date:   Tue Jan 22 15:02:18 2019 +0800

                                ie8的onInput代替函数

                            commit ad688156064254d6b615284642882ba5486ff764
                            Author: zhangxc <zhangxc@zjlantone.com>
                            Date:   Tue Jan 22 10:29:36 2019 +0800

                                init

                            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:13:57 2019 +0800

                                updata pro

                            commit 26649f42178c7177ee34dae46038ce2370bf5b26
                            Author: Luolei <16657115156@163.com>
                            Date:   Tue Jan 22 10:12:21 2019 +0800

                                test

                        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Fri Jan 25 13:13:11 2019 +0800

                            单选和多选编辑失焦时调用推送接口

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                    # Conflicts:
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Inspect/index.jsx
                    #	src/components/PushItems/index.less
                    #	src/store/actions/checkBody.js
                    #	src/store/actions/currentIll.js
                    #	src/store/actions/mainSuit.js
                    #	src/store/actions/otherHistory.js

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/NumberDrop/index.jsx
                #	src/components/NumberUnitDrop/index.jsx
                #	src/store/actions/mainSuit.js

            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 11:44:56 2019 +0800

                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:41:03 2019 +0800

                Squashed commit of the following:

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:38:40 2019 +0800

                Squashed commit of the following:

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

            commit e36f2f1b811d6978117161f50b16dd5bae298547
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:33:30 2019 +0800

                Squashed commit of the following:

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

            # Conflicts:
            #	src/components/PushItems/index.jsx
            #	src/utils/tools.js

        commit 519f23c91954f87e836cbd400b158f774c498ba6
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:35:59 2019 +0800

            文本删除又出现的问题
            Squashed commit of the following:

            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 11:44:56 2019 +0800

                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:41:03 2019 +0800

                Squashed commit of the following:

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:38:40 2019 +0800

                Squashed commit of the following:

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

            commit e36f2f1b811d6978117161f50b16dd5bae298547
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:33:30 2019 +0800

                Squashed commit of the following:

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

            # Conflicts:
            #	src/components/AddInspect/index.jsx
            #	src/components/Inspect/index.jsx
            #	src/components/PushItems/index.less
            #	src/store/actions/checkBody.js
            #	src/store/actions/currentIll.js
            #	src/store/actions/mainSuit.js
            #	src/store/actions/otherHistory.js

        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 15:59:14 2019 +0800

            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 14:21:41 2019 +0800

            Squashed commit of the following:

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 13:13:11 2019 +0800

            单选和多选编辑失焦时调用推送接口

    commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 17:35:01 2019 +0800

        底部几个按钮换行设置最小宽度

    commit 7400613a1eb642e1d01004c7818883fd73c2350c
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 17:28:45 2019 +0800

        历史病例时间和按钮不能共存

    commit c000d83fb6ac5f265951c0e1377b627d24d2da10
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 17:27:30 2019 +0800

        修改治疗方案边框

    commit eda3f4b08a3460360541cd2af1c2ca071681c595
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 17:12:47 2019 +0800

        bug修改

    commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 15:54:49 2019 +0800

        还是符号处理...

    commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 15:58:28 2019 +0800

        导入化验结果,第一次添加诊断为主诉时不往主诉添加字符串

    commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 15:56:03 2019 +0800

        治疗方案标题添加疾病名称

    commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 15:51:09 2019 +0800

        Squashed commit of the following:

        commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 29 14:17:40 2019 +0800

            顿号去重

        commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
        Merge: 4095b3f b09559b
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 29 13:59:54 2019 +0800

            Merge branch 'dev/new1' into dev/byll

        commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 29 13:55:47 2019 +0800

            样式宽度更改和逗号处理

        commit 79e0195a9b13069db729afe732bc5b466d43a37f
        Author: Luolei <16657115156@163.com>
        Date:   Fri Jan 25 14:06:09 2019 +0800

            date修改

    commit fea9a721ccb5afb9f1873c2111e3722d7330d394
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 15:50:07 2019 +0800

        Squashed commit of the following:

        commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 15:22:37 2019 +0800

            修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

        commit 799eef5c34a21f9d90bc82a40240838cf10ba601
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 14:41:20 2019 +0800

            ie8治疗方案遮罩

        commit fee35d5473b69aafb5335759006a93fea8d14145
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 14:05:16 2019 +0800

            治疗方案遮罩IE8

        commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 14:04:58 2019 +0800

            修改右侧推送字体大小

        commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 29 13:26:56 2019 +0800

            修改化验项开单逗号问题

        commit 29b2499b796085a682a936d82c97decc35edf891
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Fri Jan 25 13:50:07 2019 +0800

            修改版本信息和免责声明位置

        # Conflicts:
        #	src/components/PushItems/index.jsx

    commit 2c70e41e7a5254838436b499b1ad787f523585f8
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 15:42:54 2019 +0800

        Squashed commit of the following:

        commit 519f23c91954f87e836cbd400b158f774c498ba6
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:35:59 2019 +0800

            文本删除又出现的问题
            Squashed commit of the following:

            commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 11:44:56 2019 +0800

                NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

            commit eec53100dcee36be4a80af88e65a5b9772f71f4d
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:41:03 2019 +0800

                Squashed commit of the following:

                commit 79e0195a9b13069db729afe732bc5b466d43a37f
                Author: Luolei <16657115156@163.com>
                Date:   Fri Jan 25 14:06:09 2019 +0800

                    date修改

            commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:38:40 2019 +0800

                Squashed commit of the following:

                commit 29b2499b796085a682a936d82c97decc35edf891
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Fri Jan 25 13:50:07 2019 +0800

                    修改版本信息和免责声明位置

            commit e36f2f1b811d6978117161f50b16dd5bae298547
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Jan 28 10:33:30 2019 +0800

                Squashed commit of the following:

                commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 15:59:14 2019 +0800

                    单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 14:21:41 2019 +0800

                    Squashed commit of the following:

                    commit d3e160a516240b77576567b993223816a68231a6
                    Merge: 79e63ed c7e9e73
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:48 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:46:16 2019 +0800

                        化验辅捡ie8搜索卡死修改

                    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 13:12:43 2019 +0800

                        默认host地址删除

                    commit e01035349f92405572238a0a97d80bb557dda802
                    Merge: 8a8015d caad36f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 11:45:20 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 10:59:52 2019 +0800

                        修改样式

                    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:46:01 2019 +0800

                        合并报错修改

                    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                    Merge: bbe85ff 58e0fdd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Fri Jan 25 09:42:51 2019 +0800

                        Merge remote-tracking branch 'origin/IE_test' into dev/new1

                    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                    Merge: b86268a 3bfa819
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:30:05 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/containers/SpreadDrop.js

                    commit b86268a57afae26c7972b4b2362ae656a6784a8d
                    Merge: 79c59d3 105488f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:25:44 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                        # Conflicts:
                        #	src/store/async-actions/treat.js

                    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                    Merge: db90e04 de190a5
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 20:24:40 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 20:18:42 2019 +0800

                        中英文逗号

                    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 18:31:55 2019 +0800

                        去掉英文逗号

                    commit 105488feef9e89309ecc23f2c9bce944da3490fb
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 17:22:34 2019 +0800

                        修改治疗方案

                    commit db90e04f23baf95466e34498ca06101f49a7ac7e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 16:49:10 2019 +0800

                        下拉项间距调整,ie8事件兼容

                    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:09:49 2019 +0800

                        药品说明书样式

                    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:08:17 2019 +0800

                        修改药品说明书

                    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:06:17 2019 +0800

                        修改开单样式

                    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 14:02:30 2019 +0800

                        修改获取患者信息路径

                    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:43:38 2019 +0800

                        添加诊断判断有没有治疗方案

                    commit f617e5c267246786e7a6801cc87811f0d2527235
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 13:39:13 2019 +0800

                        merge from 'dev/zxc'

                    commit 87e941c29ed951540497c18c0a493c55b222ce00
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 10:33:44 2019 +0800

                        提示语

                    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                    Merge: d3ade00 95e9a94
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:09:57 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/components/DiagnosticList/index.jsx
                        #	src/components/Operation/index.jsx
                        #	src/containers/SpreadDrop.js
                        #	src/store/actions/otherHistory.js
                        #	src/store/async-actions/treat.js
                        #	src/store/types/checkBody.js

                    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                    Merge: 2fd497e 2458ea1
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:05:17 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 10:03:28 2019 +0800

                        提示语消失默认时间改为2秒

                    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 10:02:00 2019 +0800

                        治疗方案置灰

                    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:59:16 2019 +0800

                        治疗方案

                    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                    Merge: 62bd7fb 38f9720
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:47:47 2019 +0800

                        Merge branch 'dev/new' into dev/zhangxc

                    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:46:32 2019 +0800

                        Revert "Revert "修改药品说明样式""

                        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                    Merge: 28c364a c37d1cc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Thu Jan 24 09:46:00 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit 1cba16137b012f54873b193ab6b16968022d0c96
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Thu Jan 24 09:45:29 2019 +0800

                        Revert "修改药品说明样式"

                        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:25:58 2019 +0800

                        搜索列表显示样式更改

                    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                    Author: Luolei <16657115156@163.com>
                    Date:   Thu Jan 24 09:15:40 2019 +0800

                        样式调整

                    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:22:29 2019 +0800

                        修改导入host

                    commit f75c649c857013b890959fa7e1d3992912ddd1ca
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:15:44 2019 +0800

                        临时修改版本弹窗高度

                    commit e0376902fb956ee58c40b86ae97b924ce5955e75
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 21:10:27 2019 +0800

                        化验导入删除填值推送

                    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:43:48 2019 +0800

                        添加删除辅捡右侧推送

                    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 20:30:50 2019 +0800

                        修改杂音选中项bug

                    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                    Merge: b489e52 6a1a3df
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:58:07 2019 +0800

                        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:57:50 2019 +0800

                        既往史无殊选中bug

                    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 18:57:03 2019 +0800

                        css

                    commit 96efc7b8118a99db629f898960621b98786bd42e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 18:26:40 2019 +0800

                        合罗磊分支

                    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:49:02 2019 +0800

                        回退

                    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                    Merge: 6732dbb 1dd6c92
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:44:02 2019 +0800

                        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                        # Conflicts:
                        #	src/common/components/TailInlineTag/index.less
                        #	src/common/components/Textarea/index.jsx
                        #	src/components/AddAssistCheck/index.jsx
                        #	src/containers/OtherHistory.js
                        #	src/store/actions/otherHistory.js

                    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                    Merge: bc168f8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:36:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                        # Conflicts:
                        #	src/common/components/EditableSpan/index.jsx
                        #	src/components/AddAssistCheck/index.jsx

                    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                    Merge: 3559798 6d55c59
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:34:30 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    commit 3559798c04e69583c1f05fc9125c812a9933892f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:31:13 2019 +0800

                        既往史下拉滚动条添加

                    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 17:22:01 2019 +0800

                        修改请求地址

                    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 17:16:22 2019 +0800

                        辅检横向滚动

                    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                    Merge: adc853a 45b1158
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 16:53:11 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        # Conflicts:
                        #	src/utils/config.js

                    commit cf97be2f425bdef386a137e92929969c321ab047
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:08:25 2019 +0800

                        去掉一个字

                    commit 1a8521d3c3019063a3124a142e3241f84b43c409
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 16:01:26 2019 +0800

                        bug

                    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 15:58:40 2019 +0800

                        其他史高血压选中bug修改

                    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 15:16:32 2019 +0800

                        删除项有问题

                    commit ac64b868290f94c0a30e3242110a38cda67249eb
                    Merge: d2eca9d 1a6bf74
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:59:26 2019 +0800

                        Merge branch 'dev/liucf' into dev/luolei

                    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 14:51:07 2019 +0800

                        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

                    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 14:43:46 2019 +0800

                        日期bug

                    commit 38f972082b4a6b58e73f17d4d15302045cd48981
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:46:29 2019 +0800

                        请求地址修改-刚才反了

                    commit 70e9420d59b745c59f3abe04c33100777184d024
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:44:13 2019 +0800

                        请求地址修改

                    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 13:39:05 2019 +0800

                        打印图标

                    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:31:48 2019 +0800

                        其他史高血压数据展开

                    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 11:00:06 2019 +0800

                        查体type修改

                    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:58:27 2019 +0800

                        查体type修改

                    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                    Merge: 4b8aa34 540b6a8
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:51:52 2019 +0800

                        Merge branch 'dev/new' into dev/luolei

                    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                    Author: Luolei <16657115156@163.com>
                    Date:   Wed Jan 23 10:47:15 2019 +0800

                        搜索弹窗被遮挡问题解决

                    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:23:04 2019 +0800

                        地址临时修改

                    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:20:05 2019 +0800

                        版本信息弹窗高度限制

                    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 10:13:40 2019 +0800

                        推送接口主诉现病史合并,治疗方案容错

                    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                    Merge: 4a897b4 5a39d90
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/new' into dev/new

                    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                    Merge: 7f1c7c8 abd1267
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:57:43 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/common/components/ItemBox/index.jsx
                        #	src/components/AddInspect/index.jsx
                        #	src/components/Diagnosis/index.jsx
                        #	src/components/Diagnosis/index.less

                    commit 5a39d90dd616740bce7e833646a455b713f5e579
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:52:01 2019 +0800

                        层级问题

                    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                    Merge: e5d0122 7f1c7c8
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:34 2019 +0800

                        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                    commit e5d0122382957b2f9157a83b72adfb651b355f96
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Wed Jan 23 09:43:21 2019 +0800

                        11

                    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:39:50 2019 +0800

                        修改请求地址

                    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:38:05 2019 +0800

                        修改请求地址

                    commit b14968d42d5ed583714b5941365dc97fe24ea61b
                    Merge: df67559 a82d18c
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:50 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    commit df67559cc42c79c6ed6b27254ce12178918e32b0
                    Merge: ff817bf 6805811
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Wed Jan 23 09:26:39 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit 68058110e041e72b8c95979a4fd23e690912746b
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:43:26 2019 +0800

                        遮罩统一0.6透明度

                    commit 625ca181024a268f16f32eb2773ea337cf62db43
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 20:34:59 2019 +0800

                        透明度ie8

                    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:24:39 2019 +0800

                        修改治疗方案无内容按钮置灰

                    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                    Merge: 9c0e078 84ec971
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 20:09:22 2019 +0800

                        merge from 'lcf'

                    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 19:01:31 2019 +0800

                        修改药品说明样式

                    commit ff817bf6d6d928b98557371362374859bec3aabd
                    Merge: d50ffe0 b2e679a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:52:34 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    commit b2e679a35e0ff4831f689758eb14521541f967e2
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:50:45 2019 +0800

                        导入ie8暂时先灰掉

                    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                    Merge: 573f0b5 b286d0a
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:25:09 2019 +0800

                        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        # Conflicts:
                        #	src/utils/config.js

                    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 16:23:57 2019 +0800

                        文本模式ie8onInput存值,搜索下拉项样式

                    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 15:30:07 2019 +0800

                        修改开单项到医嘱逗号

                    commit 573f0b59ff517de16f94296240572544e31c9f46
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:23:46 2019 +0800

                        合并后报错处理

                    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                    Merge: 55d15d6 fbab9de
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:18:22 2019 +0800

                        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                        # Conflicts:
                        #	src/components/CurrentIll/index.jsx
                        #	src/containers/EditableSpan.js
                        #	src/store/actions/currentIll.js
                        #	src/store/reducers/checkBody.js
                        #	src/utils/ajax.js
                        #	src/utils/config.js

                    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                    Merge: 2d40e6e ad68815
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:10:38 2019 +0800

                        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        # Conflicts:
                        #	src/components/MainSuit/index.jsx

                    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                    Author: zhouna <zhouna@zjlantone.com>
                    Date:   Tue Jan 22 15:02:18 2019 +0800

                        ie8的onInput代替函数

                    commit ad688156064254d6b615284642882ba5486ff764
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Tue Jan 22 10:29:36 2019 +0800

                        init

                    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:13:57 2019 +0800

                        updata pro

                    commit 26649f42178c7177ee34dae46038ce2370bf5b26
                    Author: Luolei <16657115156@163.com>
                    Date:   Tue Jan 22 10:12:21 2019 +0800

                        test

                commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Jan 25 13:13:11 2019 +0800

                    单选和多选编辑失焦时调用推送接口

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

            # Conflicts:
            #	src/components/AddInspect/index.jsx
            #	src/components/Inspect/index.jsx
            #	src/components/PushItems/index.less
            #	src/store/actions/checkBody.js
            #	src/store/actions/currentIll.js
            #	src/store/actions/mainSuit.js
            #	src/store/actions/otherHistory.js

        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 15:59:14 2019 +0800

            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 14:21:41 2019 +0800

            Squashed commit of the following:

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 13:13:11 2019 +0800

            单选和多选编辑失焦时调用推送接口

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx
        #	src/components/NumberDrop/index.jsx
        #	src/components/NumberUnitDrop/index.jsx
        #	src/store/actions/mainSuit.js

    commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 15:22:37 2019 +0800

        修改第一次添加诊断为复诊,化验和辅检不为空时不往主诉加字符串

    commit 799eef5c34a21f9d90bc82a40240838cf10ba601
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:41:20 2019 +0800

        ie8治疗方案遮罩

    commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 14:17:40 2019 +0800

        顿号去重

    commit fee35d5473b69aafb5335759006a93fea8d14145
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:05:16 2019 +0800

        治疗方案遮罩IE8

    commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:04:58 2019 +0800

        修改右侧推送字体大小

    commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
    Merge: 4095b3f b09559b
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 13:59:54 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 13:55:47 2019 +0800

        样式宽度更改和逗号处理

    commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 13:26:56 2019 +0800

        修改化验项开单逗号问题

    commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 11:44:56 2019 +0800

        NumberDrop点击标签消失的bug,其他史黑色文字未存到saveText

    commit eec53100dcee36be4a80af88e65a5b9772f71f4d
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon Jan 28 10:41:03 2019 +0800

        Squashed commit of the following:

        commit 79e0195a9b13069db729afe732bc5b466d43a37f
        Author: Luolei <16657115156@163.com>
        Date:   Fri Jan 25 14:06:09 2019 +0800

            date修改

    commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon Jan 28 10:38:40 2019 +0800

        Squashed commit of the following:

        commit 29b2499b796085a682a936d82c97decc35edf891
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Fri Jan 25 13:50:07 2019 +0800

            修改版本信息和免责声明位置

    commit e36f2f1b811d6978117161f50b16dd5bae298547
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon Jan 28 10:33:30 2019 +0800

        Squashed commit of the following:

        commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 15:59:14 2019 +0800

            单选、多选、时间单位组件双击编辑删除完内容时删除该标签

        commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 14:21:41 2019 +0800

            Squashed commit of the following:

            commit d3e160a516240b77576567b993223816a68231a6
            Merge: 79e63ed c7e9e73
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:48 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:46:16 2019 +0800

                化验辅捡ie8搜索卡死修改

            commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 13:12:43 2019 +0800

                默认host地址删除

            commit e01035349f92405572238a0a97d80bb557dda802
            Merge: 8a8015d caad36f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 11:45:20 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 10:59:52 2019 +0800

                修改样式

            commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:46:01 2019 +0800

                合并报错修改

            commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
            Merge: bbe85ff 58e0fdd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Jan 25 09:42:51 2019 +0800

                Merge remote-tracking branch 'origin/IE_test' into dev/new1

            commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
            Merge: b86268a 3bfa819
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:30:05 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/containers/SpreadDrop.js

            commit b86268a57afae26c7972b4b2362ae656a6784a8d
            Merge: 79c59d3 105488f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:25:44 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                # Conflicts:
                #	src/store/async-actions/treat.js

            commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
            Merge: db90e04 de190a5
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 20:24:40 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 20:18:42 2019 +0800

                中英文逗号

            commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 18:31:55 2019 +0800

                去掉英文逗号

            commit 105488feef9e89309ecc23f2c9bce944da3490fb
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 17:22:34 2019 +0800

                修改治疗方案

            commit db90e04f23baf95466e34498ca06101f49a7ac7e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 16:49:10 2019 +0800

                下拉项间距调整,ie8事件兼容

            commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:09:49 2019 +0800

                药品说明书样式

            commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:08:17 2019 +0800

                修改药品说明书

            commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:06:17 2019 +0800

                修改开单样式

            commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 14:02:30 2019 +0800

                修改获取患者信息路径

            commit 6f95c909024a0c09f7ae316f9809ff96373365e2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:43:38 2019 +0800

                添加诊断判断有没有治疗方案

            commit f617e5c267246786e7a6801cc87811f0d2527235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 13:39:13 2019 +0800

                merge from 'dev/zxc'

            commit 87e941c29ed951540497c18c0a493c55b222ce00
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 10:33:44 2019 +0800

                提示语

            commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
            Merge: d3ade00 95e9a94
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:09:57 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/Operation/index.jsx
                #	src/containers/SpreadDrop.js
                #	src/store/actions/otherHistory.js
                #	src/store/async-actions/treat.js
                #	src/store/types/checkBody.js

            commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
            Merge: 2fd497e 2458ea1
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:05:17 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 10:03:28 2019 +0800

                提示语消失默认时间改为2秒

            commit 95e9a941766b9d5454f3c92fc614aa3321bce664
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 10:02:00 2019 +0800

                治疗方案置灰

            commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:59:16 2019 +0800

                治疗方案

            commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
            Merge: 62bd7fb 38f9720
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:47:47 2019 +0800

                Merge branch 'dev/new' into dev/zhangxc

            commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:46:32 2019 +0800

                Revert "Revert "修改药品说明样式""

                This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

            commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
            Merge: 28c364a c37d1cc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Jan 24 09:46:00 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit 1cba16137b012f54873b193ab6b16968022d0c96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 24 09:45:29 2019 +0800

                Revert "修改药品说明样式"

                This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

            commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:25:58 2019 +0800

                搜索列表显示样式更改

            commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 24 09:15:40 2019 +0800

                样式调整

            commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:22:29 2019 +0800

                修改导入host

            commit f75c649c857013b890959fa7e1d3992912ddd1ca
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:15:44 2019 +0800

                临时修改版本弹窗高度

            commit e0376902fb956ee58c40b86ae97b924ce5955e75
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 21:10:27 2019 +0800

                化验导入删除填值推送

            commit 38d5d80ae62a8c393f4623f1774b756f078d6954
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:43:48 2019 +0800

                添加删除辅捡右侧推送

            commit d54073a78ccc7697f333c3d8ecc98922f14dc669
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 20:30:50 2019 +0800

                修改杂音选中项bug

            commit a7804f15d955022f912efa89cd3f0722bd5f02a3
            Merge: b489e52 6a1a3df
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:58:07 2019 +0800

                Merge remote-tracking branch 'origin/dev/byll' into dev/new1

            commit b489e5280cb7a214cf124116aea673ca2d4cefc3
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:57:50 2019 +0800

                既往史无殊选中bug

            commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 18:57:03 2019 +0800

                css

            commit 96efc7b8118a99db629f898960621b98786bd42e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 18:26:40 2019 +0800

                合罗磊分支

            commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:49:02 2019 +0800

                回退

            commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
            Merge: 6732dbb 1dd6c92
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:44:02 2019 +0800

                Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                # Conflicts:
                #	src/common/components/TailInlineTag/index.less
                #	src/common/components/Textarea/index.jsx
                #	src/components/AddAssistCheck/index.jsx
                #	src/containers/OtherHistory.js
                #	src/store/actions/otherHistory.js

            commit 6732dbb61763a7717a2055d932da17c54d2aa65a
            Merge: bc168f8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:36:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                # Conflicts:
                #	src/common/components/EditableSpan/index.jsx
                #	src/components/AddAssistCheck/index.jsx

            commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
            Merge: 3559798 6d55c59
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:34:30 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            commit 3559798c04e69583c1f05fc9125c812a9933892f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:31:13 2019 +0800

                既往史下拉滚动条添加

            commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 17:22:01 2019 +0800

                修改请求地址

            commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 17:16:22 2019 +0800

                辅检横向滚动

            commit 461e1db27e39068ca7126b0ad04e756c31f74d74
            Merge: adc853a 45b1158
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 16:53:11 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                # Conflicts:
                #	src/utils/config.js

            commit cf97be2f425bdef386a137e92929969c321ab047
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:08:25 2019 +0800

                去掉一个字

            commit 1a8521d3c3019063a3124a142e3241f84b43c409
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 16:01:26 2019 +0800

                bug

            commit 45b1158b6f5a13eb0b02560087f3b936f6449089
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 15:58:40 2019 +0800

                其他史高血压选中bug修改

            commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 15:16:32 2019 +0800

                删除项有问题

            commit ac64b868290f94c0a30e3242110a38cda67249eb
            Merge: d2eca9d 1a6bf74
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:59:26 2019 +0800

                Merge branch 'dev/liucf' into dev/luolei

            commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 14:51:07 2019 +0800

                文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

            commit d2eca9d801e445d624c6a5465319e6e1335dbd15
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 14:43:46 2019 +0800

                日期bug

            commit 38f972082b4a6b58e73f17d4d15302045cd48981
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:46:29 2019 +0800

                请求地址修改-刚才反了

            commit 70e9420d59b745c59f3abe04c33100777184d024
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:44:13 2019 +0800

                请求地址修改

            commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 13:39:05 2019 +0800

                打印图标

            commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:31:48 2019 +0800

                其他史高血压数据展开

            commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 11:00:06 2019 +0800

                查体type修改

            commit f163535cc31ed9efbccc673325ee32d043c9c5bf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:58:27 2019 +0800

                查体type修改

            commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
            Merge: 4b8aa34 540b6a8
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:51:52 2019 +0800

                Merge branch 'dev/new' into dev/luolei

            commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
            Author: Luolei <16657115156@163.com>
            Date:   Wed Jan 23 10:47:15 2019 +0800

                搜索弹窗被遮挡问题解决

            commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:23:04 2019 +0800

                地址临时修改

            commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:20:05 2019 +0800

                版本信息弹窗高度限制

            commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 10:13:40 2019 +0800

                推送接口主诉现病史合并,治疗方案容错

            commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
            Merge: 4a897b4 5a39d90
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/new' into dev/new

            commit 4a897b473cda81f614a8fd820a6d480b98f9872d
            Merge: 7f1c7c8 abd1267
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:57:43 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/common/components/ItemBox/index.jsx
                #	src/components/AddInspect/index.jsx
                #	src/components/Diagnosis/index.jsx
                #	src/components/Diagnosis/index.less

            commit 5a39d90dd616740bce7e833646a455b713f5e579
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:52:01 2019 +0800

                层级问题

            commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
            Merge: e5d0122 7f1c7c8
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:34 2019 +0800

                Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

            commit e5d0122382957b2f9157a83b72adfb651b355f96
            Author: liucf <liucf@zjlantone.com>
            Date:   Wed Jan 23 09:43:21 2019 +0800

                11

            commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:39:50 2019 +0800

                修改请求地址

            commit f14d699d86b98edde58a5739d5c81f538dd8bb18
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:38:05 2019 +0800

                修改请求地址

            commit b14968d42d5ed583714b5941365dc97fe24ea61b
            Merge: df67559 a82d18c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:50 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            commit df67559cc42c79c6ed6b27254ce12178918e32b0
            Merge: ff817bf 6805811
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Jan 23 09:26:39 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit 68058110e041e72b8c95979a4fd23e690912746b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:43:26 2019 +0800

                遮罩统一0.6透明度

            commit 625ca181024a268f16f32eb2773ea337cf62db43
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 20:34:59 2019 +0800

                透明度ie8

            commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:24:39 2019 +0800

                修改治疗方案无内容按钮置灰

            commit c54c73fe39e5746c1e1f2b16924e259cc122620a
            Merge: 9c0e078 84ec971
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 20:09:22 2019 +0800

                merge from 'lcf'

            commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 19:01:31 2019 +0800

                修改药品说明样式

            commit ff817bf6d6d928b98557371362374859bec3aabd
            Merge: d50ffe0 b2e679a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:52:34 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            commit b2e679a35e0ff4831f689758eb14521541f967e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:50:45 2019 +0800

                导入ie8暂时先灰掉

            commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
            Merge: 573f0b5 b286d0a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:25:09 2019 +0800

                Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                # Conflicts:
                #	src/utils/config.js

            commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 16:23:57 2019 +0800

                文本模式ie8onInput存值,搜索下拉项样式

            commit a82d18cfa4a27bb855651ef9f6965844d891fab2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 15:30:07 2019 +0800

                修改开单项到医嘱逗号

            commit 573f0b59ff517de16f94296240572544e31c9f46
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:23:46 2019 +0800

                合并后报错处理

            commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
            Merge: 55d15d6 fbab9de
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:18:22 2019 +0800

                Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                # Conflicts:
                #	src/components/CurrentIll/index.jsx
                #	src/containers/EditableSpan.js
                #	src/store/actions/currentIll.js
                #	src/store/reducers/checkBody.js
                #	src/utils/ajax.js
                #	src/utils/config.js

            commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
            Merge: 2d40e6e ad68815
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:10:38 2019 +0800

                Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                # Conflicts:
                #	src/components/MainSuit/index.jsx

            commit 5e7834e1ff17257abdf408037031c0d926d22bfc
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Jan 22 15:02:18 2019 +0800

                ie8的onInput代替函数

            commit ad688156064254d6b615284642882ba5486ff764
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 22 10:29:36 2019 +0800

                init

            commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:13:57 2019 +0800

                updata pro

            commit 26649f42178c7177ee34dae46038ce2370bf5b26
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 22 10:12:21 2019 +0800

                test

        commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 13:13:11 2019 +0800

            单选和多选编辑失焦时调用推送接口

    commit d6751d916bd9aff60373a28ce2240bc078809e9a
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon Jan 28 09:51:31 2019 +0800

        合并new1分支
        Squashed commit of the following:

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit caad36f002904aa859a0d780eefdf5b9cdc9011e
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 11:24:02 2019 +0800

            时间单位组件IE兼容

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit 58e0fdd1ab99664163923ff7ae455efff5850195
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jan 25 09:20:30 2019 +0800

            主诉IE兼容性处理

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/containers/SpreadDrop.js

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            # Conflicts:
            #	src/store/async-actions/treat.js

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整,ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

            Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/AddAssistCheck/index.jsx

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并,治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/new' into dev/new

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

            Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值,搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/components/MainSuit/index.jsx

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

    commit 79e0195a9b13069db729afe732bc5b466d43a37f
    Author: Luolei <16657115156@163.com>
    Date:   Fri Jan 25 14:06:09 2019 +0800

        date修改

    commit 29b2499b796085a682a936d82c97decc35edf891
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Jan 25 13:50:07 2019 +0800

        修改版本信息和免责声明位置

    commit d3e160a516240b77576567b993223816a68231a6
    Merge: 79e63ed c7e9e73
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 13:46:48 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 13:46:16 2019 +0800

        化验辅捡ie8搜索卡死修改

    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 13:12:43 2019 +0800

        默认host地址删除

    commit e01035349f92405572238a0a97d80bb557dda802
    Merge: 8a8015d caad36f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 11:45:20 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 10:59:52 2019 +0800

        修改样式

    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 09:46:01 2019 +0800

        合并报错修改

    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
    Merge: bbe85ff 58e0fdd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 09:42:51 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
    Merge: b86268a 3bfa819
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 20:30:05 2019 +0800

        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx
        #	src/containers/SpreadDrop.js

    commit b86268a57afae26c7972b4b2362ae656a6784a8d
    Merge: 79c59d3 105488f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 20:25:44 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

        # Conflicts:
        #	src/store/async-actions/treat.js

    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
    Merge: db90e04 de190a5
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 20:24:40 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 20:18:42 2019 +0800

        中英文逗号

    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 18:31:55 2019 +0800

        去掉英文逗号

    commit 105488feef9e89309ecc23f2c9bce944da3490fb
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 17:22:34 2019 +0800

        修改治疗方案

    commit db90e04f23baf95466e34498ca06101f49a7ac7e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 16:49:10 2019 +0800

        下拉项间距调整,ie8事件兼容

    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:09:49 2019 +0800

        药品说明书样式

    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:08:17 2019 +0800

        修改药品说明书

    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:06:17 2019 +0800

        修改开单样式

    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:02:30 2019 +0800

        修改获取患者信息路径

    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 13:43:38 2019 +0800

        添加诊断判断有没有治疗方案

    commit f617e5c267246786e7a6801cc87811f0d2527235
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 13:39:13 2019 +0800

        merge from 'dev/zxc'

    commit 87e941c29ed951540497c18c0a493c55b222ce00
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 10:33:44 2019 +0800

        提示语

    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
    Merge: d3ade00 95e9a94
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 10:09:57 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

        # Conflicts:
        #	src/components/DiagnosticList/index.jsx
        #	src/components/Operation/index.jsx
        #	src/containers/SpreadDrop.js
        #	src/store/actions/otherHistory.js
        #	src/store/async-actions/treat.js
        #	src/store/types/checkBody.js

    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
    Merge: 2fd497e 2458ea1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 10:05:17 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 10:03:28 2019 +0800

        提示语消失默认时间改为2秒

    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 10:02:00 2019 +0800

        治疗方案置灰

    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:59:16 2019 +0800

        治疗方案

    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
    Merge: 62bd7fb 38f9720
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:47:47 2019 +0800

        Merge branch 'dev/new' into dev/zhangxc

    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:46:32 2019 +0800

        Revert "Revert "修改药品说明样式""

        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
    Merge: 28c364a c37d1cc
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 09:46:00 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit 1cba16137b012f54873b193ab6b16968022d0c96
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:45:29 2019 +0800

        Revert "修改药品说明样式"

        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 09:25:58 2019 +0800

        搜索列表显示样式更改

    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 09:15:40 2019 +0800

        样式调整

    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 21:22:29 2019 +0800

        修改导入host

    commit f75c649c857013b890959fa7e1d3992912ddd1ca
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 21:15:44 2019 +0800

        临时修改版本弹窗高度

    commit e0376902fb956ee58c40b86ae97b924ce5955e75
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 21:10:27 2019 +0800

        化验导入删除填值推送

    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 20:43:48 2019 +0800

        添加删除辅捡右侧推送

    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 20:30:50 2019 +0800

        修改杂音选中项bug

    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
    Merge: b489e52 6a1a3df
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 18:58:07 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 18:57:50 2019 +0800

        既往史无殊选中bug

    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 18:57:03 2019 +0800

        css

    commit 96efc7b8118a99db629f898960621b98786bd42e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 18:26:40 2019 +0800

        合罗磊分支

    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:49:02 2019 +0800

        回退

    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
    Merge: 6732dbb 1dd6c92
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:44:02 2019 +0800

        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

        # Conflicts:
        #	src/common/components/TailInlineTag/index.less
        #	src/common/components/Textarea/index.jsx
        #	src/components/AddAssistCheck/index.jsx
        #	src/containers/OtherHistory.js
        #	src/store/actions/otherHistory.js

    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
    Merge: bc168f8 abd1267
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:36:50 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx
        #	src/components/AddAssistCheck/index.jsx

    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
    Merge: 3559798 6d55c59
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:34:30 2019 +0800

        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

    commit 3559798c04e69583c1f05fc9125c812a9933892f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:31:13 2019 +0800

        既往史下拉滚动条添加

    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:22:01 2019 +0800

        修改请求地址

    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 17:16:22 2019 +0800

        辅检横向滚动

    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
    Merge: adc853a 45b1158
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 16:53:11 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        # Conflicts:
        #	src/utils/config.js

    commit cf97be2f425bdef386a137e92929969c321ab047
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 16:08:25 2019 +0800

        去掉一个字

    commit 1a8521d3c3019063a3124a142e3241f84b43c409
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 16:01:26 2019 +0800

        bug

    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 15:58:40 2019 +0800

        其他史高血压选中bug修改

    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 15:16:32 2019 +0800

        删除项有问题

    commit ac64b868290f94c0a30e3242110a38cda67249eb
    Merge: d2eca9d 1a6bf74
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 14:59:26 2019 +0800

        Merge branch 'dev/liucf' into dev/luolei

    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 14:51:07 2019 +0800

        文本模式其他史不受主诉为空限制,切换模式后其他史重新获取

    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 14:43:46 2019 +0800

        日期bug

    commit 38f972082b4a6b58e73f17d4d15302045cd48981
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 13:46:29 2019 +0800

        请求地址修改-刚才反了

    commit 70e9420d59b745c59f3abe04c33100777184d024
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 13:44:13 2019 +0800

        请求地址修改

    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 13:39:05 2019 +0800

        打印图标

    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 11:31:48 2019 +0800

        其他史高血压数据展开

    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 11:00:06 2019 +0800

        查体type修改

    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:58:27 2019 +0800

        查体type修改

    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
    Merge: 4b8aa34 540b6a8
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 10:51:52 2019 +0800

        Merge branch 'dev/new' into dev/luolei

    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 10:47:15 2019 +0800

        搜索弹窗被遮挡问题解决

    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:23:04 2019 +0800

        地址临时修改

    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:20:05 2019 +0800

        版本信息弹窗高度限制

    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:13:40 2019 +0800

        推送接口主诉现病史合并,治疗方案容错

    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
    Merge: 4a897b4 5a39d90
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:57:50 2019 +0800

        Merge remote-tracking branch 'origin/dev/new' into dev/new

    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
    Merge: 7f1c7c8 abd1267
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:57:43 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        # Conflicts:
        #	src/common/components/ItemBox/index.jsx
        #	src/components/AddInspect/index.jsx
        #	src/components/Diagnosis/index.jsx
        #	src/components/Diagnosis/index.less

    commit 5a39d90dd616740bce7e833646a455b713f5e579
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 23 09:52:01 2019 +0800

        层级问题

    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
    Merge: e5d0122 7f1c7c8
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 23 09:43:34 2019 +0800

        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

    commit e5d0122382957b2f9157a83b72adfb651b355f96
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 23 09:43:21 2019 +0800

        11

    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:39:50 2019 +0800

        修改请求地址

    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:38:05 2019 +0800

        修改请求地址

    commit b14968d42d5ed583714b5941365dc97fe24ea61b
    Merge: df67559 a82d18c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:26:50 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

    commit df67559cc42c79c6ed6b27254ce12178918e32b0
    Merge: ff817bf 6805811
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:26:39 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

    commit 68058110e041e72b8c95979a4fd23e690912746b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 20:43:26 2019 +0800

        遮罩统一0.6透明度

    commit 625ca181024a268f16f32eb2773ea337cf62db43
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 20:34:59 2019 +0800

        透明度ie8

    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 20:24:39 2019 +0800

        修改治疗方案无内容按钮置灰

    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
    Merge: 9c0e078 84ec971
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 20:09:22 2019 +0800

        merge from 'lcf'

    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 19:01:31 2019 +0800

        修改药品说明样式

    commit ff817bf6d6d928b98557371362374859bec3aabd
    Merge: d50ffe0 b2e679a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:52:34 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

    commit b2e679a35e0ff4831f689758eb14521541f967e2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:50:45 2019 +0800

        导入ie8暂时先灰掉

    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
    Merge: 573f0b5 b286d0a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:25:09 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        # Conflicts:
        #	src/utils/config.js

    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:23:57 2019 +0800

        文本模式ie8onInput存值,搜索下拉项样式

    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 15:30:07 2019 +0800

        修改开单项到医嘱逗号

    commit 573f0b59ff517de16f94296240572544e31c9f46
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:23:46 2019 +0800

        合并后报错处理

    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
    Merge: 55d15d6 fbab9de
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:18:22 2019 +0800

        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

        # Conflicts:
        #	src/components/CurrentIll/index.jsx
        #	src/containers/EditableSpan.js
        #	src/store/actions/currentIll.js
        #	src/store/reducers/checkBody.js
        #	src/utils/ajax.js
        #	src/utils/config.js

    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
    Merge: 2d40e6e ad68815
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:10:38 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        # Conflicts:
        #	src/components/MainSuit/index.jsx

    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:02:18 2019 +0800

        ie8的onInput代替函数

    commit ad688156064254d6b615284642882ba5486ff764
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 10:29:36 2019 +0800

        init

    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 22 10:13:57 2019 +0800

        updata pro

    commit 26649f42178c7177ee34dae46038ce2370bf5b26
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 22 10:12:21 2019 +0800

        test

commit 1861896d2aba7fd822dd7f098fa6391b32a4de44
Merge: 54787c6 22da3ae
Author: Luolei <16657115156@163.com>
Date:   Mon Apr 1 12:36:20 2019 +0800

    Merge branch 'dev/new1' into dev/byll

commit 22da3ae95f6391048480dfd6493263d4387be69e
Author: Luolei <16657115156@163.com>
Date:   Mon Apr 1 12:34:49 2019 +0800

    防伪

commit 54787c67b73dcd78029000c49d97dbd3ca0b6166
Author: Luolei <16657115156@163.com>
Date:   Mon Apr 1 12:28:51 2019 +0800

    弹窗bug

commit 7858d22c6f9ddba8ebe27cff2d374cc347b53eae
Merge: 89ba72e c854917
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 1 11:50:58 2019 +0800

    Merge remote-tracking branch 'origin/IE_test' into dev/new1

commit c85491788fd4daf13472a0fa22a649dcae281c39
Author: liucf <liucf@zjlantone.com>
Date:   Mon Apr 1 11:49:29 2019 +0800

    主诉现病史子模板处理

commit 89ba72ed7bab828becfd5ec46c2221a71ffe426e
Merge: c1da01f 094f006
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 1 11:47:50 2019 +0800

    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    # Conflicts:
    #	src/utils/tools.js

commit c1da01f734c2992e02807c0373923d040cbbf8c3
Merge: 0604b24 a9afb2c
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 1 11:45:35 2019 +0800

    Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

commit 094f0061c0993048e73be633c8e0c683f3a59042
Author: Luolei <16657115156@163.com>
Date:   Mon Apr 1 11:44:52 2019 +0800

    彈窗修改

commit 0604b24880e153be983ac4c64f9134a24c39ee11
Merge: a885cfa 1f6e15f
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 1 11:44:13 2019 +0800

    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

commit a9afb2c2acb167ad46fd0e51be13173f0cfdaccf
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 1 11:14:20 2019 +0800

    修改消息提示框样式

commit 1dbb76027451c90299a4e6a9a49a270149c541b6
Author: liucf <liucf@zjlantone.com>
Date:   Mon Apr 1 11:08:19 2019 +0800

    主诉现病史子模板通过relationModule获取

commit c61eca8cc42f4409f9393f5070d0f11395bc1f53
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 1 10:19:27 2019 +0800

    修改光标样式

commit 1f6e15f32b12ccfe7b6aa6dc0c87a7c79a31bd75
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 1 09:56:07 2019 +0800

    数字键盘样式修改

commit bcd5baf158018d793f7ed68da174a9b0ff807810
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon Apr 1 09:44:48 2019 +0800

    双击编辑报错bug修改

commit 809e0763dafccaa5e44e5349170c88b3c9cffb4d
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 1 09:43:48 2019 +0800

    修改输入值不在正常值时提示

commit dc93b297500f2728d4ae88ffceec5f827e3156c4
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 1 09:40:37 2019 +0800

    选中图标

commit 6d5c057697f5922bcedd16700e903ee103fafca9
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Mar 29 11:17:45 2019 +0800

    添加权限appkey

commit da871643d127a0499bd428e09f3f69a225830907
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Mar 28 18:31:27 2019 +0800

    修改主诊断判断条件

commit a2ff4128b236a7c94dcea597af58d682d5b12f7e
Merge: 1608a1b a885cfa
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Mar 28 17:24:06 2019 +0800

    Merge branch 'dev/new1' into dev/zhangxc1

commit 97626efc1c829ffc134ba3d621c07a518fe12e74
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Mar 28 17:17:22 2019 +0800

    慢病入口引用历史病历

commit a885cfa59047d4e03b443bfa423ea862305a3283
Merge: 20a0b4e 6ece03c
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Mar 28 17:11:34 2019 +0800

    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

commit 20a0b4ef483156d918e95cd3683613bb77077f0a
Merge: c4e4aae 867d481
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Mar 28 17:11:23 2019 +0800

    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

commit 867d481042cba444c4e119b96cae2387d728d27d
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Mar 28 17:10:29 2019 +0800

    月经史bug修改

commit 7f10e3a6533ccf94df6f724fcb9933d18af057c3
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Mar 28 16:59:02 2019 +0800

    单选组件双击编辑内容加入选项中,限1个

commit 6ece03c6dd5eef702c64c3ee4d70aa0a018a7d55
Author: Luolei <16657115156@163.com>
Date:   Thu Mar 28 16:35:34 2019 +0800

    模板预览,灰色标签也得显示

commit c4e4aae5c10154db4173b046bba9bf93c61ec6c9
Merge: 6da8456 13936fb
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Mar 28 15:36:45 2019 +0800

    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

commit 13936fb5f5a91f22f4c4913c28fe40833f77d779
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Mar 28 15:31:09 2019 +0800

    查体显示区有默认值未收起bug修改(773)

commit 08d42b7dfc24dc87e4149e3676d74b7b1ebf1c0d
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Mar 28 15:00:52 2019 +0800

    查体模板引用显示bug

commit 6da8456e8c4376aacc3ac5760022534a4f8c7262
Merge: 9f8241f 57d6b5d
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Mar 28 11:50:42 2019 +0800

    Merge remote-tracking branch 'origin/IE_test' into dev/new1

commit 9f8241f4a2929b42bfea5b5fc6c3eb27856f7b3d
Merge: 82c143f f678117
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Mar 28 11:50:30 2019 +0800

    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

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 f678117a275e1fac27cddcec1fa09e2a8f7b4a4c
Author: Luolei <16657115156@163.com>
Date:   Thu Mar 28 11:49:02 2019 +0800

    黑色显示

commit 82c143f8a321b2187dfc37d4a4d9e3b65ee12318
Merge: dcc0a57 6ca80fb
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Mar 28 11:45:16 2019 +0800

    Merge branch 'dev/otherHis' into dev/new1

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 57d6b5d8507662933680c5dbe34b7eb2ac16ca51
Author: liucf <liucf@zjlantone.com>
Date:   Thu Mar 28 11:09:26 2019 +0800

    主诉普通多选事件处理调整;filterDataArr去掉空格

commit bcf167d459439711bf8483016fb82720aa0ac5d0
Author: Luolei <16657115156@163.com>
Date:   Thu Mar 28 11:05:02 2019 +0800

    拖拽弹窗拖拽关闭图标bug

commit 6cfcd758607d394e5a81b029224b2a91e774916b
Author: Luolei <16657115156@163.com>
Date:   Thu Mar 28 10:50:14 2019 +0800

    保存回读清除,诊断第一次的标记处理

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 6ca80fbfa9ca0589e4935d37a2d48bb63ba4882d
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Mar 28 10:07:50 2019 +0800

    查体添加血压bug修改,showInCheck相关

commit 30caaa8bf6ca6a3ac3db9e25ff3863e24235ab6f
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Mar 27 20:03:46 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

    模板连续标点处理

commit 1608a1bf2aff618cb9f8ac2cd9c345617ff1460a
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Mar 26 20:30:14 2019 +0800

    修改化验和检查第二行最多字数限制

# Conflicts:
#	src/common/components/Textarea/index.jsx
#	src/components/AddAssistCheck/index.jsx
#	src/components/AddInspect/index.jsx
#	src/components/CheckBody/index.jsx
#	src/components/DiagnosticList/index.less
#	src/components/NumberDrop/index.jsx
#	src/containers/CheckBody.js
#	src/containers/eleType.js
#	src/store/actions/checkBody.js
#	src/store/actions/currentIll.js
#	src/store/actions/diagnosticList.js
#	src/store/actions/mainSuit.js
#	src/store/actions/otherHistory.js
#	src/store/async-actions/homePage.js
#	src/store/async-actions/pushMessage.js
#	src/store/reducers/homePage.js
#	src/store/types/homePage.js
#	src/utils/tools.js
liucf 6 years ago
parent
commit
cb511e37ea
69 changed files with 682 additions and 269 deletions
  1. 3 2
      src/common/components/EditableSpan/index.jsx
  2. 2 1
      src/common/components/ItemBox/index.less
  3. 1 1
      src/common/components/Notify/index.less
  4. 4 3
      src/common/components/NumberPan/index.jsx
  5. 20 0
      src/common/components/NumberPan/index.less
  6. 2 2
      src/common/components/TailInlineTag/index.jsx
  7. 16 13
      src/common/components/Textarea/index.jsx
  8. 1 1
      src/components/AddAssistCheck/index.jsx
  9. 1 1
      src/components/AddInspect/index.jsx
  10. 13 0
      src/components/AssessResult/index.jsx
  11. 0 0
      src/components/AssessResult/index.less
  12. 10 9
      src/components/CheckBody/index.jsx
  13. 1 1
      src/components/CopyRight/index.jsx
  14. 5 4
      src/components/CurrentIll/index.jsx
  15. 3 2
      src/components/DiagnosticList/index.jsx
  16. 1 0
      src/components/DiagnosticList/index.less
  17. 12 6
      src/components/Inspect/index.jsx
  18. 1 0
      src/components/Inspect/index.less
  19. 3 2
      src/components/MainSuit/index.jsx
  20. 5 2
      src/components/MultSpread/index.jsx
  21. 53 26
      src/components/NumberDrop/index.jsx
  22. 2 2
      src/components/Operation/index.jsx
  23. 1 1
      src/components/PreviewBody/index.jsx
  24. 6 6
      src/components/PushItems/index.jsx
  25. 2 2
      src/components/RadioDrop/index.jsx
  26. 1 1
      src/components/Treat/DrugTreat/index.jsx
  27. 12 12
      src/components/Treat/index.jsx
  28. 7 0
      src/components/Treat/index.less
  29. 21 21
      src/components/TreatDesc/DrugInfo/index.jsx
  30. 17 10
      src/components/TreatDesc/DrugInfo/index.less
  31. 4 3
      src/components/TreatDesc/index.jsx
  32. 1 0
      src/components/TreatDesc/index.less
  33. 1 1
      src/containers/CheckBody.js
  34. 5 1
      src/containers/CurrentIll.js
  35. 1 1
      src/containers/Inspect.js
  36. 5 2
      src/containers/MainSuit.js
  37. 5 1
      src/containers/MultSpread.js
  38. 2 2
      src/containers/Multiple.js
  39. 4 1
      src/containers/NumberDrop.js
  40. 6 4
      src/containers/SpreadDrop.js
  41. 7 5
      src/containers/eleType.js
  42. 43 5
      src/store/actions/checkBody.js
  43. 67 6
      src/store/actions/currentIll.js
  44. 1 1
      src/store/actions/diagnosticList.js
  45. 16 8
      src/store/actions/mainSuit.js
  46. 57 8
      src/store/actions/otherHistory.js
  47. 6 0
      src/store/actions/treat.js
  48. 1 1
      src/store/async-actions/assistCheck.js
  49. 2 2
      src/store/async-actions/copyRight.js
  50. 1 1
      src/store/async-actions/diagnosticSearch.js
  51. 10 10
      src/store/async-actions/fetchModules.js
  52. 1 1
      src/store/async-actions/getInfoByUuid.js
  53. 1 1
      src/store/async-actions/historyTemplates.js
  54. 14 8
      src/store/async-actions/homePage.js
  55. 2 2
      src/store/async-actions/inspect.js
  56. 2 2
      src/store/async-actions/mainSuit.js
  57. 4 4
      src/store/async-actions/patInfo.js
  58. 2 2
      src/store/async-actions/print.js
  59. 5 5
      src/store/async-actions/pushMessage.js
  60. 5 5
      src/store/async-actions/tabTemplate.js
  61. 5 5
      src/store/async-actions/treat.js
  62. 5 1
      src/store/reducers/homePage.js
  63. 77 9
      src/store/reducers/inspect.js
  64. 4 2
      src/store/reducers/treat.js
  65. 2 1
      src/store/types/homePage.js
  66. 1 1
      src/store/types/treat.js
  67. 16 8
      src/utils/ajax.js
  68. 2 1
      src/utils/config.js
  69. 63 17
      src/utils/tools.js

+ 3 - 2
src/common/components/EditableSpan/index.jsx

@@ -224,8 +224,9 @@ class EditableSpan extends Component{
         }*/
         let data = innerVal.trim();
         //判断是否为空、中英文:, 。、;,且不是第一位
-        let pattern = new RegExp(/^\,?$|^\,?$|^\.?$|^\。?$|^\、?$|^\;?$|^\;?$|^\:?$|^\:?$|\s/);
-        if(index!==0 && pattern.test(data)){
+        // let pattern = new RegExp(/^\,?$|^\,?$|^\.?$|^\。?$|^\、?$|^\;?$|^\;?$|^\:?$|^\:?$|\s/);
+        // if(index!==0 && pattern.test(data)){
+        if(index!==0 && !config.punctuationReg.test(data)){
           // let preObj = $(this.$span.current).prev();
           let obj = preObj[0].nodeName=="DIV"?preObj.prev():preObj;
           handleKeydown&&handleKeydown({boxMark,i:index,text:data});

+ 2 - 1
src/common/components/ItemBox/index.less

@@ -24,10 +24,11 @@
     padding:5px;
     outline: none;
     border-bottom:1px @part-border-color dashed;
-    border-radius: 4px;
+    /*border-radius: 4px;*/
   }
   .border {
       border:1px @part-border-color dashed !important;
+      border-radius: 4px;
   }
   .noBorder{
     border: none;

+ 1 - 1
src/common/components/Notify/index.less

@@ -27,7 +27,7 @@
 .notify-text {
   min-width: 224px;
   height: 70px;
-  
+  padding:  0 40px 0 0;
   // overflow: hidden;
   position: relative;
   left: 66px;

+ 4 - 3
src/common/components/NumberPan/index.jsx

@@ -1,6 +1,7 @@
 import React,{Component} from 'react';
 import style from './index.less';
 import ReactDom from "react-dom";
+import backspace from '../../images/backspace.png'
 
 class NumberPan extends Component{
   constructor(props){
@@ -74,19 +75,19 @@ class NumberPan extends Component{
           <td><button onClick={select}>4</button></td>
           <td><button onClick={select}>5</button></td>
           <td><button onClick={select}>6</button></td>
-          <td><button onClick={this.handleBack.bind(this)}>回退</button></td>
+          <td><button onClick={this.handleBack.bind(this)}><img src={backspace} onClick={this.handleBack.bind(this)} /></button></td>
         </tr>
         <tr>
           <td><button onClick={select}>7</button></td>
           <td><button onClick={select}>8</button></td>
           <td><button onClick={select}>9</button></td>
-          <td><button onClick={this.handleClear.bind(this)}>清空</button></td>
+          <td><button onClick={this.handleClear.bind(this)} className={style['clearN']}>清空</button></td>
         </tr>
         <tr>
           <td><button onClick={select}>.</button></td>
           <td><button onClick={select}>0</button></td>
           <td><button onClick={select}>~</button></td>
-          <td><button onClick={this.handleClose.bind(this)}>确定</button></td>
+          <td><button onClick={this.handleClose.bind(this)} className={style['confirm']}>确定</button></td>
         </tr>
       </table>
       </div>

+ 20 - 0
src/common/components/NumberPan/index.less

@@ -21,4 +21,24 @@
   button:hover{
     border-color: @blue;
   }
+  .confirm{
+    color: #3B9ED0;
+    font-weight: bold;
+    text-align: center;
+    padding-left: 14px;
+    font-size: 14px;
+    line-height: normal;
+  }
+  .imgN{
+    text-align: right;
+    vertical-align: middle;
+    padding-right: 8px;
+    cursor: pointer;
+  }
+  .clearN{
+    color:#F6514A;
+    text-align: center;
+    padding-left: 8px;
+    font-weight: bold;
+  }
 }

+ 2 - 2
src/common/components/TailInlineTag/index.jsx

@@ -19,8 +19,8 @@ class TailInlineTag extends Component {
 
   handleClick(e){
     // e.stopPropagation(); //冒泡到最顶层关闭其他下拉
-    const {handleTailClick,questionMapping,id} = this.props;
-    handleTailClick && handleTailClick({questionMapping,id});
+    const {handleTailClick,questionMapping,id,relationModule} = this.props;
+    handleTailClick && handleTailClick({questionMapping,id,relationModule});
   }
 
   render(){

+ 16 - 13
src/common/components/Textarea/index.jsx

@@ -17,13 +17,14 @@ class Textarea extends Component {
     this.$dom = React.createRef();
     this.handleInput = this.handleInput.bind(this);
     this.handleFocus = this.handleFocus.bind(this);
-    this.handleBlur = this.handleBlur.bind(this);
+    //this.handleBlur = this.handleBlur.bind(this);
+    this.handleKeydown = this.handleKeydown.bind(this);
     this.handleKeydown = this.handleKeydown.bind(this);
   }
   handleFocus(){            //初始显示props中的值,focus已经显示输入的值,避免值更新闪烁
-    const {handleFocus,fuzhen,handleInput} = this.props;
+    const {handleFocus,fuzhen,handleInput,isChronic} = this.props;
     handleFocus&&handleFocus();         //其他史、查体获取数据的方法
-    if(fuzhen&&!(this.$dom.current.innerText?this.$dom.current.innerText:this.$dom.current.innerHTML)){
+    if(fuzhen&&!isChronic&&!(this.$dom.current.innerText?this.$dom.current.innerText:this.$dom.current.innerHTML)){
       const text = config.currentText.replace("(**)",fuzhen);
       this.$dom.current.innerText?(this.$dom.current.innerText = text):(this.$dom.current.innerHTML = text);
       handleInput&&handleInput({text});
@@ -36,7 +37,7 @@ class Textarea extends Component {
     const text = e.target.innerText || e.target.innerHTML;
     const stimer = this.state.timer;
     if(boxMark=='1'&&text.length>config.limited){           //主诉字符数限制
-      e.target.innerText?(e.target.innerText = text.substr(0,config.limited)):(e.target.innerHTML = text.substr(0,config.limited)); 
+      e.target.innerText?(e.target.innerText = text.substr(0,config.limited)):(e.target.innerHTML = text.substr(0,config.limited));
       e.target.blur();
       Notify.error(config.limitText);
       if(overFlag){
@@ -59,7 +60,7 @@ class Textarea extends Component {
     })
 
     //存值到store
-    // handleInput&&handleInput({text});
+    handleInput&&handleInput({text});
     //右侧推送--延时推送
     clearTimeout(stimer);
     let timer = setTimeout(function(){
@@ -70,6 +71,14 @@ class Textarea extends Component {
       timer
     });
   }
+  handleKeydown(e){
+    const {boxMark} = this.props;
+    const ev = e||window.event;
+    if(+boxMark==1){
+      //禁止回车事件
+      if(ev.keyCode==13){return false;}
+    }
+  }
   shouldComponentUpdate(next){
     if(JSON.stringify(next) == JSON.stringify(this.props)){
       return false;
@@ -78,14 +87,14 @@ class Textarea extends Component {
   }
   componentWillReceiveProps(next){
     const isRead = this.props.isRead;
-    if(next.isRead != isRead||next.value!=this.props.value){      //value对比解决复诊不显示bug
+    if(next.isRead != isRead||(next.value!=this.props.value&&next.value&&next.value.indexOf("复诊")!=-1)){    //value对比解决复诊不显示bug,复诊对比解决关标跳到前面bug
       this.$dom.current.innerText?(this.$dom.current.innerText = next.value||''):(this.$dom.current.innerHTML = next.value||'');
     }
   }
   componentDidMount(){
     const {value} = this.props;
     if(value){
-      this.$dom.current.innerText?(this.$dom.current.innerText = value||''):(this.$dom.current.innerHTML=value||'');
+      this.$dom.current.innerText?(this.$dom.current.innerText = value||''):(this.$dom.current.innerText=value||'');
     }
     if(isIE()){
       $(this.$dom.current).onIe8Input(function(e){
@@ -93,12 +102,6 @@ class Textarea extends Component {
       },this);
     }
   }
-  handleBlur(){
-    const {handleInput} = this.props;
-    const text = this.$dom.current.innerText||this.$dom.current.innerHTML;
-    //存值到store
-    handleInput&&handleInput({text});
-  }
   handleKeydown(e){
     const {boxMark} = this.props;
     const ev = e||window.event;

+ 1 - 1
src/components/AddAssistCheck/index.jsx

@@ -166,7 +166,7 @@ class AddAssistCheck extends React.Component {
                 {
                   this.getCommonList()
                 }
-              </div> 
+              </div>
             }
           </SearchOption> : ''}
         </div>

+ 1 - 1
src/components/AddInspect/index.jsx

@@ -350,7 +350,7 @@ class Inspect extends React.Component {
                   {
                     this.getCommonList()
                   }
-                </div> 
+                </div>
             }
           </SearchOption> : ''}
         </div>

+ 13 - 0
src/components/AssessResult/index.jsx

@@ -0,0 +1,13 @@
+import React, { Component } from "react";
+import style from "./index.less";
+
+class AssessResult extends Component{
+  constructor(props){
+    super(props);
+  }
+  render(){
+    return <div className={style['container']}>
+
+    </div>
+  }
+}

+ 0 - 0
src/components/AssessResult/index.less


+ 10 - 9
src/components/CheckBody/index.jsx

@@ -33,17 +33,22 @@ class CheckBody extends Component{
     const {data,showArr,saveText,selecteds,importLabel} = this.props;
     let arr = [],list=[];//console.log(data,saveText)
     const {boxMark,showAll} = this.state;
+    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>moreNum&&!moreText;
     let showArray = data.filter((it)=>{
       if(it.showInCheck)
         return it;
     });
-    const showData = this.props.showAll||showAll?[...data]:showArray;//[...data].splice(0,config.showCheckNum*2+1);
+    const showData = moreText||showAll?[...data]:showArray;//[...data].splice(0,config.showCheckNum*2+1);
     if(showData){
       list = showData;
       arr = list.map((it,i)=>{
         return chooseType({item:it,boxMark,i,showArr,saveText,selecteds,importLabel});
       });
     }
+    showMoreBtn&&arr.push(more);      //是否显示收起展开按钮
     return arr;
   }
   handleClick(e){//让搜索框跟随鼠标点击移动
@@ -109,23 +114,19 @@ class CheckBody extends Component{
     });
   }
   componentWillUpdate(next){
-    if(!this.props.isEmpty&&next.isEmpty){
+    if((this.props.defaultShowAll&&!next.defaultShowAll)||(!this.props.defaultShowAll&&next.defaultShowAll)||(!this.props.isEmpty&&next.isEmpty)){
       this.setState({
-        showAll:false
+        showAll:next.defaultShowAll
       })
     }
   }
   render(){
     const {searchData,totalHide,data,boxLeft,boxTop,saveText} = this.props;
-    const {showAll} = this.state;
-    const moreNum =config.showCheckNum*2+1;
-    const moreText = filterDataArr([...saveText].splice(moreNum));      //被收起的标签中是否有有值得,有则不能再收起
-    const more = this.props.showAll||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>moreNum&&!moreText;
+
     return  <div className={style['container']}>
       <ItemBox title='查体' handleClick={this.handleClick}>
         {this.getLabels()}
-        {showMoreBtn?more:''}
+        {/*{showMoreBtn?more:''}*/}
         {searchData && searchData.length>0?<SearchDrop data={searchData} show={!totalHide} left={boxLeft} top={boxTop} onSelect={this.handleSearchSelect}></SearchDrop>:''}
       </ItemBox>
     </div>

+ 1 - 1
src/components/CopyRight/index.jsx

@@ -59,7 +59,7 @@ class CopyRight extends Component {
   render() {
     const { number, date, content, copyVisible, disVisible, disContent, hasNewVersion } = this.props.copyRight;
     const { showCopyModal, closeCopyModal, showDisclatmerModal, closeDisclatmerModal } = this;
-    const copyContent = content.map(item => {
+    const copyContent = content&&content.map(item => {
       return (
         <div className={style['message']}>
           {item.title}

+ 5 - 4
src/components/CurrentIll/index.jsx

@@ -128,12 +128,12 @@ class CurrentIll extends Component{
   }
 
   getInlineTag(){  
-    const {data,showArr,selecteds,processModuleName,saveText,insertProcess,symptomIds} = this.props;
+    const {data,showArr,selecteds,processModuleName,saveText,insertProcess,symptomIds,allModules} = this.props;
     const boxMark = '2';
 
     let list = data&&data.map((item,i)=>{
-      if(item.relationModule && item.relationModule==3){
-        return <TailInlineTag {...item} showText={processModuleName} handleTailClick={(obj)=>{insertProcess(obj)}}></TailInlineTag>
+      if(item.flag && item.flag==3){
+        return <TailInlineTag {...item} showText={item.relationModuleName} handleTailClick={(obj)=>{insertProcess(obj,allModules)}}></TailInlineTag>
       }else {
         return chooseType({item,boxMark,i,hideTag:false,showArr,selecteds,saveText,mainIds:symptomIds});
       }
@@ -142,7 +142,7 @@ class CurrentIll extends Component{
   }
 
   render(){
-    const {fuzhen,type,fetchPushInfos,handleInput,isRead,saveText,searchData,totalHide,showArr,focusIndex,editClear,data,boxLeft,boxTop} = this.props;
+    const {fuzhen,isChronic,type,fetchPushInfos,handleInput,isRead,saveText,searchData,totalHide,showArr,focusIndex,editClear,data,boxLeft,boxTop} = this.props;
     const {showMoudle,forbidInput,boxMark,show} = this.state;
     const searchFlag = searchData.length > 0 ? true : false;
 
@@ -151,6 +151,7 @@ class CurrentIll extends Component{
                         isRead={isRead}
                         value={saveText[0]}
                         fuzhen={fuzhen}
+                        isChronic={isChronic}
                         handlePush={fetchPushInfos}
                         handleInput={handleInput}/>;
     }

+ 3 - 2
src/components/DiagnosticList/index.jsx

@@ -74,7 +74,7 @@ class DiagnosticList extends Component {
         })
     }
     showTreat(item, index) {
-        item.treatIndex = index
+        // item.treatIndex = index
         const  { showTreat, getTreatResult } = this.props;
         getTreatResult && getTreatResult(item);
         showTreat && showTreat();
@@ -157,7 +157,8 @@ class DiagnosticList extends Component {
                                     <span className={style['diag-name']} onClick={()=>{this.handleClickDiag(item)}}>{item.name}<span></span></span> 
                                     {item.type === 1 ? <span className={style['diag-first']}>初诊</span> :<span className={style['diag-second']}> 复诊</span>}
                                     <span className={style['treat']}
-                                          style ={{ color: hasTreat ?'' : 'gray', border: hasTreat ?'1px solid #3B9ED0' : '1px solid gray'}}
+                                        //   style ={{ color: hasTreat ?'' : 'gray', border: hasTreat ?'1px solid #3B9ED0' : '1px solid gray', cursor: hasTreat ? '' : 'text'}}
+                                          style ={hasTreat ? '' : { color: 'gray', border: '1px solid gray', cursor: 'auto'}}
                                           onClick={() =>{hasTreat && this.showTreat(item, index)}}>
                                           治疗方案
                                     </span>

+ 1 - 0
src/components/DiagnosticList/index.less

@@ -101,6 +101,7 @@
 .diag-up, .diag-down, .diag-del {
     width: 20px;
     margin-bottom: 4px;
+    cursor: pointer;
 }
 .confirm-info {
     height: 70px;

+ 12 - 6
src/components/Inspect/index.jsx

@@ -6,8 +6,8 @@ import { getExcelList } from '@store/actions/inspect';
 import Notify from '@commonComp/Notify';
 import store from '@store';
 import $ from 'jquery';
-import { host } from '@utils/config.js';
-import {isIE} from '@utils/tools.js';
+import { host,prefix } from '@utils/config.js';
+import {isIE,getUrlArgObject} from '@utils/tools.js';
 
 
 (function ($) {
@@ -27,9 +27,9 @@ import {isIE} from '@utils/tools.js';
 import "./dists/FileAPI.js";
 
 const isLocal = window.location.hostname.indexOf('localhost')!=-1;
-const qhost = isLocal?host:'';
+const qhost = isLocal?host+prefix:prefix;
 const api = {
-    upload: qhost+'/api/icss/lisExcelRes/lisExcelAnalysis'
+    upload: qhost+'/lisExcelRes/lisExcelAnalysis'
 };
 
 class Inspect extends React.Component {
@@ -78,13 +78,19 @@ class Inspect extends React.Component {
             },
             function (files, rejected){
                 if( files.length ){
-                    console.log(files[0])
+                    //console.log(files[0])
+                  const securityCode = getUrlArgObject("code");
+                  const appKeyId = getUrlArgObject("appI");
+                  const appKeySecret = getUrlArgObject("appS");
                     FileAPI.upload({
                         // url: '/api/icss/lisExcelRes/lisExcelAnalysis',
                         url: api.upload,
                         data:{ hospitalCode:baseData == '{}'? '' : baseData.hospitalCode },
                         files: { uploadfile: files[0] },
                         headers:{
+                          appKeyId:appKeyId,
+                          appKeySecret:appKeySecret,
+                          securityCode:securityCode
                             // 'Content-Type':'Content-Type: multipart/form-data'
                             // 'Content-Type':'application/json;charset=UTF-8'
                             // 'Content-type': "text/plain"
@@ -97,7 +103,7 @@ class Inspect extends React.Component {
                                 let message = res.data.messages;
                                 store.dispatch(getExcelList(res.data));
                                 fetchPushInfos&&fetchPushInfos();
-                                if (message.length != 0) {
+                                if (message&&message.length != 0) {
                                     that.setState({
                                         visible:true,
                                         dom:message,

+ 1 - 0
src/components/Inspect/index.less

@@ -40,6 +40,7 @@
         line-height: 28px;
         border-radius: 5px;
         color: @template-color;
+        cursor: pointer;
     }
 }
 .title {

+ 3 - 2
src/components/MainSuit/index.jsx

@@ -49,11 +49,12 @@ class MainSuit extends Component{
 
 
   getInlineTag(){
-    const {datas,showArr,handleTailClick,selecteds,saveText,addModuleName,mainIds} = this.props;
+    const {datas,showArr,handleTailClick,selecteds,saveText,addModuleName,mainIds,allModules} = this.props;
     const boxMark = '1';
     let list = datas&&datas.map((item,i)=>{
       if(item.flag && item.flag==3){
-        return <TailInlineTag {...item} showText={addModuleName} handleTailClick={(obj)=>{handleTailClick(obj,saveText)}}></TailInlineTag>
+        /*return <TailInlineTag {...item} showText={addModuleName} handleTailClick={(obj)=>{handleTailClick(obj,saveText)}}></TailInlineTag>*/
+        return <TailInlineTag {...item} showText={item.relationModuleName} handleTailClick={(obj)=>{handleTailClick(obj,saveText,allModules)}}></TailInlineTag>
       }else {
         return chooseType({item,boxMark,i,hideTag:false,showArr,selecteds,saveText,mainIds});
       }

+ 5 - 2
src/components/MultSpread/index.jsx

@@ -55,6 +55,7 @@ class MultSpread extends Component{
         case +it.controlType===1:
           const list = it.questionDetailList&&it.questionDetailList.length>0?it.questionDetailList:it.questionMapping;
           return <RadioDrop data={list}
+                            boxMark={boxMark}
                             prefix={it.labelPrefix}
                             suffix={it.labelSuffix}
                             placeholder={it.name}
@@ -98,11 +99,13 @@ class MultSpread extends Component{
                             id={it.id}
                             ikey={inx} hideTag={true}></InlineTag>;
         case +it.controlType===7:
+          const min = data.minValue!=null&&data.minValue!=undefined?data.minValue-1:undefined;
+          const max = data.maxValue!=null&&data.maxValue!=undefined?+data.maxValue+1:undefined;
           return <NumberDrop prefix={it.labelPrefix}
                              suffix={it.labelSuffix}
                              placeholder={it.name}
-                             min={it.minValue}
-                             max={it.maxValue}
+                             min={min}
+                             max={max}
                              show={show}
                              allClick={false}
                              ikey={inx}

+ 53 - 26
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){        //选中键盘上数字事件
@@ -54,14 +54,17 @@ class NumberDrop extends Component{
     }else{
       //console.log(text,isNaN(+text),max<+text)
       if(needCompare){
-        if(!isNaN(+text)&&max<+text){     //数值过大
+        /*if(text!=''&&(isNaN(+text)||max<+text)){    //数值过大
           this.beyondArea();
           return;
-        }
+        }*/
         const that = this;
+        const isFine = this.validSymbols(text,min,max);      //有~或/时是否合理
+        const hasSymbol = /[\/|\~]/g.test(text);           //是否有~或/
+        const singleFine = !isNaN(+text)&&max!=undefined&&min<text&&text<max;   //无~或/时是否合理
         timer = setTimeout(function(){
           clearTimeout(that.state.sltTimer);
-          if(!that.props.show&&!isNaN(+text)&&min>+text){
+          if(text!=''&&(!hasSymbol&&!singleFine)||(hasSymbol&&!isFine)){
             that.beyondArea();
             return;
           }
@@ -77,7 +80,7 @@ class NumberDrop extends Component{
   }
   beyondArea(){
     const {handleSelect,ikey,suffix,prefix,mainSaveText} = this.props;
-    Notify.info("数值在正常值范围内,请重新输入");
+    Notify.info("输入数值不符合规范,请重新输入!");
     handleSelect&&handleSelect({ikey,text:'',suffix,prefix,mainSaveText});
     this.setState({
       placeholder:this.props.placeholder,
@@ -132,18 +135,48 @@ class NumberDrop extends Component{
     }
     e.stopPropagation();
   }
+  validSymbols(txt,min,max){
+    //输入只有一个~或/时判断两边是否为合理数字,有多个为不合理
+    const index1 = txt.indexOf('~');
+    const index2 = txt.indexOf('/');
+    let arr1=[],arr2=[];
+    if(index1!=-1&&index1==txt.lastIndexOf('~')&&index1!=txt.length-1){   //有且只有一个~,且不在最后
+      arr1 = txt.split('~');
+      //~的范围在合理范围内为合理值
+      if(!isNaN(+arr1[0])&&!isNaN(+arr1[1])&&+arr1[0]>min&&+arr1[1]<max){
+        return true
+      }
+      return false;
+    }
+    if(index2!=-1&&index2==txt.lastIndexOf('/')&&index2!=txt.length-1){   //有且只有一个~,且不在最后
+      arr2 = txt.split('/');
+      // /两边的数字分别在合理范围内为合理值
+      if(!isNaN(+arr2[0])&&!isNaN(+arr2[1])&&min<arr2[0]&&arr2[0]<max&&min<arr2[1]&&arr2[1]<max){
+        return true
+      }
+      return false;
+    }
+    return false;
+  }
   numInpBlur(e){        //数字框失焦,保存值到store中
     e.stopPropagation();
     const {handleSelect,ikey,suffix,prefix,mainSaveText,min,max,show} = this.props;
     if(show){      //修改清空后第一次点击键盘不触发click事件bug
       return;
     }
-    //输入超出合理范围提示且清空
-    const txt = e.target.innerText.replace(/^\s*/,'');
-    if(max!=undefined&&!isNaN(+txt)&&(min>+txt||max<+txt)){
-      this.beyondArea();
-      return;
+    //输入超出合理范围或输入不是数字提示且清空
+    const needCompare=min!=undefined&&max!=undefined;
+    if(needCompare){
+      const txt = e.target.innerText.trim();
+      const isFine = this.validSymbols(txt,min,max);      //有~或/时是否合理
+      const hasSymbol = /[\/|\~]/g.test(txt);           //是否有~或/
+      const singleFine = !isNaN(+txt)&&min<txt&&txt<max;   //无~或/时是否合理
+      if(txt!=''&&(!hasSymbol&&!singleFine)||(hasSymbol&&!isFine)){
+        this.beyondArea();
+        return;
+      }
     }
+
     //输入为空时显示placeholder
     if(!e.target.innerText.trim()){
       this.setState({
@@ -151,24 +184,18 @@ class NumberDrop extends Component{
       });
     }
 
-    /*this.setState({
-      hasSelect:false
-    });*/
-    const val = e.target.innerText.replace(/^\s*/,'');
+    const val = e.target.innerText.trim();
     const {placeholder} = this.state;
-    let text = val===placeholder?'':val.replace(/[\u4e00-\u9fa5]/g,'');
-    e.target.innerText = '';      //避免出现重复输入值
+    let text = val===placeholder?'':val;
+    //e.target.innerText = '';      //避免出现重复输入值
     handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
   }
   handleSpanInp(e){   //数字框输入事件
     e.stopPropagation();
     const {handleHide} = this.props;
-    /*this.setState({     //再键盘点击数字要清空
-      hasSelect:false
-    });*/
     handleHide&&handleHide();
   }
-  handleKeyDowm(e){
+  /*handleKeyDowm(e){
     handleEnter();
     //只能输入数字
     const key = e.key;
@@ -178,7 +205,7 @@ class NumberDrop extends Component{
       e.preventDefault();
       return false;
     }
-  }
+  }*/
   getClasses(){         //整个标签是否有值的状态
     const {hideTag,placeholder,value,isImports} = this.props;
     const $span = this.$span.current;
@@ -213,10 +240,10 @@ class NumberDrop extends Component{
     this.setState({
       editable: false
     });
-    let totalVal = e.target.innerText;
-    let changeVal = this.$span.current.innerText.replace(/^\s*/,'');//数字框值-修改后;去掉前空格避免多空格叠加
-    let prefix = this.$pre.current.innerText.replace(/^\s*/,''); //前缀值-修改后
-    let suffix = this.$suf.current.innerText.replace(/^\s*/,''); //后缀值-修改后
+    let totalVal = e.target.innerText.trim();
+    let changeVal = this.$span.current.innerText.trim();//数字框值-修改后;去掉前空格避免多空格叠加
+    let prefix = this.$pre.current.innerText.trim(); //前缀值-修改后
+    let suffix = this.$suf.current.innerText.trim(); //后缀值-修改后
     //console.log('数字框:'+changeVal,";全部:"+totalVal,";前缀:"+prefix+";后缀:"+suffix);
     handleLabelChange && handleLabelChange({ikey,changeVal,type:boxMark,totalVal,prefix,suffix});
   }
@@ -249,7 +276,7 @@ class NumberDrop extends Component{
             onBlur={this.numInpBlur}
             onInput={this.handleSpanInp}
             className={this.getSpanClass()}
-            onkeydown={this.handleKeyDowm}>&nbsp;{value||placeholder}</span>
+            >&nbsp;{value||placeholder}</span>
       <span ref = {this.$suf}>&nbsp;{suffix}</span>
       <NumberPan handleSelect={(text)=>this.select(text)}
                  onClose={handleHide}

+ 2 - 2
src/components/Operation/index.jsx

@@ -166,7 +166,7 @@ class Operation extends Component {
       return false
     }
     console.log(jsonStr,'文本')
-    console.log(jsonData.chief,'结构')       //测试需要用到,不要删了
+    console.log(jsonData,'结构')       //测试需要用到,不要删了
     for(let i = 0;i <tmpLis.length;i++){
       let dataStr = tmpLis[i].preview;
       let dataJson = tmpLis[i].dataJson;
@@ -346,4 +346,4 @@ class Operation extends Component {
   }
 }
 
-export default Operation;
+export default Operation;

+ 1 - 1
src/components/PreviewBody/index.jsx

@@ -241,7 +241,7 @@ class PreviewBody extends Component {
                     return <table style={{ margin: '8px 0', width: '100%' }}>
                       {
                         item.show?<tr style={{ fontSize: '14px', lineHeight: '1.5' }}><td><span style={{ borderBottom: '1px solid #666666' }}> {item.name} </span></td></tr>:
-                        <tr style={{ fontSize: '14px', lineHeight: '1.5' }}><td><span style={{ color: '#767676',position:'relative',left:'-10px' }}>「{item.name}」</span></td></tr>
+                        <tr style={{ fontSize: '14px', lineHeight: '1.5' }}><td><span style={{ position:'relative',left:'-10px' }}>「{item.name}」</span></td></tr>
                       }
                       {
                         item.details.map((val) => {

+ 6 - 6
src/components/PushItems/index.jsx

@@ -336,7 +336,7 @@ class PushItems extends Component {
       assayNum = assayNum + item.name.length + 2;
       if (assayNum > 28) {
         assayNum2 = assayNum2 + item.name.length + 2; 
-        if(assayNum2 > 23) {
+        if(assayNum2 > 21) {
           return;
         } else {
           return (
@@ -388,7 +388,7 @@ class PushItems extends Component {
       checkNum = checkNum + item.name.length + 2;
       if (checkNum > 28) {
         checkNum2 = checkNum2 + item.name.length + 2; 
-        if(checkNum2 > 23) {
+        if(checkNum2 > 21) {
           return;
         }else {
           return (
@@ -510,7 +510,7 @@ class PushItems extends Component {
                           : moreAssay
                           ? assays
                           : assayHide}
-                        {assayNum2 > 23 ? (
+                        {assayNum2 > 21 ? (
                           <span
                             style={
                               moreAssay
@@ -548,7 +548,7 @@ class PushItems extends Component {
                           : moreCheck
                           ? checks
                           : checkHide}
-                        {checkNum2 > 23 ? (
+                        {checkNum2 > 21 ? (
                           <span
                             style={
                               moreCheck
@@ -618,7 +618,7 @@ class PushItems extends Component {
                               />
                               {item.isReason === 1 && (
                                 <div className={style["warn"]}>
-                                  {tipsDiscalimer.data.data[0].description}
+                                  {tipsDiscalimer.data.data[0]&&tipsDiscalimer.data.data[0].description}
                                 </div>
                               )}
                             </div>
@@ -633,7 +633,7 @@ class PushItems extends Component {
             </div>
           </div>
         </div>
-        {tipsDiscalimer.data && <div className={style['disTips']} dangerouslySetInnerHTML={{__html: tipsDiscalimer.data.data[1].description}}></div>}
+        {tipsDiscalimer.data && <div className={style['disTips']} dangerouslySetInnerHTML={{__html: tipsDiscalimer.data.data[1]&&tipsDiscalimer.data.data[1].description}}></div>}
         {showTipsDetails && <DetailsModal  
             showTipsDetails = {showTipsDetails}
             hideTips = {this.hideTips}

+ 2 - 2
src/components/RadioDrop/index.jsx

@@ -101,14 +101,14 @@ class RadioDrop extends Component{
     },$("#addScrollEvent")[0])
   }
   componentDidMount(){    //默认值选中
-    const {data,ikey,handleSelect,hideTag} = this.props;
+    const {data,ikey,handleSelect,hideTag,mainSaveText,value} = this.props;
     const selected = data.find((it)=>{
       return it.selected === undefined&&+it.defaultSelect===1;
     });
     if(!hideTag&&selected){
       // const text = selected.labelPrefix+selected.name+selected.labelSuffix;
       const text = selected.name;
-      handleSelect&&handleSelect({ikey,id:selected.id,text});
+      handleSelect&&handleSelect({ikey,id:selected.id,text,mainSaveText,value});
     }
   }
   handleEditLabel(e){

+ 1 - 1
src/components/Treat/DrugTreat/index.jsx

@@ -78,7 +78,7 @@ class DrugTreat extends Component {
     }
     showTreatDesc() {
         $('#treatDescBox').css({'display': 'block'});
-        $('#treatWrapper').animate({'margin-left': '-470px'}, 300);
+        $('#treatWrapper').animate({'margin-left': '-471px','left':'50%'}, 300);
         $('#treatDescBox').animate({'width': '260px'}, 500);
         
     }

+ 12 - 12
src/components/Treat/index.jsx

@@ -15,7 +15,7 @@ class Treat extends Component {
     constructor(props){
         super(props);
         this.state = {
-          zIndex:301
+          zIndex:301,
         }
         this.hideTreat = this.hideTreat.bind(this);
         this.handlePrescription = this.handlePrescription.bind(this);
@@ -27,9 +27,10 @@ class Treat extends Component {
     }
     
     hideTreat() {
-        const { hideTreat,clearTreat } = this.props;
+        const { hideTreat,clearTreat, hideDrugInfo } = this.props;
         clearTreat && clearTreat();
         hideTreat && hideTreat();
+        hideDrugInfo && hideDrugInfo();
         // windowRemoveEventHandler('mousemove',handleMove,document)
     }
     handlePrescription() {
@@ -45,21 +46,20 @@ class Treat extends Component {
         const {  showDrugInfo } = this.props;
         showDrugInfo && showDrugInfo();
     }
-    setTreatBox(idx){
-      this.setState({
-        zIndex:idx == 300?300 : 500
-      })
+    setTreatBox(){
+      $('#treatWrapper').css({'z-index': 302});
+      $('#drugWrapper').css({'z-index': 301});
     }
     render(){
-        const { generalTreat, treatment, treatItem, surgeryTreat, selectDrug, drugInfo, treatDesc, setOtherRecommend, setDrugInfo, showDrug, showDrugInfo,hideDrugInfo, title, drugInfoList, hideDrugInfoMore} = this.props;
-        const { setDrugInfoMore } = this.props
-        const { zIndex } = this.state
+        const {setDrugInfoMore,treatIndex,treatIndexSet, generalTreat, treatment, treatItem, surgeryTreat, selectDrug, drugInfo, treatDesc, setOtherRecommend, setDrugInfo, showDrug, showDrugInfo,hideDrugInfo, title, drugInfoList, hideDrugInfoMore} = this.props;
+        const { zIndex,show } = this.state
         return(
             <div   className={style['treat-wrapper']}>
                 <div className={style['treat-mask']} onClick={this.hideTreat}>
                 </div>
-                <div id="treatWrapper" className={style['treat-box']}  onselectstart="return false" style={{zIndex:zIndex}}>
-                    <div onMouseDown={this.setTreatBox} id="dragTreatTitle" className={style['treat-title']}>治疗方案 ({treatItem.name})<img onClick={this.hideTreat} src={close}/></div>
+                <div id="treatWrapper" className={style['treat-box']}  onselectstart="return false">
+                    <img className={style.close} onClick={this.hideTreat} src={close}/>
+                    <div onMouseDown={this.setTreatBox} id="dragTreatTitle" className={style['treat-title']}>治疗方案 ({treatItem.name})</div>
 
                     <div className={style['treat-inner-box']}>
                         <GeneralTreat icon={generalIcon} title='一般治疗'   generalTreat={generalTreat}></GeneralTreat>
@@ -87,7 +87,7 @@ class Treat extends Component {
                     </TreatDesc>}
                 </div>
                 
-                {showDrug && drugInfo && <DrugInfo setTreatBox={this.setTreatBox} drugInfo = {drugInfo} hideDrugInfo = {hideDrugInfo}></DrugInfo>}
+                {showDrug && drugInfo && <DrugInfo setTreatBox={this.setTreatBox} treatIndexSet={treatIndexSet} drugInfo = {drugInfo} hideDrugInfo = {hideDrugInfo}></DrugInfo>}
                 {/* 查询多个药品说明书 (添加数据查看药品说明书用)*/}
                 {/* {showDrug && <DrugInfo drugInfoList = {drugInfoList} hideDrugInfoMore = {hideDrugInfoMore}></DrugInfo>} */}
             </div>

+ 7 - 0
src/components/Treat/index.less

@@ -14,6 +14,12 @@
     // z-index: 301;
     z-index: 300;
 }
+.close {
+  position: absolute;
+  z-index:9999;
+  top: 0;
+  right: 0;
+}
 .treat-mask {
     position: fixed;
     width: 100%;
@@ -37,6 +43,7 @@
     z-index: 301;
     padding-top: 40px;
     padding-bottom: 80px;
+    box-shadow: 0px 0px 5px -2px #7d7c7c;
 }
 .treat-title {
     width: 100%;

+ 21 - 21
src/components/TreatDesc/DrugInfo/index.jsx

@@ -10,7 +10,7 @@ class DrugInfo extends Component {
         super(props);
         this.state = {
             currentIndex: 0,
-            zIndex:301
+            zIndex:302
         }
         this.setDragBox = this.setDragBox.bind(this)
     }
@@ -47,37 +47,37 @@ class DrugInfo extends Component {
         }
     }
     setDragBox(){
-      const {zIndex,setTreatBox} = this.props
-      setTreatBox(300)
-      this.setState({
-        zIndex:zIndex+10
-      })
+      $('#treatWrapper').css({'z-index': 301});
+      $('#drugWrapper').css({'z-index': 302});
     }
     render() {
         const { drugInfo, hideDrugInfo, drugInfoList,hideDrugInfoMore } = this.props
-        const { currentIndex,zIndex } = this.state
-        return (<div className={style['drug-info-wrapper']} id="drugWrapper" style={{zIndex:zIndex}}>
-                <h3 onMouseDown={this.setDragBox} id="drugTitle" className={style['drug-title']}>{drugInfo.title}说明书  <img src={close} onClick={hideDrugInfo} className={style['close-drug-desc']}/> </h3>
+        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>
                 { 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>
                     {drugInfo.drugDesc.map((item, index) =>{
                         return <div className={style['drug-desc-item']} id={item.title.trim()}>
-                            <span className={style['drug-desc-title']} >{item.title.trim()}</span> 
+                            <div className={style['drug-desc-title']} >{item.title.trim()}</div> 
                             <div className={style['drug-desc-content']} dangerouslySetInnerHTML ={{__html: item.content}}></div> 
                         </div>
                     })}
                     <div className={style['content-menu-box']}>
-                        <div className={style['content-menu']}>
-                            {drugInfo.drugDesc.map((item, index) => {
-                                return (<div >
-                                    <div className={style['details-menu-title-box']}>
-                                        {index === 0 ? '' : <div className={style['details-content-menu-line']}></div>}
-                                        <span onClick={this.handleClickMenu.bind(this, index, item, drugInfo.drugDesc)} className={style['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
-                                            <span className={style['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
-                                        </span>
-                                    </div>
-                                </div>)
-                            })}
+                        <div className={style['content-menu-wrapper']}>
+                            <div className={style['content-menu']}>
+                                {drugInfo.drugDesc.map((item, index) => {
+                                    return (<div >
+                                        <div className={style['details-menu-title-box']}>
+                                            {index === 0 ? '' : <div className={style['details-content-menu-line']}></div>}
+                                            <span onClick={this.handleClickMenu.bind(this, index, item, drugInfo.drugDesc)} className={style['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
+                                                <span className={style['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
+                                            </span>
+                                        </div>
+                                    </div>)
+                                })}
+                            </div>
                         </div>
                     </div>
                 </div> }

+ 17 - 10
src/components/TreatDesc/DrugInfo/index.less

@@ -9,7 +9,7 @@
     background: #fff;
     z-index: 303;
     padding: 40px 0 60px;
-    
+    box-shadow: 0px 0px 5px -2px #7d7c7c;
 }
 .drug-desc-wrapper {
     height: 100%;
@@ -36,6 +36,8 @@
 .close-drug-desc {
     position: absolute;
     right: 0;
+    top: 0;
+    z-index: 9999;
     width: 40px;
 }
 .drug-desc-item {
@@ -53,11 +55,11 @@
     display: inline-block;
     font-weight: bold;
     font-size: 14px;
-    height: 100%;
-    float: left;
-    width: 190px;
-    text-align-last:justify;    /*chrome*/
-    text-justify: distribute;   /*ff*/
+    // height: 100%;
+    // float: left;
+    // width: 190px;
+    // text-align-last:justify;    /*chrome*/
+    // text-justify: distribute;   /*ff*/
 }
 .drug-desc-title::before {
     content: '【'
@@ -74,16 +76,21 @@
 }
 .drug-desc-content {
     /*width: 100%;*/
-    margin-left: 210px;
-    margin-right: 160px;
+    margin: 0px 160px 0px 10px;
 }
 
 .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 {

+ 4 - 3
src/components/TreatDesc/index.jsx

@@ -25,11 +25,11 @@ class TreatDesc extends Component {
     }
 
     handleMouseEnterDrug( index, item) {
-        console.log('item', item)
+        // console.log('item', item)
         const drugNameWidth = parseInt($('#'+item.medicitionName)[0].offsetWidth)
         
         const imgLeft = drugNameWidth/2-10
-        console.log('imgLeft', imgLeft)
+        // console.log('imgLeft', imgLeft)
         $('#'+item.medicitionName).find('img').css('left', imgLeft)
        
         this.setState({
@@ -58,7 +58,8 @@ class TreatDesc extends Component {
     hideTreatDesc() {
         $('#treatDescBox').css({'display': 'none'});
         $('#treatDescBox').animate({'display': 'none'}, 500);
-        $('#treatWrapper').animate({'margin-left': '-340px'}, 500);
+        $('#treatWrapper').animate({'margin-left': '-340px','left':'50%'}, 500);
+        
     }
 
     render(){

+ 1 - 0
src/components/TreatDesc/index.less

@@ -45,6 +45,7 @@
     top: 0;
     background: #fff;
     padding: 60px 20px 80px;
+    box-shadow: 2px 0px 5px -2px #7d7c7c;
 }
 .drug-name-box {
     display: inline-block;

+ 1 - 1
src/containers/CheckBody.js

@@ -11,7 +11,7 @@ function mapStateToProps(state){
   const hasMain = filterDataArr(mainSuit.saveText);//||mainSuit.data.length;
   return {
     data:checkBody.data,
-    showAll:checkBody.showAll,
+    defaultShowAll:checkBody.showAll,
     isEmpty:checkBody.isEmpty,
     update:checkBody.update,   //用于触发更新
     showArr:homePage.showDrop,

+ 5 - 1
src/containers/CurrentIll.js

@@ -41,6 +41,8 @@ function mapStateToProps(state) { //console.log(111,state);
         fuzhen:state.diagnosticList.mainSuitStr,//诊断第一个复诊值
         boxTop:state.homePage.boxTop,
         boxLeft:state.homePage.boxLeft,
+        allModules:state.homePage.allModules,
+        isChronic:!!state.diagnosticList.chronicMagItem
 
     }
 }
@@ -48,7 +50,7 @@ function mapStateToProps(state) { //console.log(111,state);
 
 function mapDispatchToProps(dispatch) {
     return {
-       insertProcess(obj){//点击病程变化
+       insertProcess(obj,allModules){//点击病程变化
         // 埋点dispatch
         dispatch({
           type:CLICKCOUNT,
@@ -58,6 +60,8 @@ function mapDispatchToProps(dispatch) {
         });
         dispatch({
           type:INSERT_PROCESS,
+          id:obj.relationModule,
+          allModules:allModules
         });
         dispatch({
           type:ISREAD

+ 1 - 1
src/containers/Inspect.js

@@ -4,7 +4,7 @@ import Inspect from '@components/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) {
+function mapStateToProps(state) {//console.log(state)
     return {
         list:state.inspect.list,
         labelList:state.inspect.labelList,

+ 5 - 2
src/containers/MainSuit.js

@@ -37,6 +37,7 @@ function mapStateToProps(state) {//console.log(11,state);
     boxTop:state.homePage.boxTop,
     boxLeft:state.homePage.boxLeft,
     currentData:state.currentIll.data,
+    allModules:state.homePage.allModules,
   }
 }
 
@@ -55,7 +56,7 @@ function mapDispatchToProps(dispatch) {
             type: CLEAR_COMSYMPTOMS
           })
         },
-        handleTailClick:(obj,saveText)=>{//点击带尾巴的标签,如添加病程变化
+        handleTailClick:(obj,saveText,allModules)=>{//点击带尾巴的标签,如添加病程变化
           let text = filterDataArr(saveText);
           if(text.length >= config.limited){
             Notify.info(config.limitText);
@@ -70,7 +71,9 @@ function mapDispatchToProps(dispatch) {
           });
           dispatch({
             type: SHOW_TAIL,
-            info:obj.questionMapping
+            info:obj.questionMapping,
+            id:obj.relationModule,
+            allModules:allModules
           })
           dispatch({
             type:ISREAD

+ 5 - 1
src/containers/MultSpread.js

@@ -5,7 +5,7 @@ import {SETSELECTED,CLEARSELECTED,CONFIRMSELECTED,CHANGEOTHERTEXTLABEL,OTHERADDL
 import {CHANGECHECKTEXTLABEL,ADDLABELITEM} from '@types/checkBody.js';
 import {CHANGE_LABELVAL,MAINADDLABELITEM} from '@store/types/mainSuit.js';
 import {CURRENTADDLABELITEM} from '@store/types/currentIll.js';
-import {HIDE,RESET,CLICKCOUNT,SETADDITEMINIT} from '@store/types/homePage.js';
+import {HIDE,RESET,CLICKCOUNT,SETADDITEMINIT,ISREAD} from '@store/types/homePage.js';
 
 function mapStateToProps(state){
   return {}
@@ -27,6 +27,10 @@ const getCopyData = (copyId,inx,boxMark)=>{
       data:JSON.stringify(copy),
       i:inx
     });
+    //自由文本组件更新
+    dispatch({
+      type:ISREAD
+    })
   }
 };
 

+ 2 - 2
src/containers/Multiple.js

@@ -32,7 +32,7 @@ function handleCurrent(dispatch,params){
   const index = getLabelIndex(ikey);
   dispatch({
     type:CURRENT_MUL,
-    data:{seleData,seleId,ikey:index}
+    data:{seleData,seleId,ikey:index,fullIkey:ikey}
   })
 }
 
@@ -41,7 +41,7 @@ function handleOtherHis(dispatch,params){
   const index = getLabelIndex(ikey);
   dispatch({
     type:OTHERHIS_MUL,
-    data:{seleData,seleId,ikey:index}
+    data:{seleData,seleId,ikey:index,fullIkey:ikey}
   })
 }
 

+ 4 - 1
src/containers/NumberDrop.js

@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 import NumberDrop from "@components/NumberDrop";
 import {SETNUMBER,CHANGEOTHERTEXTLABEL,CHANGEOTHERTEXTLABEL_NUMBER} from '@types/otherHistory';
 import {SETNUMBER4,CHANGECHECKTEXTLABEL,CHANGECHECKTEXTLABEL_NUMBER} from '@types/checkBody.js';
-import {SETDROPSHOW,CLICKCOUNT,HIDE,RESET,HIDEDROP} from '@types/homePage.js';
+import {SETDROPSHOW,CLICKCOUNT,HIDE,RESET,HIDEDROP,ISREAD} from '@types/homePage.js';
 import {NUMBER_SELECT,CHANGE_LABELVAL,CHANGE_LABELVAL_NUMBER} from '@store/types/mainSuit.js';
 import {getLabelIndex} from '@common/js/func.js';
 import {CURRENT_NUMBER,CURRENT_TEXT_LABEL,CURRENT_TEXT_LABEL_NUMBER} from '@store/types/currentIll.js';
@@ -90,6 +90,9 @@ function currentLabel(dispatch,params){
     // type:CURRENT_TEXT_LABEL,
     type:CURRENT_TEXT_LABEL_NUMBER,
     data:Object.assign({},params,{ikey})
+  });
+  dispatch({
+    type:ISREAD
   })
 }
 

+ 6 - 4
src/containers/SpreadDrop.js

@@ -205,7 +205,7 @@ function otherHisConfirm(dispatch,store,params){
       });
       dispatch({
         type: CONFIRMSELECTED,
-        data: {exists:fullfillText(has,false,false).newArr,withs:fullfillText(wes,false,false).newArr,nones:nones,ikey,copyType}
+        data: {exists:fullfillText(has,false,true).newArr,withs:fullfillText(wes,false,true).newArr,nones:nones,ikey,copyType}
       });
       dispatch({
         type:ISREAD
@@ -292,8 +292,10 @@ function handleModuleDiff(dispatch,store,params){
 
 //主诉普通多选确定
 function mainSuitCheck(dispatch,store,params){
-  const {nones,exists,withs,order,mainSaveText,value} = params;
+  const {nones,exists,withs,order,mainSaveText,value,ikey} = params;
   let existsName = getNames(exists,order);
+  let withsName = getNames(withs);
+  let labelInx = getLabelIndex(ikey);
   let text = filterDataArr(mainSaveText);
   /*if(text.length >= config.limited){
     Notify.info(config.limitText);
@@ -305,8 +307,8 @@ function mainSuitCheck(dispatch,store,params){
     Notify.info(config.limitText);
     return
   }
-  const index = params.ikey;
-  let ikey = getLabelIndex(index);
+  // const index = params.ikey;
+  // let ikey = getLabelIndex(index);
   dispatch({
     type: COMM_CONFIRM,
     // data: {exists:exists,existsName:existsName,ikey}

+ 7 - 5
src/containers/eleType.js

@@ -19,15 +19,16 @@ import Multiple from '@containers/Multiple';
  * *******/
 //单选类型
 export function singleRadio(params){
-  const data = params.item;//console.log(111,data);
+  const data = params.item;
   const {i,hideTag,boxMark,showArr,selecteds,boxTop,boxLeft,importLabel} = params;
   let isHigh=importLabel&&importLabel.includes(data.id);
   const showInx = boxMark+i+'0';    //单括号多标签的情况下需要识别同一个标签内多个下拉组件的显示状态
   switch (+data.controlType){
     case 0:
     case 1:
+      const custom= JSON.parse(localStorage.getItem('radio'+data.id));
       const list = data.questionDetailList&&data.questionDetailList.length>0?data.questionDetailList:data.questionMapping;
-      return <RadioDrop data={list}
+      return <RadioDrop data={custom&&custom.length?[...custom,...list]:list}
                         prefix={data.labelPrefix}
                         suffix={data.labelSuffix}
                         placeholder={data.name}
@@ -76,11 +77,12 @@ export function singleRadio(params){
                         id={data.id}
                         ikey={showInx}></InlineTag>;
     case 7:
+      const min = data.minValue!=null&&data.minValue!=undefined?data.minValue-1:undefined;
+      const max = data.maxValue!=null&&data.maxValue!=undefined?+data.maxValue+1:undefined;
       return <NumberDrop prefix={data.labelPrefix}
                          suffix={data.labelSuffix}
-                         min={data.minValue}
-                         max={data.maxValue}
-                         isImports={isHigh}
+                         min={min}
+                         max={max}
                          placeholder={data.name}
                          boxMark={boxMark}
                          id={data.id}

+ 43 - 5
src/store/actions/checkBody.js

@@ -1,11 +1,12 @@
 import config from '@config/index.js';
 import {getLabelIndex,fullfillText} from '@common/js/func.js';
+import {formatContinueDots} from '@utils/tools.js';
 //设置查体数据
 export function set(state,action){
   let res = Object.assign({},state);
   const {data} = action;
   const obj = fullfillText(data,false,false,false);
-  res.data = [...data];
+  res.data = obj.newArr;
   res.saveText = obj.saveText;//存逗号
   res.showAll = obj.checkHiddenDefault;
   res.update = Math.random();
@@ -105,7 +106,11 @@ export function setRadioValue(state,action){
   }
   if(+item.tagType===1){      //独立单选组件
     item.value = text;
-    res.saveText[labelInx] = item.labelPrefix+text+item.labelSuffix;
+    const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
+    if(exist){    //选中状态处理
+      exist[0].selected=exist[0].id==id;
+      localStorage.setItem('radio'+item.id,JSON.stringify(exist));
+    }
     item.questionDetailList.map((its)=>{
       if(its.id === id){
         its.selected = true;
@@ -113,6 +118,7 @@ export function setRadioValue(state,action){
         its.selected = false;
       }
     });
+    res.saveText[labelInx] = item.labelPrefix+text+item.labelSuffix;
   }else{      //组合组件中的单选组件
     item.questionMapping[subInx].value = text;
     let hasValue = false;
@@ -205,7 +211,7 @@ export const setRadioInputValue = (state,action)=>{
 export function addLabelItem(state,action){
   let res = Object.assign({},state);
   const {data,i} = action;
-  const textLabel = JSON.parse(config.textLabel);
+  const textLabel = Object.assign({},JSON.parse(config._textLabel),{showInCheck:JSON.parse(data).showInCheck});
   //使用Object.assign({},data)拷贝操作时复制项和原项会同步修改
   if(!data) return res;
   res.data.splice(+i+2,0,JSON.parse(data),textLabel);
@@ -231,7 +237,7 @@ export function setCheckText(state,action) {
 export function setCheckBoxValue(state,action) {
   let res = Object.assign({},state);
   const {labelInx,excluName,existsName,nones,withsName,ban} = action.data;
-  let showText = (excluName||'')+(existsName||'')+(ban.name||'')+(withsName||'')+(nones||'');
+  let showText = (excluName||'')+(existsName||'')+(ban.name||'')+(withsName||'')+(nones&&nones.replace('、','')||'');
   // 若每个选项都有符号,去掉最后一个,因与标签间的符号有冲突
   let pattern = new RegExp(/\,+$|\,+$|\.+$|\。+$|\、+$/);//+ 一次或多次
   if(pattern.test(showText)){
@@ -260,10 +266,11 @@ export function insertLabelData(state,action){
   const {index,data,isReplace,span,searchInEnd}=action;
   const showText = res.saveText[index];
   let tempLabels = data.tagType==4?fullfillText(data.questionMapping).newArr:[data];
+  tempLabels = formatContinueDots(tempLabels);
   //查体中,默认显示区域搜索出来的标签要默认显示,隐藏区域搜索出的默认隐藏
   let hideAreaIndex = [...res.data].reverse().findIndex((it)=>it.showInCheck);
   hideAreaIndex = res.data.length-hideAreaIndex-1;        //默认显示的最后一个标签的位置
-  const text = Object.assign({},JSON.parse(config.textLabel),{showInCheck:index>hideAreaIndex?false:true});
+  const text = Object.assign({},JSON.parse(config._textLabel),{showInCheck:index>hideAreaIndex?false:true});
   let spreadLabels =tempLabels.map((it)=>{
     return Object.assign({},it,{showInCheck:index>hideAreaIndex?false:true});
   });
@@ -316,6 +323,33 @@ export const changeLabelVal = (state,action)=>{//双击标签输入改变值
   if(labText && labText.trim()){
     if(item){
       item.value = newVal;
+      const canAdd=hasNoSame(item.questionDetailList,labText);
+      //单选双击编辑的内容自动加到下拉选项中,双击编辑但未修改不添加
+      if(canAdd&&+item.tagType===1&&(+item.controlType===1||+item.controlType===0)){
+        const li = {
+          id:-Math.floor(Math.random()*1000),
+          name:labText,
+          questionId:item.id,
+          orderNo:0,
+          code:0,
+          defaultSelect:"0",
+          remark:null,
+          abnormal:0,
+          selected:true
+        };
+
+        const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
+        //console.log(exist)
+        if(exist&&typeof exist=='object'){     //已添加过编辑的数据
+          //exist.push(li);
+          exist[0]=li;        //暂限添1条
+          localStorage.setItem('radio'+item.id,JSON.stringify(exist));
+        }else{
+          localStorage.setItem('radio'+item.id,JSON.stringify([li]));
+        }
+        //取消原选中状态
+        item.questionDetailList.find((it)=>it.selected==true).selected=false;
+      }
       item.labelPrefix = prefix||'';
       item.labelSuffix = suffix||'';
       // res.saveText[index] = totalVal;
@@ -331,6 +365,10 @@ export const changeLabelVal = (state,action)=>{//双击标签输入改变值
   return res;
 }
 
+function hasNoSame(arr,text){
+  return arr.findIndex((it)=>text==it.name)==-1;
+}
+
 // 数字键盘较特殊,有直接输入
 export const changeNumLabelVal = (state,action)=>{
   const res = Object.assign({},state);

+ 67 - 6
src/store/actions/currentIll.js

@@ -1,5 +1,6 @@
 import {getLabelIndex,fullfillText,getIds} from '@common/js/func.js';
 import config from '@config/index.js';
+import {getInitModules} from '@store/async-actions/homePage.js';
 
 //插入病程变化模板
 function insertPro(data,processModule){
@@ -38,12 +39,23 @@ export const setModule = (state,action)=>{
 //插入病程变化
 export const insertProcess = (state,action)=>{
   const res = Object.assign({},state);
-  const processModule = JSON.parse(JSON.stringify(res.processModule));
+  const sonId = action.id;//子模板id
+  // const processModule = JSON.parse(JSON.stringify(res.processModule));
+  let addSmoduleData;
+  // let allModules = JSON.parse(localStorage.getItem('modules'));
+  let allModules = action.allModules;
+  for(let k=0; k<allModules.length; k++){
+    if(allModules[k].id==sonId){
+      addSmoduleData = JSON.parse(JSON.stringify(allModules[k].moduleDetailDTOList));
+    }
+  }
   let data = res.data;
-  res.data = insertPro(data,processModule);
+  let newData = insertPro(data,addSmoduleData);
+  res.data = fullfillText(newData).newArr;
   res.saveText = fullfillText(res.data).saveText;
   res.update=Math.random();
   return res;
+
 }
 
 
@@ -371,7 +383,7 @@ export const setCheckBox = (state,action)=>{
   const res = Object.assign({},state);
   const {labelInx,excluName,existsName,nones,withsName,ban} = action.data;
   // 若每个选项都有符号,去掉最后一个,因与标签间的符号有冲突
-  let showText = (excluName||'')+(existsName||'')+(ban.name||'')+(withsName||'')+(nones||'');
+  let showText = (excluName||'')+(existsName||'')+(ban.name||'')+(withsName||'')+(nones&&nones.replace('、','')||'');
   let pattern = new RegExp(/\,+$|\,+$|\.+$|\。+$|\、+$/);//+ 一次或多次
   if(pattern.test(showText)){
     showText = showText.substr(0,showText.length-1);
@@ -432,6 +444,11 @@ export function setRadioValue(state,action){
   if(+item.tagType===1){
     item.value = text;
     res.saveText[labelInx] = item.labelPrefix+text+item.labelSuffix;
+    const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
+    if(exist){    //选中状态处理
+      exist[0].selected=exist[0].id==id;
+      localStorage.setItem('radio'+item.id,JSON.stringify(exist));
+    }
     item.questionDetailList.map((its)=>{
       if(its.id === id){
         its.selected = true;
@@ -524,6 +541,33 @@ export const changeLabelVal = (state,action)=>{
   if(labText.trim()){
     if(item){
       item.value = newVal;
+      const canAdd=hasNoSame(item.questionDetailList,labText);
+      //单选双击编辑的内容自动加到下拉选项中,双击编辑但未修改不添加
+      if(canAdd&&+item.tagType===1&&(+item.controlType===1||+item.controlType===0)){
+        const li = {
+          id:-Math.floor(Math.random()*1000),
+          name:labText,
+          questionId:item.id,
+          orderNo:0,
+          code:0,
+          defaultSelect:"0",
+          remark:null,
+          abnormal:0,
+          selected:true
+        };
+
+        const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
+        //console.log(exist)
+        if(exist&&typeof exist=='object'){     //已添加过编辑的数据
+          //exist.push(li);
+          exist[0]=li;        //暂限添1条
+          localStorage.setItem('radio'+item.id,JSON.stringify(exist));
+        }else{
+          localStorage.setItem('radio'+item.id,JSON.stringify([li]));
+        }
+        //取消原选中状态
+        item.questionDetailList.find((it)=>it.selected==true).selected=false;
+      }
       item.labelPrefix = prefix||'';
       item.labelSuffix = suffix||'';
       res.saveText[index] = labText;
@@ -537,6 +581,9 @@ export const changeLabelVal = (state,action)=>{
   return res;
 }
 
+function hasNoSame(arr,text){
+  return arr.findIndex((it)=>text==it.name)==-1;
+}
 // 数字键盘较特殊,有直接输入
 export const changeNumLabelVal = (state,action)=>{
   const res = Object.assign({},state);
@@ -831,12 +878,26 @@ export function removeId(state,action){
 // 单列多选
 export function multipleComfirn(state,action){
   let res = Object.assign({},state);
-  const {ikey,seleData} = action.data;
-  let data = res.data;
+  const {ikey,seleData,fullIkey} = action.data;
+  let data = res.data;//console.log(action,data[ikey])
+  let index = fullIkey.substr(fullIkey.length-1,1);
+  if(data[ikey].tagType==3){    //在组合项中
+    let item = data[ikey].questionMapping;
+    let arr=[];
+    item[index].value = seleData;
+    item.map((it)=>{
+      if(it.value){
+        arr.push(it.labelPrefix+it.value+it.labelSuffix);
+      }
+    });
+    res.saveText[ikey] = arr.join("");
+    res.update = Math.random();
+    res.selecteds[ikey] = {[index]:action.data};
+    return res;
+  }
   data[ikey].value = seleData;
   res.saveText[ikey] = seleData;
   res.selecteds[ikey] = action.data;
-  res.update = Math.random();
   return res;
 }
 

+ 1 - 1
src/store/actions/diagnosticList.js

@@ -74,7 +74,7 @@ export const clearAllDiag = (state, action) => {
     res.diagnosticStr = action.saveText
     res.mainSuitStr = action.mainSuitStr
     res.diagnosticStrNoType = action.saveText
-    res.chronicMagItem = {}
+    res.chronicMagItem = ''
     return res;
 }
 

+ 16 - 8
src/store/actions/mainSuit.js

@@ -69,22 +69,33 @@ export const getBigSymptom = (state,action) => {
 //点击插入新模板--添加病程变化
 export const handleTailClick = (state,action)=>{
   const res = Object.assign({},state);
-  res.showDrop = !res.showDrop;
+  const sonId = action.id;//子模板id
   let num = res.moduleNum.num;
   num++;
-  const addSmoduleData = JSON.parse(JSON.stringify(res.addSmoduleData));
+  // const addSmoduleData = JSON.parse(JSON.stringify(res.addSmoduleData));
   // const addDatas = JSON.parse(JSON.stringify(fullfillText(action.info).newArr));
+  let addSmoduleData;
+  // const allModules = JSON.parse(localStorage.getItem('modules'));
+  let allModules = action.allModules;
+  for(let k=0; k<allModules.length; k++){
+    if(allModules[k].id==sonId){
+      addSmoduleData = JSON.parse(JSON.stringify(allModules[k].moduleDetailDTOList));
+    }
+  }
   let datas = JSON.parse(JSON.stringify(res.data));
   let leng = datas.length;
+  
   for(let i=0; i<addSmoduleData.length; i++){
     addSmoduleData[i].pos = num;
     // let pos = leng-1+i;
    /* let pos = leng-2+i;
     datas.splice(pos,0,addDatas[i]);*/
   }
-  res.data = insertPro(datas,addSmoduleData);
+  let newData = insertPro(datas,addSmoduleData);
+  res.data = fullfillText(newData).newArr;
   res.saveText = fullfillText(res.data).saveText;
   res.moduleNum.num = num;
+  res.showDrop = !res.showDrop;
   return res;
 }
 
@@ -266,7 +277,7 @@ export const commConfirm=(state,action)=>{
   const res = Object.assign({},state);
   const {labelInx,excluName,existsName,nones,withsName,ban} = action.data;
   // 若每个选项都有符号,去掉最后一个,因与标签间的符号有冲突
-  let showText = (excluName||'')+(existsName||'')+(ban.name||'')+(withsName||'')+(nones||'');
+  let showText = (excluName||'')+(existsName||'')+(ban.name||'')+(withsName||'')+(nones&&nones.replace('、','')||'');
   let pattern = new RegExp(/\,+$|\,+$|\.+$|\。+$|\、+$/);//+ 一次或多次
   if(pattern.test(showText)){
     showText = showText.substr(0,showText.length-1);
@@ -373,22 +384,19 @@ export const insertSearch = (state,action)=>{
     if(index < 1){//前
       if(data[focusIndex].value==searchStr){//为空标签则替换
         res.data.splice(focusIndex,1,nText);
-        res.saveText.splice(focusIndex,1,searchData);
       }else{
         res.data.splice(focusIndex,0,nText);
-        res.saveText.splice(focusIndex,0,searchData);
         res.data[focusIndex+1].value = value;
         res.saveText[focusIndex+1] = value;
       }  
     }else{
       res.data.splice(focusIndex+1,0,nText);
-      res.saveText.splice(focusIndex+1,0,searchData);
       res.data[focusIndex].value = value;
     }
     span.current.innerText?(span.current.innerText = value):(span.current.innerHTML=value);
     res.mainIds.push(id);
   }
-  // console.log(456,res,action);
+  res.saveText = fullfillText(res.data).saveText;
   res.update=Math.random();
   return res;
 }

+ 57 - 8
src/store/actions/otherHistory.js

@@ -1,5 +1,6 @@
 import config from '@config/index';
 import {getLabelIndex,fullfillText} from '@common/js/func.js';
+import {formatContinueDots} from '@utils/tools.js';
 
 //多选标签选中确定处理
 export const confirm = (state,action) =>{
@@ -37,7 +38,6 @@ export const confirm = (state,action) =>{
     return res;
   }
   //有,伴,无随配
-  //arr.splice(ikey-1,1);
   let flabel = items[items.length-1];         //要插入的最后一个标签
   let labelText = flabel.value!==undefined?flabel.value:flabel.name;
   let text = labelText;
@@ -47,8 +47,6 @@ export const confirm = (state,action) =>{
     text = flabel.value;
   }
   arr.splice(ikey,0,...exists,...withs);
-  //arr[ikey-1].value = text;
-  //res.saveText[ikey+items.length] = text;
   res.saveText = fullfillText(arr).saveText;
   res.update=Math.random();         //用于触发组件更新(data变化了因在对象中无法被组件检测到)
   return res;
@@ -69,6 +67,11 @@ export function setRadioValue(state,action){
   if(+item.tagType===1){
     item.value = text;
     res.saveText[labelInx] = item.labelPrefix+text+item.labelSuffix;
+    const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
+    if(exist){    //选中状态处理
+      exist[0].selected=exist[0].id==id;
+      localStorage.setItem('radio'+item.id,JSON.stringify(exist));
+    }
     item.questionDetailList.map((its)=>{
       if(its.id === id){
         its.selected = true;
@@ -199,7 +202,7 @@ export function setCheckBoxValue(state,action) {
   const res = Object.assign({},state);
   const {labelInx,excluName,existsName,nones,withsName,ban} = action.data;
   // 若每个选项都有符号,去掉最后一个,因与标签间的符号有冲突
-  let showText = (excluName||'')+(existsName||'')+(ban.name||'')+(withsName||'')+(nones||'');
+  let showText = (excluName||'')+(existsName||'')+(ban.name||'')+(withsName||'')+(nones&&nones.replace('、','')||'');
   let pattern = new RegExp(/\,+$|\,+$|\.+$|\。+$|\、+$/);//+ 一次或多次
   if(pattern.test(showText)){
     showText = showText.substr(0,showText.length-1);
@@ -226,7 +229,8 @@ export function insertLabelData(state,action){
   const searchStr = res.searchStr;
   const {index,data,isReplace,span,searchInEnd}=action;
   const showText = res.saveText[index];
-  const spreadLabels = data.tagType==4?fullfillText(data.questionMapping).newArr:[data];
+  let searchLabels = data.tagType==4?fullfillText(data.questionMapping).newArr:[data];
+  const spreadLabels = formatContinueDots(searchLabels);
   let reg = searchInEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
   const newText=showText.replace(reg,'')||' ';
   if(!isReplace){
@@ -278,6 +282,33 @@ export function changeTextLabel(state,action) {
       if(item.formulaCode){
         res[item.formulaCode] = newVal;
       }
+      const canAdd=hasNoSame(item.questionDetailList,labText);
+      //单选双击编辑的内容自动加到下拉选项中,双击编辑但未修改不添加
+      if(canAdd&&+item.tagType===1&&(+item.controlType===1||+item.controlType===0)){
+        const li = {
+          id:-Math.floor(Math.random()*1000),
+          name:labText,
+          questionId:item.id,
+          orderNo:0,
+          code:0,
+          defaultSelect:"0",
+          remark:null,
+          abnormal:0,
+          selected:true
+        };
+
+        const exist = JSON.parse(localStorage.getItem('radio'+item.id)||null);
+        //console.log(exist)
+        if(exist&&typeof exist=='object'){     //已添加过编辑的数据
+          //exist.push(li);
+          exist[0]=li;        //暂限添1条
+          localStorage.setItem('radio'+item.id,JSON.stringify(exist));
+        }else{
+          localStorage.setItem('radio'+item.id,JSON.stringify([li]));
+        }
+        //取消原选中状态
+        item.questionDetailList.find((it)=>it.selected==true).selected=false;
+      }
       item.labelPrefix = prefix||'';
       item.labelSuffix = suffix||'';
       res.saveText[index] = labText;
@@ -296,6 +327,10 @@ export function changeTextLabel(state,action) {
   return res;
 }
 
+function hasNoSame(arr,text){
+  return arr.findIndex((it)=>text==it.name)==-1;
+}
+
 // 数字键盘较特殊,有直接输入
 export const changeNumLabelVal = (state,action)=>{
   const res = Object.assign({},state);
@@ -404,12 +439,26 @@ export function removeId(state,action){
 // 单列多选
 export function multipleComfirn(state,action){
   let res = Object.assign({},state);
-  const {ikey,seleData} = action.data;
-  let data = res.data;
+  const {ikey,seleData,fullIkey} = action.data;
+  let data = res.data;//console.log(action,data[ikey])
+  let index = fullIkey.substr(fullIkey.length-1,1);
+  if(data[ikey].tagType==3){    //在组合项中
+    let item = data[ikey].questionMapping;
+    let arr=[];
+    item[index].value = seleData;
+    item.map((it)=>{
+      if(it.value){
+        arr.push(it.labelPrefix+it.value+it.labelSuffix);
+      }
+    });
+    res.saveText[ikey] = arr.join("");
+    res.update = Math.random();
+    res.selecteds[ikey] = {[index]:action.data};
+    return res;
+  }
   data[ikey].value = seleData;
   res.saveText[ikey] = seleData;
   res.selecteds[ikey] = action.data;
-  res.update = Math.random();
   return res;
 }
 

+ 6 - 0
src/store/actions/treat.js

@@ -105,3 +105,9 @@ export const isFirstMainDiag = (state, action) => {
     res.isFirstMainDiag = false;
     return res;
 }
+//回读清除是否第一次主诊断
+export const clearFirstMainDiag = (state, action) => {
+    const res = Object.assign({}, state);
+    res.isFirstMainDiag = action.flag;
+    return res;
+}

+ 1 - 1
src/store/async-actions/assistCheck.js

@@ -12,7 +12,7 @@ export const getSearchList = (val) => {
     let baseList = store.getState();
     let sex = baseList.patInfo.message.patientSex;
     return (dispatch) => {
-        axios.json('/api/icss/retrieval/getTagInfos',{
+        axios.json('/retrieval/getTagInfos',{
             type:'6',
             age:baseList.patInfo.message.patientAge,
             inputStr:val,

+ 2 - 2
src/store/async-actions/copyRight.js

@@ -5,7 +5,7 @@ import { storageLocal } from "@utils/tools"
 export const getMessage = (dispatch, getState) => {
     const state = getState();
     // 请求地址
-    post('/api/icss/versionInfo/getVersionInfoAlls')
+    post('/versionInfo/getVersionInfoAlls')
     .then((data) => {
         
         const versionInfo = JSON.parse(storageLocal.get('versionInfo'));
@@ -33,7 +33,7 @@ export const getMessage = (dispatch, getState) => {
 export const getDisMessage = (dispatch, getState) => {
     const state = getState();
     // 请求地址
-    post('/api/icss/disclaimerInformation/getDisclaimerInformations')
+    post('/disclaimerInformation/getDisclaimerInformations')
     .then((data) => {
         dispatch({
             type: GET_DISCLAIMER_MESSAGE,

+ 1 - 1
src/store/async-actions/diagnosticSearch.js

@@ -18,7 +18,7 @@ export const getSearchList = (val) => {
         for(let i = 0; i < diagnosticList.length; i++) {
             noIds.push(diagnosticList[i].id)
         }
-        json('/api/icss/retrieval/getTagInfos',{
+        json('/retrieval/getTagInfos',{
             type:'7',
             age:state.patInfo.message.patientAge,
             inputStr:val,

+ 10 - 10
src/store/async-actions/fetchModules.js

@@ -9,13 +9,13 @@ import {SETOTHERHISTORY} from "../types/homePage";
 import config from "@config/index";
 
 const api={
-  getSpreadModule:'/api/icss/questionInfo/getByIds',
-  getModule:'/api/icss/questionInfo/getById',
-  searchURL: '/api/icss/retrieval/getTagInfos',
-  getOtherHisRecord: '/api/icss/inquiryInfo/getLastOther',
-  getBigPush:'/api/icss/push/pushInner',
-  saveMode:'/api/icss/doctorPageMode/saveDoctorPageModes',
-  getSymptomFeature:'/api/icss/feature/getSymptomFeature'
+  getSpreadModule:'/questionInfo/getByIds',
+  getModule:'/questionInfo/getById',
+  searchURL: '/retrieval/getTagInfos',
+  getOtherHisRecord: '/inquiryInfo/getLastOther',
+  getBigPush:'/push/pushInner',
+  saveMode:'/doctorPageMode/saveDoctorPageModes',
+  getSymptomFeature:'/feature/getSymptomFeature'
 };
 
 export const getFeature = (item)=>{
@@ -147,11 +147,11 @@ export function getInitData(){
     json(api.getBigPush,param).then((res)=>{
       if(+res.data.code === 0){
         const data = res.data.data&&res.data.data.vital;
-        const str = JSON.stringify(data);
-        const arr = fullfillText(JSON.parse(str),false,false,false).newArr;
+        //const str = JSON.stringify(data);
+        //const arr = fullfillText(JSON.parse(str),false,false,false).newArr;
         dispatch({
           type:SET,
-          data:[...arr],
+          data:[...data],
           isEmpty:false
         });
       }else{

+ 1 - 1
src/store/async-actions/getInfoByUuid.js

@@ -6,7 +6,7 @@ import { getUrlArgObject } from '@utils/tools';
 
 export const initPersonInfo = () => {        //初始化数据
     return (dispatch) => {
-        axios.json('/api/icss/tranFieldInfo/getInfoByUuid',{
+        axios.json('/tranFieldInfo/getInfoByUuid',{
             "uuid":getUrlArgObject('hospitalId'),
         }).then((res)=>{
             const data =res.data;

+ 1 - 1
src/store/async-actions/historyTemplates.js

@@ -8,7 +8,7 @@ export const initItemList = () => {
     // let whichSign = baseList.typeConfig.typeConfig;
     let state = baseList.patInfo.message;
     return (dispatch) => {
-        axios.json('/api/icss/inquiryInfo/hisInquirys',{
+        axios.json('/inquiryInfo/hisInquirys',{
             "hospitalId": state.hospitalId, 
             "patientId": state.patientId, 
             // "sign":whichSign

+ 14 - 8
src/store/async-actions/homePage.js

@@ -1,5 +1,5 @@
 import {post,json} from '@utils/ajax.js';
-import {SETINITDATA,MODI_LOADING,GET_ASSIST_LIST,GET_INSPECT_LIST} from '@store/types/homePage.js';
+import {SETINITDATA,MODI_LOADING,GET_ASSIST_LIST,GET_INSPECT_LIST,SETALLMODULES} from '@store/types/homePage.js';
 import {SET_CURRENT} from '@store/types/currentIll';
 import {SET_MAINSUIT} from '@store/types/mainSuit';
 import config from '@config/index.js';
@@ -11,10 +11,10 @@ import {initHistoryDetails} from '@store/async-actions/patInfo';
 import {storageLocal} from '@utils/tools';
 
 const api = {
-  getModules:'/api/icss/moduleInfo/getAll',
-  clickCount:'/api/icss/buriedSomeStatistical/saveBuriedSomeStatisticals', //埋点统计
-  getChronic:'/api/icss/disType/getDisType', //慢病列表
-  getQuestionUsual:'/api/icss/questionUsual/getQuestionUsual' //化验常用标签
+  getModules:'/moduleInfo/getAll',
+  clickCount:'/buriedSomeStatistical/saveBuriedSomeStatisticals', //埋点统计
+  getChronic:'/disType/getDisType', //慢病列表
+  getQuestionUsual:'/questionUsual/getQuestionUsual' //化验常用标签
 };
 
 function modulesParseJson(data){
@@ -46,6 +46,12 @@ export const getInitModules= (dispatch,getStore)=>{
         const initData = newObj.json;
         const initSaveText = newObj.saveTextJson;
         const initModuleName = newObj.moduleName;
+        // 将所有模板缓存,方便根据id取子模板
+        // localStorage.setItem('modules',JSON.stringify(res.data.data));
+        dispatch({
+          type: SETALLMODULES,
+          data: res.data.data
+        });
         dispatch({
           type: SETINITDATA,
           data: initData
@@ -108,8 +114,8 @@ export const getChronic = (dispatch,getState)=>{
       storageLocal.set('chronic',chronic);
     }else{
       console.log("请求失败",res);
-    } 
-  }) 
+    }
+  })
 }
 // 请求化验辅检常用标签
 export const getCommonList = (val)=>{
@@ -139,6 +145,6 @@ export const getCommonList = (val)=>{
       }else{
         console.log("请求失败",res);
       }
-    }) 
+    })
   }
 }

+ 2 - 2
src/store/async-actions/inspect.js

@@ -12,7 +12,7 @@ export const getSearchList = (val) => {
     let baseList = store.getState();
     let sex = baseList.patInfo.message.patientSex;
     return (dispatch) => {
-        axios.json('/api/icss/retrieval/getTagInfos',{
+        axios.json('/retrieval/getTagInfos',{
             type:'5',
             age:baseList.patInfo.message.patientAge,
             inputStr:val,
@@ -28,7 +28,7 @@ export const getSublableList = (id,idx) => {
     let baseList = store.getState();
     let sex = baseList.patInfo.message.patientSex;
     return (dispatch) => {
-        axios.json('/api/icss/questionInfo/getById',{
+        axios.json('/questionInfo/getById',{
             age:baseList.patInfo.message.patientAge,
             sexType:sex == '男'?'1' : sex == '女'?'2':'3',
             id: id

+ 2 - 2
src/store/async-actions/mainSuit.js

@@ -4,8 +4,8 @@ import {getEMRParams} from '@utils/tools';
 
 const host = '/api/icss/';
 const api = {
-  'getCommSymptoms': host + 'questionUsual/getQuestionUsual',
-  'symptomPush': host +'push/pushInner',
+  'getCommSymptoms': '/questionUsual/getQuestionUsual',
+  'symptomPush':'/push/pushInner',
 }
 
 

+ 4 - 4
src/store/async-actions/patInfo.js

@@ -9,13 +9,13 @@ import {ISREAD,MODI_LOADING} from "../types/homePage";
 import { initItemList } from '@store/async-actions/tabTemplate';
 
 const api = {
-    getPatInfo: '/api/icss/patientInfo/getTopPatientInfo',
-    getPatBaseInfo: '/api/icss/patientInfo/getPatientInfo'
+    getPatInfo: '/patientInfo/getTopPatientInfo',
+    getPatBaseInfo: '/patientInfo/getPatientInfo'
 };
 
 //参数转换
 export const initPersonInfo = (dispatch, getState) => {
-    json('/api/icss/tranFieldInfo/getInfoByUuid', {
+    json('/tranFieldInfo/getInfoByUuid', {
         "uuid": getUrlArgObject('hospitalId'),
     }).then((res) => {
         const data = res.data;
@@ -34,7 +34,7 @@ export const initHistoryDetails = (dispatch) => {
     let baseList = store.getState();
     let state = baseList.patInfo.message;
     return (dispatch) => {
-        json('/api/icss/inquiryInfo/readInquiry', {
+        json('/inquiryInfo/readInquiry', {
             "doctorId": state.doctorId,
             "hospitalDeptId": state.hospitalDeptId,
             "hospitalId": state.hospitalId,

+ 2 - 2
src/store/async-actions/print.js

@@ -18,7 +18,7 @@ export const saveMessage = (bool) => {
     let jsonData = getAllDataList(baseList);
     // console.log(jsonStr.diag,'保存历史病历')
     
-    json('/api/icss/inquiryInfo/saveInquiry', {
+    json('/inquiryInfo/saveInquiry', {
         "doctorId": state.doctorId,
         "hospitalDeptId": state.hospitalDeptId,
         "hospitalId": state.hospitalId,
@@ -73,7 +73,7 @@ export const saveMessage = (bool) => {
         }
     })
     if(bool){
-        json('/api/icss/printRecord/savePrintRecords', {
+        json('/printRecord/savePrintRecords', {
             "dataJson": JSON.stringify(getAllDataList(baseList)),
             "doctorId": state.doctorId,
             "hospitalDeptId": state.hospitalDeptId,

+ 5 - 5
src/store/async-actions/pushMessage.js

@@ -5,9 +5,9 @@ import {storageLocal,getEMRParams} from '@utils/tools';
 import {SET_IMPORT_CHECKBODY_LABEL} from "../types/checkBody";
 
 const api={
-  push:'/api/icss/push/pushInner',
-  textPush:'/api/icss/push/pushText',
-  getTableList:'/api/icss/scale/getList' //获取量表列表
+  push:'/push/pushInner',
+  textPush:'/push/pushText',
+  getTableList:'/scale/getList' //获取量表列表
 }
 
 //获取右侧推送信息
@@ -81,7 +81,7 @@ export const getTips = (diagItem) =>{
             type: SET_CLICK_DIAG,
             clickDiag: diagItem
         })
-        const url = '/api/icss/introduceInfo/getByQuestionId';
+        const url = '/introduceInfo/getByQuestionId';
         const params = {
             questionId: diagItem.id,
             type: 7,
@@ -107,7 +107,7 @@ export const getTipsDetails = () => {
         // window.open(`/static/pages/information.html?type=7&&questionId=${state.diagnosticList.clickDiag.id}`);
 
         //弹窗显示
-        const url ='/api/icss/introduceInfo/getByQuestionId'
+        const url ='/introduceInfo/getByQuestionId'
         const imageUrlPrefix = 'http://192.168.2.241:82'
         
         const params = {

+ 5 - 5
src/store/async-actions/tabTemplate.js

@@ -21,7 +21,7 @@ export const initItemList = (type) => { //初始化数据
   let state = baseList.patInfo.message;
 
   return (dispatch) => {
-    axios.json('/api/icss/templateInfo/getByDoctorIdTemplates', {
+    axios.json('/templateInfo/getByDoctorIdTemplates', {
       "doctorId": state.doctorId,
       "hospitalDeptId": state.hospitalDeptId,
       "hospitalId": state.hospitalId,
@@ -67,7 +67,7 @@ export const saveTemplateDetail = (val,sex) => { //保存为模板
     return tmpObj;
   }
   return (dispatch) => {
-    axios.json('/api/icss/templateInfo/saveTemplateInfo', getdata()).then((res) => {
+    axios.json('/templateInfo/saveTemplateInfo', getdata()).then((res) => {
       const data = res.data;
       if (data.code == 0) {
         Notify.success('模板保存成功');
@@ -97,7 +97,7 @@ export const saveTemplateDetail = (val,sex) => { //保存为模板
 
 export const delItem = (id) => { //删除
   return (dispatch) => {
-    axios.json('/api/icss/templateInfo/cancelTemplateInfos', {
+    axios.json('/templateInfo/cancelTemplateInfos', {
       ids: id
     }).then((res) => {
       let data = res.data;
@@ -112,7 +112,7 @@ export const delItem = (id) => { //删除
 };
 export const delBatchItem = (ids) => { //批量删除
   return (dispatch) => {
-    axios.json('/api/icss/templateInfo/cancelTemplateInfos', {
+    axios.json('/templateInfo/cancelTemplateInfos', {
       ids: ids.join(",")
     }).then((res) => {
       let data = res.data;
@@ -133,7 +133,7 @@ export const changeTitleAsync = (obj) => { //改标题
     return;
   }
   return (dispatch) => {
-    axios.json('/api/icss/templateInfo/updateByIdUsNames', {
+    axios.json('/templateInfo/updateByIdUsNames', {
       "doctorId": state.doctorId,
       "hospitalDeptId": state.hospitalDeptId,
       "hospitalId": state.hospitalId,

+ 5 - 5
src/store/async-actions/treat.js

@@ -7,8 +7,8 @@ import {storageLocal,getEMRParams} from '@utils/tools';
 import { isAddMainSuit } from '@store/async-actions/diagnosticList';
 
 const api={
-    push:'/api/icss/push/pushInner',
-    textPush:'/api/icss/push/pushText'
+    push:'/push/pushInner',
+    textPush:'/push/pushText'
 }
 
 export const addDiagnostic = (item) => {
@@ -219,7 +219,7 @@ export const getTreatResult = (item) =>{
 export const getInstroduce = (item)=>{
 
     return (dispatch, getState) =>{
-        const url = '/api/icss/introduceInfo/getByQuestionId';
+        const url = '/introduceInfo/getByQuestionId';
         const params = {
             questionId: item.id,
             type: 8,
@@ -253,7 +253,7 @@ export const  getInstroduceMore = (drugIdList) =>{
     return (dispatch, getState) =>{
         let drugInfoList = [];
         for (let i = 0; i < drugIdList.drugIdList.length; i++ ) {
-            const url = '/api/icss/introduceInfo/getByQuestionId';
+            const url = '/introduceInfo/getByQuestionId';
             const params = {
                 questionId: drugIdList.drugIdList[i],
                 type: 8,
@@ -293,7 +293,7 @@ export const  getInstroduceMore = (drugIdList) =>{
 export const commonTreatAddToAdvice = () => {
     return (dispatch, getState) => {
         const state = getState();
-        if(state.treat.treatItem.treatIndex === 0 && state.treat.isFirstMainDiag) {
+        if(state.treat.treatItem.id === state.diagnosticList.diagnosticList[0].id && state.treat.isFirstMainDiag) {
             dispatch({
                 type: IS_FIRST_MAIN_DIAG
             })

+ 5 - 1
src/store/reducers/homePage.js

@@ -1,5 +1,5 @@
 import {HIDE,RESET,SETINITDATA,SETDROPSHOW,SETADDITEMINIT,SETT0EDIT,SETREADDITEMS,
-  HIDEDROP,CLICKCOUNT,ISREAD,SETOTHERHISTORY,SETMINSCREEN,MODI_LOADING,SEARCH_DROP_LOCATION,GET_INSPECT_LIST,GET_ASSIST_LIST} from '../types/homePage.js';
+  HIDEDROP,CLICKCOUNT,ISREAD,SETOTHERHISTORY,SETMINSCREEN,MODI_LOADING,SEARCH_DROP_LOCATION,GET_INSPECT_LIST,GET_ASSIST_LIST,SETALLMODULES} from '../types/homePage.js';
 import {showDrop,setAddItemInit,setLabelToEdit,confirmHide,clickNum,searchDropLocation,getInspectList,getAssistList} from '../actions/homePage.js';
 import SearchDrop from '../../components/SearchDrop/index.jsx';
 
@@ -14,6 +14,7 @@ const initState = {
   loadingFlag:true,
   boxTop:0,
   boxLeft:0,
+  allModules:[],
   assistList:[],
   inspectList:[],
 };
@@ -71,6 +72,9 @@ export default function (state=initState,action) {
       return getInspectList(state,action);
     case GET_ASSIST_LIST:
       return getAssistList(state,action);
+    case SETALLMODULES:
+      res.allModules = action.data;
+      return res;
     default:
       return res;
   }

+ 77 - 9
src/store/reducers/inspect.js

@@ -23,6 +23,7 @@ const initSearchList = {
 
     getExcelDataList: [], //导入的数据
     pushItem:[],    //推送的数据
+    pushItems:[],    //右侧模板预览的数据
 }
 
 export default (state = initSearchList, action) => {
@@ -47,6 +48,11 @@ export default (state = initSearchList, action) => {
                 newState.labelList = [...tempArrs]
             }
         }
+        
+        let tmpArr = newState.getExcelDataList;
+        let tmpArr2 = newState.labelList;
+        newState.pushItems = getPushLists(tmpArr,tmpArr2);
+        newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
     if (action.type == RESET_LABEL) {             //选中的结果重组
@@ -62,6 +68,11 @@ export default (state = initSearchList, action) => {
           tempArr.push(action.lis[i]);
         }
         newState.labelList = [...tempArr]
+        
+        let tmpArr = newState.getExcelDataList;
+        let tmpArr2 = newState.labelList;
+        newState.pushItems = getPushLists(tmpArr,tmpArr2);
+        newState.inspectStrPlus = getStringPlus(newState.pushItems);
         return newState;
     }
     if (action.type == FILL_ACTIVE) {                        //点击标签放到暂存里
@@ -85,7 +96,8 @@ export default (state = initSearchList, action) => {
         }
         tempArrs.show = false;
         newState.pushItem = getPushList(tmpArr,tmpArr2);
-        newState.inspectStrPlus = getStringPlus(newState.pushItem)
+        newState.pushItems = getPushLists(tmpArr,tmpArr2);
+        newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
     if (action.type == GET_EXCEL) {              //导入数据
@@ -126,7 +138,8 @@ export default (state = initSearchList, action) => {
         newState.getExcelDataList = [...tmpArr];
         let tempArr1 = newState.getExcelDataList;
         newState.pushItem = getPushList(tempArr1,tempArr2);
-        newState.inspectStrPlus = getStringPlus(newState.pushItem)
+        newState.pushItems = getPushLists(tempArr1,tempArr2);
+        newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
     if (action.type == CHECK_VALUE_IS_CHANGE) {     //数据添加后显示与否
@@ -141,7 +154,8 @@ export default (state = initSearchList, action) => {
         newState.labelList = tempArrs;
         // tempArrAct.show = true;
         newState.pushItem = getPushList(tmpArr,tempArrs);
-        newState.inspectStrPlus = getStringPlus(newState.pushItem)
+        newState.pushItems = getPushLists(tmpArr,tempArrs);
+        newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
     if (action.type == CLEAR_ALL_LABEL) {     //清空所有数据
@@ -161,7 +175,8 @@ export default (state = initSearchList, action) => {
         newState.labelList = [...tempArr];
         let tmpArr = newState.getExcelDataList;
         newState.pushItem = getPushList(tmpArr,tempArr);
-        newState.inspectStrPlus = getStringPlus(newState.pushItem)
+        newState.pushItems = getPushLists(tmpArr,tempArr);
+        newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
     return state;
@@ -169,7 +184,7 @@ export default (state = initSearchList, action) => {
 
 function getExcelString(action,newState,tmpArr,tmpArr2) {
   let tmpString = '';
-  if(JSON.stringify(action.data) != '{}' && action.data.lisExcelRes.length > 0){
+  if(JSON.stringify(action.data||{}) != '{}' && action.data.lisExcelRes.length > 0){
     action.data.lisExcelRes.map((item)=>{
         item.lisExcelItem.map((part)=>{
             if(part.type == 1){
@@ -192,7 +207,8 @@ function getExcelString(action,newState,tmpArr,tmpArr2) {
         })
     })
     newState.pushItem = getPushList(tmpArr,tmpArr2);
-    newState.inspectStrPlus = getStringPlus(newState.pushItem)
+    newState.pushItems = getPushLists(tmpArr,tmpArr2);
+    newState.inspectStrPlus = getStringPlus(newState.pushItems)
   }else{
     newState.inspectStrPlus = '';
     newState.pushItem = []
@@ -230,8 +246,13 @@ function getString(lists) {
 function getStringPlus(dataList){
   let strPlus = '';
   dataList && dataList.map((item)=>{
-    let strTmp = item.name + ',' + item.detailName + ',' + (item.otherValue ? item.otherValue : (item.value + item.units)) +';'
-    strPlus += strTmp;
+    if(item.detailName){
+      let strTmp = item.name + ',' + item.detailName + ',' + (item.otherValue ? item.otherValue : (item.value + item.units)) +';'
+      strPlus += strTmp;
+    }else{
+      let strTmp = item.name+';'
+      strPlus += strTmp;
+    }
   })
   return strPlus;
 }
@@ -262,7 +283,49 @@ function getPushList(data1,data2){     //推送数据
         })
     })
     data2.length>0 && data2.map((item)=>{        //填写单数据拼接
-        item.details.map((val)=>{
+      item.details && item.details.map((val)=>{
+            if(val.value != undefined && val.value != ''){
+                let tmpObj = {};
+                tmpObj.name = item.name || '';
+                tmpObj.detailName = val.name || '';
+                tmpObj.uniqueName = val.uniqueName || '';//公表名称
+                tmpObj.source = '0';     //数据来源
+                tmpObj.maxValue = val.maxValue ? val.maxValue : '';
+                tmpObj.minValue = val.minValue ? val.minValue : '';
+                tmpObj.units = val.labelSuffix || '';
+                tmpObj.value = (val.value-0) === (val.value-0) ? val.value:'';
+                tmpObj.otherValue = (val.value-0) === (val.value-0) ?'':val.value;
+                tmpArr2.push(tmpObj);
+            }
+        })
+    })
+    totalTmpArr = tmpArr1.concat(tmpArr2);
+    return totalTmpArr;
+}
+function getPushLists(data1,data2){     //推送数据
+    let tmpArr1 = [];
+    let tmpArr2 = [];
+    let totalTmpArr = [];
+    data1.length>0 && data1.map((items)=>{    //excel导入的数据拼接
+        items.lisExcelRes.map((item)=>{
+            item.lisExcelItem.map((part)=>{
+                let tmpObj = {};
+                tmpObj.name = part.mealName || '';//套餐名
+                tmpObj.detailName = part.itemName || '';//化验项名
+                tmpObj.uniqueName = part.uniqueName || '';//公表名称
+                tmpObj.source = '1';//数据来源
+                tmpObj.maxValue = part.max || ''; 
+                tmpObj.minValue = part.min || '';
+                tmpObj.units = part.unit || '';//单位
+                tmpObj.value = (part.value-0) === (part.value-0) ? part.value:'';//值
+                tmpObj.otherValue = (part.value-0) === (part.value-0) ?'':part.value; //阴性阳性
+                tmpArr1.push(tmpObj);
+            })
+        })
+    })
+    data2.length>0 && data2.map((item)=>{        //填写单数据拼接
+      if(item.show){
+          item.details.map((val)=>{
             if(val.value != undefined && val.value != ''){
                 let tmpObj = {};
                 tmpObj.name = item.name || '';
@@ -277,6 +340,11 @@ function getPushList(data1,data2){     //推送数据
                 tmpArr2.push(tmpObj);
             }
         })
+      }else{
+        let tmpObj = {};
+        tmpObj.name = item.name;
+        tmpArr2.push(tmpObj);
+      }
     })
     totalTmpArr = tmpArr1.concat(tmpArr2);
     return totalTmpArr;

+ 4 - 2
src/store/reducers/treat.js

@@ -1,5 +1,5 @@
-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 } from '../types/treat'
-import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, setRecommendBasic, setDrugInfoList, isFirstMainDiag } 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 } from '../types/treat'
+import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, setRecommendBasic, setDrugInfoList, isFirstMainDiag,clearFirstMainDiag } from '../actions/treat'
 const initState = {
     show: false, //治疗方案显示隐藏
     showDrugInfo: false, //药品信息显示隐藏
@@ -200,6 +200,8 @@ export default function(state=initState, action){
             return setDrugInfoList(state, action);
         case IS_FIRST_MAIN_DIAG: 
             return isFirstMainDiag(state, action)
+        case CLEAR_FIRST_MAIN_DIAG: 
+            return clearFirstMainDiag(state, action)
         default:
             return state
     }

+ 2 - 1
src/store/types/homePage.js

@@ -14,4 +14,5 @@ export const SETMINSCREEN = 'SETMINSCREEN';    //1024标识
 export const MODI_LOADING = 'MODI_LOADING';    //1024标识
 export const SEARCH_DROP_LOCATION = 'SEARCH_DROP_LOCATION';    //1024标识
 export const GET_ASSIST_LIST = 'GET_ASSIST_LIST';    //辅检
-export const GET_INSPECT_LIST = 'GET_INSPECT_LIST';    //化验
+export const GET_INSPECT_LIST = 'GET_INSPECT_LIST';    //化验
+export const SETALLMODULES = 'SETALLMODULES';    //储存所有模板数据

+ 1 - 1
src/store/types/treat.js

@@ -14,4 +14,4 @@ export const SET_RECOMMEND_BASIC = 'SET_RECOMMEND_BASIC'//设置其他推荐推
 export const SET_TREAT_INFO = 'SET_TREAT_INFO' //设置治疗方案信息(name,id等)
 export const SET_DRUG_INFO_LIST = 'SET_DRUG_INFO_LIST' //查询多个药品说明书(添加数据时查看药品说明用)
 export const IS_FIRST_MAIN_DIAG = 'IS_FIRST_MAIN_DIAG' //是否为主诊断第一次开单
-
+export const CLEAR_FIRST_MAIN_DIAG = 'CLEAR_FIRST_MAIN_DIAG' //回读清空是否为主诊断第一次开单

+ 16 - 8
src/utils/ajax.js

@@ -1,20 +1,24 @@
-import {host} from './config'
+import {host,prefix} from './config'
 import { getUrlArgObject } from "@utils/tools";
 const $ = require('jquery');
 $.support.cors = true;
 const axios=require('axios');
 const qs=require('querystring');
 const isLocal = window.location.hostname.indexOf('localhost')!=-1;
-const qhost = isLocal?host:'';
+const qhost = isLocal?host+prefix:prefix;
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
 //axios.defaults.baseURL = host;       //默认地址
 // axios.defaults.timeout = 60000;       //请求超时
 
 
-    // const appkeyId = getUrlArgObject("appkey");
+    const securityCode = getUrlArgObject("code");
+    const appKeyId = getUrlArgObject("appI");
+    const appKeySecret = getUrlArgObject("appS");
     axios.interceptors.request.use(
         req => {
-            // req.headers.appKey = appkeyId;
+          req.headers.appKeyId = appKeyId;
+          req.headers.appKeySecret = appKeySecret;
+          req.headers.securityCode = securityCode;
             return req;
         },
         error => {
@@ -33,10 +37,10 @@ axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded
             if (error.response) {
                 switch (error.response.status) {
                     case 401:
-                        //alert(401)
+                        //alert("服务正在升级,请稍后再试");
                         break;
                     case 500:
-                        //alert(500)
+                        //alert('后台接口报错');
                         break;
                     default:
                         //alert('其他')
@@ -61,7 +65,11 @@ const post=(url,data)=>{
 //json传参
 const json=(url,data)=>{
   //兼容ie8,axios在ie8下content-type设置不成功且会把headers置为null
-  return new Promise((resolve,reject)=>{
+  return axios({
+    method:'post',
+    url:qhost+url,
+    data
+  });/*new Promise((resolve,reject)=>{
     $.ajax({
       method:'post',
       url:qhost+url,
@@ -74,7 +82,7 @@ const json=(url,data)=>{
         reject(error);
       },
     });
-  });
+  });*/
 };
 
 const get=(url)=>{

+ 2 - 1
src/utils/config.js

@@ -6,5 +6,6 @@ const host='http://192.168.2.236:5050';//后端接口访问地址
 // const host='http://192.168.3.117:8080'; //周铁刚
 // const newIcssVisitUrl = '223.93.170.82:13000';    //icss服务访问地址(跳转目的地),不能加http://
 module.exports={
-    host
+    host,
+    prefix:'/api/icss'            //带权限验证的api
 };

+ 63 - 17
src/utils/tools.js

@@ -8,6 +8,7 @@ import {clearAllLabel} 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 {tabChange} from '@store/actions/tabTemplate';
 import config from '@config/index.js';
 
@@ -187,7 +188,8 @@ const getAllDataList =(baseList) =>{           //获取所有模块结构化的
     jsonData.addItems = baseList.homePage.addItems||{};
     jsonData.mainsuitIds = baseList.mainSuit.mainIds;      //主诉去重
     jsonData.currentIds = baseList.currentIll.symptomIds;      //现病史去重
-    //console.log(jsonData,'结构化数据获取')
+    jsonData.isFirstMainDiag = baseList.treat.isFirstMainDiag;      //治疗方案
+    // console.log(jsonData,'结构化数据获取')
     return jsonData;
 }
 const getAllDataStringList =(baseList) =>{           //获取所有模块文本的数据
@@ -260,6 +262,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
             data:{},
             saveText:'',
         });
+        store.dispatch({
+          type:CLEAR_FIRST_MAIN_DIAG,
+          flag:true
+        });
         storageLocal.remove('emrParam');
        // Notify.success('页面已清空')
     }else{
@@ -325,6 +331,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                   type:SETREADDITEMS,
                   data:dataJson.addItems
                 });
+                store.dispatch({
+                  type:CLEAR_FIRST_MAIN_DIAG,
+                  flag:dataJson.isFirstMainDiag
+                });
               //tab跳回辅助信息
               store.dispatch(tabChange('0'));
             }else{    //结构化历史病历回读
@@ -389,6 +399,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                 type:SETREADDITEMS,
                 data:dataJson.addItems
               });
+              store.dispatch({
+                type:CLEAR_FIRST_MAIN_DIAG,
+                flag:dataJson.isFirstMainDiag
+              });
             }
         } else {
             if(type == 'template'){     //纯文本模板回读
@@ -438,6 +452,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                 type:SETREADDITEMS,
                 data:dataJson.addItems
               });
+              store.dispatch({
+                type:CLEAR_FIRST_MAIN_DIAG,
+                flag:dataJson.isFirstMainDiag
+              });
               //tab跳回辅助信息
               store.dispatch(tabChange('0'));
             }else{  //纯文本历史病历回读
@@ -493,6 +511,10 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
                 type:SETREADDITEMS,
                 data:dataJson.addItems
               });
+              store.dispatch({
+                type:CLEAR_FIRST_MAIN_DIAG,
+                flag:dataJson.isFirstMainDiag
+              });
             }
         }
     }
@@ -550,21 +572,25 @@ function filterOtherDataArr(arrTmp,jsonArr){
       return word.substr(0,1);
     });
   });
-  const str1 = [...tmpArr].splice(0,index1).join("");
-  const str2 = [...tmpArr].splice(index1).join("");
+  const splitNum = [index1,index2,index3,index4].find((i)=>i!=-1);
+  const str1 = [...tmpArr].splice(0,splitNum).join("");
+  const str2 = [...tmpArr].splice(splitNum).join("");
   return {str1:trimDots(str1),str2:trimDots(str2),index:index1};
 }
 //去掉开头的标点符号,最后的标点保留第一个,中间连续的保留第一个
 function trimDots(str){
   return str.replace(config.punReg,function(word){
     return word.substr(0,1);
-  }).replace(/^[,,.。::"“??”;;、!!]+/,'');
+  }).replace(/^[,,.。::"“??”;;、!!\s]+/,'');
 }
 
 //标签间连续标点只保留一个,保留前面一个
 function formatContinueDots(data){
   let arr=data.filter((it,i)=>{
-    if(!(it.name==','&&data[i-1].name==',')){
+    if(i==0||(it.name&&(it.name.match(config.punctuationReg))||(data[i-1].name&&data[i-1].name.match(config.punctuationReg)))){
+      return it;
+    }
+    if(!it.name){       //主诉现病史病情变化
       return it;
     }
   });
@@ -717,24 +743,37 @@ function getPageLength(event) {     //兼容ie8获取页面距离左和上的距
   return page;
 }
 function dragBox(domWrap,domDrag){
-  let wrap = document.getElementById(domWrap);//呗拖拽的元素
   let drag = document.getElementById(domDrag);//拖拽区域
+  let wrap = document.getElementById(domWrap);//被拖拽的元素
   let width = window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;//屏幕宽度
   let height = window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;//屏幕高度
   let mouseX = 0,mouseY = 0,dragX = 0,dragY = 0,isDrag = false,isMove = false;
-  let maxDragX = width - wrap.offsetWidth;//最大可推拽x方向距离
-  let maxDragY = height - wrap.offsetHeight;//最大可拖拽y方向距离
   windowEventHandler('mousedown',(event)=>{    //鼠标位置获取,计算点击位置到拖拽元素左边的距离
-    wrap = document.getElementById(domWrap);
-    drag = document.getElementById(domDrag);
+    let wrap = document.getElementById(domWrap);
     let page = getPageLength(event);
+    drag = document.getElementById(domDrag);
     mouseX = page.pageX - wrap.offsetLeft      //鼠标到拖拽元素的左边界的距离
     mouseY = page.pageY - wrap.offsetTop       //鼠标到拖拽元素的上边界的距离
     isDrag = true
+    isMove = false
   },drag)
   // windowEventHandler('mousemove',handleMove,document)
   windowEventHandler('mousemove',(event)=>{      //移动的
+    let dragDes = document.getElementById('treatDescBox');//展開区域
     let page = getPageLength(event);
+    let maxDragX = 0,dragDesWidth = 0;
+    let maxDragY = height - wrap.offsetHeight;//最大可拖拽y方向距离
+
+    if(domDrag == 'dragTreatTitle'){//最大可推拽x方向距离
+      if(dragDes != null){
+        dragDesWidth = dragDes.offsetWidth
+      }else{
+        dragDesWidth = 0
+      }
+      maxDragX = width - wrap.offsetWidth - dragDesWidth
+    }else{
+      maxDragX = width - wrap.offsetWidth
+    }
     if(isDrag){
       dragX = page.pageX - mouseX          //鼠标可拖拽到左边的最大距离
       dragY = page.pageY - mouseY          //鼠标可拖拽到上边的最大距离
@@ -744,8 +783,14 @@ function dragBox(domWrap,domDrag){
       if(dragY < 0){      //不能超出上边界
         dragY = 0
       }
-      if(width-dragX < wrap.offsetWidth){    //不能超出右边界
-        dragX = maxDragX
+      if(domDrag == 'dragTreatTitle'){
+        if(width-dragX-dragDesWidth < wrap.offsetWidth){    //不能超出右边界
+          dragX = maxDragX
+        }
+      }else{
+        if(width-dragX < wrap.offsetWidth){    //不能超出右边界
+          dragX = maxDragX
+        }
       }
       if(height-dragY < wrap.offsetHeight){     //不能超出下边界
         dragY = maxDragY
@@ -756,11 +801,12 @@ function dragBox(domWrap,domDrag){
       wrap.style.top = dragY + 'px'
     }
   },document)
-  windowEventHandler('mouseup',(event)=>{
-    if(isMove){ //有move就设置位置没有移动就不处理
-      wrap.style.left = dragX + 'px'
-      wrap.style.top = dragY + 'px'
-    }
+  windowEventHandler('mouseup',()=>{
+    // if(isMove){ //有move就设置位置没有移动就不处理
+      // console.log(dragX)
+      // wrap.style.left = dragX + 'px'
+      // wrap.style.top = dragY + 'px'
+    // }
     isDrag = false
     return false
   },document)