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

src/common/components/NumberUnitPan/index.jsx

@@ -55,6 +55,14 @@ class NumberUnitPan extends Component{
     });
     onSelect&&onSelect(text);
   }
+  componentWillReceiveProps(nextProps){
+    //重新选择的值替换 不追加
+     if(!nextProps.show){
+      this.setState({
+        value:''
+      });
+     }
+  }
   render(){
     // const select = this.handleSelect.bind(this);
     const {show} = this.props;      //table onBlur阻止冒泡是为了修复multSpread中数字键盘点击触发最外层数字组件onBlur事件

src/common/components/NumberUnitPan/index.less

@@ -18,7 +18,7 @@
     height: 100%;
     text-align: center;
     line-height: 44px;
-    color: #666;
+    color: #333;
     cursor: pointer;
   }
   span:hover{

src/containers/CurrentIll.js

@@ -12,7 +12,7 @@ import {getModule} from '@store/async-actions/fetchModules.js';
 import {didPushParamChange} from '@utils/tools.js';
 
 
-function mapStateToProps(state) {//console.log(11,state);
+function mapStateToProps(state) {
   const {homePage} = state;
     return {
         data:state.currentIll.data,//主诉模板

src/containers/SpreadDrop.js

@@ -77,10 +77,12 @@ function currentIll(dispatch,store,params){
   // const ikey = params.ikey.substr(1,1);
   const index = params.ikey;
   let ikey = getLabelIndex(index);
-  let existsId = getIds(exists);
-  let withsId = getIds(withs);
+  // let existsId = getIds(exists);
+  // let withsId = getIds(withs);
+  let existsId = exists && exists.length>0?getIds(exists):[];
+  let withsId = withs && withs.length>0?getIds(withs):[];
   // const ids = existsId.join(",")+withsId.join(",");
-  const ids = (existsId.concat(withsId)).join(",");
+  const ids = (existsId.concat(withsId)).join(",");console.log("点击的下标是：",index,"选中的id是：",ids)
   let has = [],wes=[];
   //获取选中项目模板
   fetchModules(ids).then((res)=>{

src/main.js

@@ -27,7 +27,7 @@ const render = (Component) => {
         }
       })
     })
-  };
+  };          
     ReactDOM.render(
         <AppContainer>
             <Provider store={store}>

src/store/actions/checkBody.js

@@ -5,6 +5,7 @@ export function set(state,action){
   let res = Object.assign({},state);
   const {data} = action;
   res.data = [...data];
+  res.saveText = fullfillText(res.data).saveText;//存逗号
   res.update = Math.random();
   return res;
 }
@@ -30,13 +31,13 @@ export function setNumberValue(state,action){
     });
     res.saveText[labelInx] = hasValue?sub.join(''):'';
   }
-  res.saveText = fullfillText(res.data).saveText;
+  // res.saveText = fullfillText(res.data).saveText;
   res.update = Math.random();
   return res;
 }
 
 //查体单选下拉选中
-export function setRadioValue(state,action){console.log(221)
+export function setRadioValue(state,action){
   let res = Object.assign({},state);
   const {ikey,id,text} = action;
   let labelInx = getLabelIndex(ikey);
@@ -76,7 +77,7 @@ export function setRadioValue(state,action){console.log(221)
     });
     res.saveText[labelInx] = hasValue?sub.join(''):'';
   }
-  res.saveText = fullfillText(res.data).saveText;
+  // res.saveText = fullfillText(res.data).saveText;
   res.update = Math.random();
   return res;
 }

src/store/actions/currentIll.js

@@ -210,29 +210,31 @@ export const confirm = (state,action) =>{
   let length1 = res.data.length;console.log(123,action);
   let arr = JSON.parse(JSON.stringify(res.data));
   const {nones,exists,withs,ikey,exclusion,excluName,ban,noneIds} = action.data;
-  let existsId = getIds(exists);
-  let withsId = getIds(withs);
+  let existsId = exists && exists.length>0?getIds(exists):[];
+  let withsId = withs && withs.length>0?getIds(withs):[];
   res.symptomIds = res.symptomIds.concat(existsId,withsId,noneIds);//搜索去重
   // 伴 标签
   const banText = JSON.stringify(ban)=='{}'?'':{id:ban.id,name:ban.name,value:ban.name,tagType:config.tagType};
-  
+
   // 处理主症状标签及尾巴展开symptomType=1
-  if(exists.length>0){
-    for(let i in exists){
-      arr.splice(ikey,0,getLabel(exists[i].id,exists[i].questionMapping.length==0?exists[i].name+'，':exists[i].name),...(exists[i].questionMapping.filter((item)=>{return item.symptomType==0||item.symptomType==1;})));
+  if(exists && exists.length>0){
+    // for(let i in exists){//ie8不支持for in循环
+     for(let i=0;i<exists.length; i++){
+      arr.splice(ikey,0,getLabel(exists[i].id,exists[i].questionMapping && exists[i].questionMapping.length==0?exists[i].name+'，':exists[i].name),...(exists[i].questionMapping && exists[i].questionMapping.filter((item)=>{return item.symptomType==0||item.symptomType==1;})));
     }
   }
 
   let length = arr.length - length1;
   let withsArr = JSON.parse(JSON.stringify(arr));
   // 伴 伴随症状标签及尾巴展开symptomType=2
-  if(withs.length>0){
-    for(let i in withs){
+  if(withs && withs.length>0){
+    // for(let i in withs){
+    for(let i=0;i<withs.length; i++){
       // withsArr.splice(parseInt(ikey)+length,0,banText,getLabel(withs[i].id,withs[i].name),...(withs[i].questionMapping.filter((item)=>{return item.symptomType==0||item.symptomType==2;})));
-      withsArr.splice(parseInt(ikey)+length,0,getLabel(withs[i].id,withs[i].questionMapping.length==0?(ban.name+withs[i].name+'，'):(ban.name+withs[i].name)),...(withs[i].questionMapping.filter((item)=>{return item.symptomType==0||item.symptomType==2;})));
+      withsArr.splice(parseInt(ikey)+length,0,getLabel(withs[i].id,withs[i].questionMapping && withs[i].questionMapping.length==0?(ban.name+withs[i].name+'，'):(ban.name+withs[i].name)),...(withs[i].questionMapping && withs[i].questionMapping.filter((item)=>{return item.symptomType==0||item.symptomType==2;})));
     }
   }
-  
+
   // 无 不用展开
   let lengthN = withsArr.length - length1;
   let noneArr = JSON.parse(JSON.stringify(withsArr));  
@@ -247,7 +249,7 @@ export const confirm = (state,action) =>{
   // res.data = resData;
   res.data = fullfillText(resData).newArr;
   res.saveText = fullfillText(resData).saveText;
-  res.update=Math.random(); 
+  res.update=Math.random();
   return res;
 };
 

src/store/actions/mainSuit.js

@@ -127,12 +127,18 @@ export const confirm = (state,action) =>{
   let arr = res.data;
   let saveText = JSON.parse(JSON.stringify(res.saveText));
   const {exists,withs,ikey,withsName,existsName,ban} = action.data;
-  let existsId = getIds(exists);
-  let withsId = getIds(withs);
+  // let existsId = getIds(exists);
+  // let withsId = getIds(withs);
   let banText = JSON.stringify(ban) == "{}" ? '':{id:ban.id,name:ban.name,value:ban.name,tagType:config.tagType};
-  res.mainIds = res.mainIds?res.mainIds.concat(existsId,withsId):[];
+  // res.mainIds = res.mainIds?res.mainIds.concat(existsId,withsId):[];
   let length = exists.length;
   let labelIndx = parseInt(ikey);//当前点击标签的index
+  // 取第一个添加症状的主症状和伴随
+  if(!arr[labelIndx].pos){
+    let existsId = getIds(exists);
+    let withsId = getIds(withs);
+    res.mainIds = res.mainIds?res.mainIds.concat(existsId,withsId):[];
+  }
 
   let text = saveText.slice(0,labelIndx);
   let index = text.indexOf('伴');