首页 发现 帮助
注册 登录
front
/
newICSS
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Squashed commit of the following:

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

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

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

    查体框可编辑状态删除

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

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

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

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

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

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

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

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

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

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

    搜索bug修改

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

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

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

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

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

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

    # Conflicts:
    #	src/containers/OtherHistory.js

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

    之前修改的bug找回

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

    改为全局弹窗显示

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

    修改添加诊断推送

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

    弹窗高度动态设置

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

    无选中项体温输入bug修改

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

    Merge branch 'dev/new1' into dev/byll

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

    bug修改

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

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

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

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

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

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

     删除console

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

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

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

    合并

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

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

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

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

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

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

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

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

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

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

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

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

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

    更新

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

    其他史有伴无排序

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

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

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

    复诊主诉文本模式bug

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

    Merge branch 'dev/new1' into dev/otherHis

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

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

    双击隐藏下拉

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

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

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

    修改版本信息样式

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

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

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

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

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

    滚动兼容

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

    现病史病程变化

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

    注释scrollTo

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

    Squashed commit of the following:

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

        打印医生签名自动获取

    commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 14:09:41 2019 +0800

        样式调整

    commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 14:02:27 2019 +0800

        化验填写单清空按钮，弹窗还在

    commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 13:46:36 2019 +0800

        模板列表获取时机

    commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 13:34:03 2019 +0800

        模板名称重复弹窗不关闭

    commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 30 10:46:13 2019 +0800

        模板保存跟之前所有保存的模板作对比

    commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 17:35:01 2019 +0800

        底部几个按钮换行设置最小宽度

    commit 7400613a1eb642e1d01004c7818883fd73c2350c
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 17:28:45 2019 +0800

        历史病例时间和按钮不能共存

    commit eda3f4b08a3460360541cd2af1c2ca071681c595
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 17:12:47 2019 +0800

        bug修改

    commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 15:54:49 2019 +0800

        还是符号处理...

    commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 14:17:40 2019 +0800

        顿号去重

    commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
    Merge: 4095b3f b09559b
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 13:59:54 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 13:55:47 2019 +0800

        样式宽度更改和逗号处理

    commit 79e0195a9b13069db729afe732bc5b466d43a37f
    Author: Luolei <16657115156@163.com>
    Date:   Fri Jan 25 14:06:09 2019 +0800

        date修改

    # Conflicts:
    #	src/utils/tools.js

commit 6df92ea9ddd29c14979874f2f0e7eac54d032eaf
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jan 30 16:07:27 2019 +0800

    Squashed commit of the following:

    commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 15:20:06 2019 +0800

        治疗方案样式

    commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 15:18:20 2019 +0800

        修改治疗方案样式

    commit 859a7364a96569f6aa92360efbce5a19b40681cb
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 14:32:44 2019 +0800

        修改治疗方案小标题样式

    commit 99789b23f06c18e5b588552066faf7f2ccacf198
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 14:07:48 2019 +0800

        修改治疗方案同类药物

    commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Jan 30 14:00:40 2019 +0800

        修改弹窗IE8不居中

    commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 20:30:39 2019 +0800

        治疗方案高度自适应

    commit c000d83fb6ac5f265951c0e1377b627d24d2da10
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 17:27:30 2019 +0800

        修改治疗方案边框

    commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 15:58:28 2019 +0800

        导入化验结果，第一次添加诊断为主诉时不往主诉添加字符串

    commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 15:56:03 2019 +0800

        治疗方案标题添加疾病名称

    commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 15:22:37 2019 +0800

        修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串

    commit 799eef5c34a21f9d90bc82a40240838cf10ba601
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:41:20 2019 +0800

        ie8治疗方案遮罩

    commit fee35d5473b69aafb5335759006a93fea8d14145
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:05:16 2019 +0800

        治疗方案遮罩IE8

    commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:04:58 2019 +0800

        修改右侧推送字体大小

    commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 13:26:56 2019 +0800

        修改化验项开单逗号问题

    commit 29b2499b796085a682a936d82c97decc35edf891
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Jan 25 13:50:07 2019 +0800

        修改版本信息和免责声明位置

    # Conflicts:
    #	src/components/Treat/index.jsx
    #	src/components/Treat/index.less
    #	src/store/async-actions/diagnosticList.js
    #	src/store/async-actions/treat.js

commit 20f96c311119b635dad33f6c9222d94d8563bbfe
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jan 30 16:02:31 2019 +0800

    Squashed commit of the following:

    commit 27178b569e9575d450bbf1ce329e069d4c4b4b8c
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 30 15:57:20 2019 +0800

        ie8现病史添加症状报错的问题&查体血压选中不变黑的问题

    commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 18:17:15 2019 +0800

        查体模板添加逗号，主诉两个时间处理
        Squashed commit of the following:

        commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:51:09 2019 +0800

            Squashed commit of the following:

            commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 14:17:40 2019 +0800

                顿号去重

            commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
            Merge: 4095b3f b09559b
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:59:54 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:55:47 2019 +0800

                样式宽度更改和逗号处理

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit fea9a721ccb5afb9f1873c2111e3722d7330d394
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:50:07 2019 +0800

            Squashed commit of the following:

            commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:22:37 2019 +0800

                修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串

            commit 799eef5c34a21f9d90bc82a40240838cf10ba601
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:41:20 2019 +0800

                ie8治疗方案遮罩

            commit fee35d5473b69aafb5335759006a93fea8d14145
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:05:16 2019 +0800

                治疗方案遮罩IE8

            commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:04:58 2019 +0800

                修改右侧推送字体大小

            commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 13:26:56 2019 +0800

                修改化验项开单逗号问题

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

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

        commit 2c70e41e7a5254838436b499b1ad787f523585f8
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:42:54 2019 +0800

            Squashed commit of the following:

            commit 519f23c91954f87e836cbd400b158f774c498ba6
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:35:59 2019 +0800

                文本删除又出现的问题
                Squashed commit of the following:

                commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 11:44:56 2019 +0800

                    NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

                commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Jan 28 10:41:03 2019 +0800

                    Squashed commit of the following:

                    commit 79e0195a9b13069db729afe732bc5b466d43a37f
                    Author: Luolei <16657115156@163.com>
                    Date:   Fri Jan 25 14:06:09 2019 +0800

                        date修改

                commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Jan 28 10:38:40 2019 +0800

                    Squashed commit of the following:

                    commit 29b2499b796085a682a936d82c97decc35edf891
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Fri Jan 25 13:50:07 2019 +0800

                        修改版本信息和免责声明位置

                commit e36f2f1b811d6978117161f50b16dd5bae298547
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Jan 28 10:33:30 2019 +0800

                    Squashed commit of the following:

                    commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Fri Jan 25 15:59:14 2019 +0800

                        单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                    commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Fri Jan 25 14:21:41 2019 +0800

                        Squashed commit of the following:

                        commit d3e160a516240b77576567b993223816a68231a6
                        Merge: 79e63ed c7e9e73
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 13:46:48 2019 +0800

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

                        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 13:46:16 2019 +0800

                            化验辅捡ie8搜索卡死修改

                        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 13:12:43 2019 +0800

                            默认host地址删除

                        commit e01035349f92405572238a0a97d80bb557dda802
                        Merge: 8a8015d caad36f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 11:45:20 2019 +0800

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

                        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 10:59:52 2019 +0800

                            修改样式

                        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 09:46:01 2019 +0800

                            合并报错修改

                        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                        Merge: bbe85ff 58e0fdd
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 09:42:51 2019 +0800

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

                        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                        Merge: b86268a 3bfa819
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

                        commit b86268a57afae26c7972b4b2362ae656a6784a8d
                        Merge: 79c59d3 105488f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

                        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                        Merge: db90e04 de190a5
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 20:24:40 2019 +0800

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

                        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 20:18:42 2019 +0800

                            中英文逗号

                        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 18:31:55 2019 +0800

                            去掉英文逗号

                        commit 105488feef9e89309ecc23f2c9bce944da3490fb
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 17:22:34 2019 +0800

                            修改治疗方案

                        commit db90e04f23baf95466e34498ca06101f49a7ac7e
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 16:49:10 2019 +0800

                            下拉项间距调整，ie8事件兼容

                        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:09:49 2019 +0800

                            药品说明书样式

                        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:08:17 2019 +0800

                            修改药品说明书

                        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:06:17 2019 +0800

                            修改开单样式

                        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:02:30 2019 +0800

                            修改获取患者信息路径

                        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 13:43:38 2019 +0800

                            添加诊断判断有没有治疗方案

                        commit f617e5c267246786e7a6801cc87811f0d2527235
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 13:39:13 2019 +0800

                            merge from 'dev/zxc'

                        commit 87e941c29ed951540497c18c0a493c55b222ce00
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 10:33:44 2019 +0800

                            提示语

                        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                        Merge: d3ade00 95e9a94
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 10:09:57 2019 +0800

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

                            # Conflicts:
                            #	src/components/DiagnosticList/index.jsx
                            #	src/components/Operation/index.jsx
                            #	src/containers/SpreadDrop.js
                            #	src/store/actions/otherHistory.js
                            #	src/store/async-actions/treat.js
                            #	src/store/types/checkBody.js

                        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                        Merge: 2fd497e 2458ea1
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 10:05:17 2019 +0800

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

                        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 10:03:28 2019 +0800

                            提示语消失默认时间改为2秒

                        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 10:02:00 2019 +0800

                            治疗方案置灰

                        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:59:16 2019 +0800

                            治疗方案

                        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                        Merge: 62bd7fb 38f9720
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:47:47 2019 +0800

                            Merge branch 'dev/new' into dev/zhangxc

                        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:46:32 2019 +0800

                            Revert "Revert "修改药品说明样式""

                            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                        Merge: 28c364a c37d1cc
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 09:46:00 2019 +0800

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

                        commit 1cba16137b012f54873b193ab6b16968022d0c96
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:45:29 2019 +0800

                            Revert "修改药品说明样式"

                            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 09:25:58 2019 +0800

                            搜索列表显示样式更改

                        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 09:15:40 2019 +0800

                            样式调整

                        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 21:22:29 2019 +0800

                            修改导入host

                        commit f75c649c857013b890959fa7e1d3992912ddd1ca
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 21:15:44 2019 +0800

                            临时修改版本弹窗高度

                        commit e0376902fb956ee58c40b86ae97b924ce5955e75
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 21:10:27 2019 +0800

                            化验导入删除填值推送

                        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 20:43:48 2019 +0800

                            添加删除辅捡右侧推送

                        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 20:30:50 2019 +0800

                            修改杂音选中项bug

                        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                        Merge: b489e52 6a1a3df
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 18:58:07 2019 +0800

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

                        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 18:57:50 2019 +0800

                            既往史无殊选中bug

                        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 18:57:03 2019 +0800

                            css

                        commit 96efc7b8118a99db629f898960621b98786bd42e
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 18:26:40 2019 +0800

                            合罗磊分支

                        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:49:02 2019 +0800

                            回退

                        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                        Merge: 6732dbb 1dd6c92
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:44:02 2019 +0800

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

                            # Conflicts:
                            #	src/common/components/TailInlineTag/index.less
                            #	src/common/components/Textarea/index.jsx
                            #	src/components/AddAssistCheck/index.jsx
                            #	src/containers/OtherHistory.js
                            #	src/store/actions/otherHistory.js

                        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                        Merge: bc168f8 abd1267
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

                        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                        Merge: 3559798 6d55c59
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:34:30 2019 +0800

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

                        commit 3559798c04e69583c1f05fc9125c812a9933892f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:31:13 2019 +0800

                            既往史下拉滚动条添加

                        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:22:01 2019 +0800

                            修改请求地址

                        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 17:16:22 2019 +0800

                            辅检横向滚动

                        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                        Merge: adc853a 45b1158
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 16:53:11 2019 +0800

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

                            # Conflicts:
                            #	src/utils/config.js

                        commit cf97be2f425bdef386a137e92929969c321ab047
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 16:08:25 2019 +0800

                            去掉一个字

                        commit 1a8521d3c3019063a3124a142e3241f84b43c409
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 16:01:26 2019 +0800

                            bug

                        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 15:58:40 2019 +0800

                            其他史高血压选中bug修改

                        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 15:16:32 2019 +0800

                            删除项有问题

                        commit ac64b868290f94c0a30e3242110a38cda67249eb
                        Merge: d2eca9d 1a6bf74
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 14:59:26 2019 +0800

                            Merge branch 'dev/liucf' into dev/luolei

                        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 14:51:07 2019 +0800

                            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 14:43:46 2019 +0800

                            日期bug

                        commit 38f972082b4a6b58e73f17d4d15302045cd48981
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 13:46:29 2019 +0800

                            请求地址修改-刚才反了

                        commit 70e9420d59b745c59f3abe04c33100777184d024
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 13:44:13 2019 +0800

                            请求地址修改

                        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 13:39:05 2019 +0800

                            打印图标

                        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 11:31:48 2019 +0800

                            其他史高血压数据展开

                        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 11:00:06 2019 +0800

                            查体type修改

                        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:58:27 2019 +0800

                            查体type修改

                        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                        Merge: 4b8aa34 540b6a8
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 10:51:52 2019 +0800

                            Merge branch 'dev/new' into dev/luolei

                        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 10:47:15 2019 +0800

                            搜索弹窗被遮挡问题解决

                        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:23:04 2019 +0800

                            地址临时修改

                        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:20:05 2019 +0800

                            版本信息弹窗高度限制

                        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:13:40 2019 +0800

                            推送接口主诉现病史合并，治疗方案容错

                        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                        Merge: 4a897b4 5a39d90
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:57:50 2019 +0800

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

                        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                        Merge: 7f1c7c8 abd1267
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:57:43 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            # Conflicts:
                            #	src/common/components/ItemBox/index.jsx
                            #	src/components/AddInspect/index.jsx
                            #	src/components/Diagnosis/index.jsx
                            #	src/components/Diagnosis/index.less

                        commit 5a39d90dd616740bce7e833646a455b713f5e579
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Wed Jan 23 09:52:01 2019 +0800

                            层级问题

                        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                        Merge: e5d0122 7f1c7c8
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Wed Jan 23 09:43:34 2019 +0800

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

                        commit e5d0122382957b2f9157a83b72adfb651b355f96
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Wed Jan 23 09:43:21 2019 +0800

                            11

                        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:39:50 2019 +0800

                            修改请求地址

                        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:38:05 2019 +0800

                            修改请求地址

                        commit b14968d42d5ed583714b5941365dc97fe24ea61b
                        Merge: df67559 a82d18c
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:26:50 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        commit df67559cc42c79c6ed6b27254ce12178918e32b0
                        Merge: ff817bf 6805811
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:26:39 2019 +0800

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

                        commit 68058110e041e72b8c95979a4fd23e690912746b
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 20:43:26 2019 +0800

                            遮罩统一0.6透明度

                        commit 625ca181024a268f16f32eb2773ea337cf62db43
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 20:34:59 2019 +0800

                            透明度ie8

                        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 20:24:39 2019 +0800

                            修改治疗方案无内容按钮置灰

                        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                        Merge: 9c0e078 84ec971
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 20:09:22 2019 +0800

                            merge from 'lcf'

                        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 19:01:31 2019 +0800

                            修改药品说明样式

                        commit ff817bf6d6d928b98557371362374859bec3aabd
                        Merge: d50ffe0 b2e679a
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:52:34 2019 +0800

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

                        commit b2e679a35e0ff4831f689758eb14521541f967e2
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:50:45 2019 +0800

                            导入ie8暂时先灰掉

                        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                        Merge: 573f0b5 b286d0a
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:25:09 2019 +0800

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

                            # Conflicts:
                            #	src/utils/config.js

                        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:23:57 2019 +0800

                            文本模式ie8onInput存值，搜索下拉项样式

                        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 15:30:07 2019 +0800

                            修改开单项到医嘱逗号

                        commit 573f0b59ff517de16f94296240572544e31c9f46
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:23:46 2019 +0800

                            合并后报错处理

                        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                        Merge: 55d15d6 fbab9de
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:18:22 2019 +0800

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

                            # Conflicts:
                            #	src/components/CurrentIll/index.jsx
                            #	src/containers/EditableSpan.js
                            #	src/store/actions/currentIll.js
                            #	src/store/reducers/checkBody.js
                            #	src/utils/ajax.js
                            #	src/utils/config.js

                        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                        Merge: 2d40e6e ad68815
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:10:38 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:02:18 2019 +0800

                            ie8的onInput代替函数

                        commit ad688156064254d6b615284642882ba5486ff764
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 10:29:36 2019 +0800

                            init

                        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 22 10:13:57 2019 +0800

                            updata pro

                        commit 26649f42178c7177ee34dae46038ce2370bf5b26
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 22 10:12:21 2019 +0800

                            test

                    commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Fri Jan 25 13:13:11 2019 +0800

                        单选和多选编辑失焦时调用推送接口

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

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

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

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

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

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

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

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

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

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

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

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

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

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

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

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

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

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

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

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

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

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

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

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

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

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

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

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

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

                # Conflicts:
                #	src/components/AddInspect/index.jsx
                #	src/components/Inspect/index.jsx
                #	src/components/PushItems/index.less
                #	src/store/actions/checkBody.js
                #	src/store/actions/currentIll.js
                #	src/store/actions/mainSuit.js
                #	src/store/actions/otherHistory.js

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

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

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

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

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

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

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

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

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

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

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

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

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

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

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

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

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

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

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

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

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

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

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

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

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

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

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

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

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/NumberDrop/index.jsx
            #	src/components/NumberUnitDrop/index.jsx
            #	src/store/actions/mainSuit.js

        commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 11:44:56 2019 +0800

            NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

        commit eec53100dcee36be4a80af88e65a5b9772f71f4d
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:41:03 2019 +0800

            Squashed commit of the following:

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:38:40 2019 +0800

            Squashed commit of the following:

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

        commit e36f2f1b811d6978117161f50b16dd5bae298547
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:33:30 2019 +0800

            Squashed commit of the following:

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

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

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

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

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

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

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

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

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

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

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

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

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

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

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

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

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

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

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

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

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

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

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

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

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

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

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

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

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

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

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

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

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

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

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

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

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

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

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

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

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

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

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

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

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

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

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

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

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

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

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

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

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

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

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

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

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

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

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

        # Conflicts:
        #	src/components/PushItems/index.jsx
        #	src/utils/tools.js

    commit 519f23c91954f87e836cbd400b158f774c498ba6
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 15:35:59 2019 +0800

        文本删除又出现的问题
        Squashed commit of the following:

        commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 11:44:56 2019 +0800

            NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

        commit eec53100dcee36be4a80af88e65a5b9772f71f4d
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:41:03 2019 +0800

            Squashed commit of the following:

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:38:40 2019 +0800

            Squashed commit of the following:

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

        commit e36f2f1b811d6978117161f50b16dd5bae298547
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:33:30 2019 +0800

            Squashed commit of the following:

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

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

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

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

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

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

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

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

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

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

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

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

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

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

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

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

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

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

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

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

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

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

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

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

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

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

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

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

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

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

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

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

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

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

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

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

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

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

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

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

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

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

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

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

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

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

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

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

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

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

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

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

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

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

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

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

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

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

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

        # Conflicts:
        #	src/components/AddInspect/index.jsx
        #	src/components/Inspect/index.jsx
        #	src/components/PushItems/index.less
        #	src/store/actions/checkBody.js
        #	src/store/actions/currentIll.js
        #	src/store/actions/mainSuit.js
        #	src/store/actions/otherHistory.js

    commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 15:59:14 2019 +0800

        单选、多选、时间单位组件双击编辑删除完内容时删除该标签

    commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 14:21:41 2019 +0800

        Squashed commit of the following:

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

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

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

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

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

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

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

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

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

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

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

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

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

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

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

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

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

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

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

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

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

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

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

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

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

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

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

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

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

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

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

    commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 13:13:11 2019 +0800

        单选和多选编辑失焦时调用推送接口

    # Conflicts:
    #	src/containers/NumberUnitDrop.js
    #	src/store/actions/checkBody.js

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

    打印医生签名自动获取

commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Jan 30 15:20:06 2019 +0800

    治疗方案样式

commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Jan 30 15:18:20 2019 +0800

    修改治疗方案样式

commit 859a7364a96569f6aa92360efbce5a19b40681cb
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Jan 30 14:32:44 2019 +0800

    修改治疗方案小标题样式

commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 30 14:09:41 2019 +0800

    样式调整

commit 99789b23f06c18e5b588552066faf7f2ccacf198
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Jan 30 14:07:48 2019 +0800

    修改治疗方案同类药物

commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 30 14:02:27 2019 +0800

    化验填写单清空按钮，弹窗还在

commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Jan 30 14:00:40 2019 +0800

    修改弹窗IE8不居中

commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 30 13:46:36 2019 +0800

    模板列表获取时机

commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 30 13:34:03 2019 +0800

    模板名称重复弹窗不关闭

commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 30 10:46:13 2019 +0800

    模板保存跟之前所有保存的模板作对比

commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 20:30:39 2019 +0800

    治疗方案高度自适应

commit 3e1c705ef6c2b2d0944ced37b8fa3f7c01307e25
Author: liucf <liucf@zjlantone.com>
Date:   Tue Jan 29 18:20:27 2019 +0800

    Squashed commit of the following:

    commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 18:17:15 2019 +0800

        查体模板添加逗号，主诉两个时间处理
        Squashed commit of the following:

        commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:51:09 2019 +0800

            Squashed commit of the following:

            commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 14:17:40 2019 +0800

                顿号去重

            commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
            Merge: 4095b3f b09559b
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:59:54 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:55:47 2019 +0800

                样式宽度更改和逗号处理

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit fea9a721ccb5afb9f1873c2111e3722d7330d394
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:50:07 2019 +0800

            Squashed commit of the following:

            commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:22:37 2019 +0800

                修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串

            commit 799eef5c34a21f9d90bc82a40240838cf10ba601
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:41:20 2019 +0800

                ie8治疗方案遮罩

            commit fee35d5473b69aafb5335759006a93fea8d14145
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:05:16 2019 +0800

                治疗方案遮罩IE8

            commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:04:58 2019 +0800

                修改右侧推送字体大小

            commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 13:26:56 2019 +0800

                修改化验项开单逗号问题

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

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

        commit 2c70e41e7a5254838436b499b1ad787f523585f8
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:42:54 2019 +0800

            Squashed commit of the following:

            commit 519f23c91954f87e836cbd400b158f774c498ba6
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:35:59 2019 +0800

                文本删除又出现的问题
                Squashed commit of the following:

                commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 11:44:56 2019 +0800

                    NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

                commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Jan 28 10:41:03 2019 +0800

                    Squashed commit of the following:

                    commit 79e0195a9b13069db729afe732bc5b466d43a37f
                    Author: Luolei <16657115156@163.com>
                    Date:   Fri Jan 25 14:06:09 2019 +0800

                        date修改

                commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Jan 28 10:38:40 2019 +0800

                    Squashed commit of the following:

                    commit 29b2499b796085a682a936d82c97decc35edf891
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Fri Jan 25 13:50:07 2019 +0800

                        修改版本信息和免责声明位置

                commit e36f2f1b811d6978117161f50b16dd5bae298547
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Jan 28 10:33:30 2019 +0800

                    Squashed commit of the following:

                    commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Fri Jan 25 15:59:14 2019 +0800

                        单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                    commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Fri Jan 25 14:21:41 2019 +0800

                        Squashed commit of the following:

                        commit d3e160a516240b77576567b993223816a68231a6
                        Merge: 79e63ed c7e9e73
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 13:46:48 2019 +0800

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

                        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 13:46:16 2019 +0800

                            化验辅捡ie8搜索卡死修改

                        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 13:12:43 2019 +0800

                            默认host地址删除

                        commit e01035349f92405572238a0a97d80bb557dda802
                        Merge: 8a8015d caad36f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 11:45:20 2019 +0800

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

                        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 10:59:52 2019 +0800

                            修改样式

                        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 09:46:01 2019 +0800

                            合并报错修改

                        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                        Merge: bbe85ff 58e0fdd
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 09:42:51 2019 +0800

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

                        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                        Merge: b86268a 3bfa819
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

                        commit b86268a57afae26c7972b4b2362ae656a6784a8d
                        Merge: 79c59d3 105488f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

                        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                        Merge: db90e04 de190a5
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 20:24:40 2019 +0800

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

                        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 20:18:42 2019 +0800

                            中英文逗号

                        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 18:31:55 2019 +0800

                            去掉英文逗号

                        commit 105488feef9e89309ecc23f2c9bce944da3490fb
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 17:22:34 2019 +0800

                            修改治疗方案

                        commit db90e04f23baf95466e34498ca06101f49a7ac7e
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 16:49:10 2019 +0800

                            下拉项间距调整，ie8事件兼容

                        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:09:49 2019 +0800

                            药品说明书样式

                        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:08:17 2019 +0800

                            修改药品说明书

                        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:06:17 2019 +0800

                            修改开单样式

                        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:02:30 2019 +0800

                            修改获取患者信息路径

                        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 13:43:38 2019 +0800

                            添加诊断判断有没有治疗方案

                        commit f617e5c267246786e7a6801cc87811f0d2527235
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 13:39:13 2019 +0800

                            merge from 'dev/zxc'

                        commit 87e941c29ed951540497c18c0a493c55b222ce00
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 10:33:44 2019 +0800

                            提示语

                        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                        Merge: d3ade00 95e9a94
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 10:09:57 2019 +0800

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

                            # Conflicts:
                            #	src/components/DiagnosticList/index.jsx
                            #	src/components/Operation/index.jsx
                            #	src/containers/SpreadDrop.js
                            #	src/store/actions/otherHistory.js
                            #	src/store/async-actions/treat.js
                            #	src/store/types/checkBody.js

                        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                        Merge: 2fd497e 2458ea1
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 10:05:17 2019 +0800

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

                        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 10:03:28 2019 +0800

                            提示语消失默认时间改为2秒

                        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 10:02:00 2019 +0800

                            治疗方案置灰

                        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:59:16 2019 +0800

                            治疗方案

                        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                        Merge: 62bd7fb 38f9720
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:47:47 2019 +0800

                            Merge branch 'dev/new' into dev/zhangxc

                        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:46:32 2019 +0800

                            Revert "Revert "修改药品说明样式""

                            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                        Merge: 28c364a c37d1cc
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 09:46:00 2019 +0800

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

                        commit 1cba16137b012f54873b193ab6b16968022d0c96
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:45:29 2019 +0800

                            Revert "修改药品说明样式"

                            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 09:25:58 2019 +0800

                            搜索列表显示样式更改

                        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 09:15:40 2019 +0800

                            样式调整

                        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 21:22:29 2019 +0800

                            修改导入host

                        commit f75c649c857013b890959fa7e1d3992912ddd1ca
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 21:15:44 2019 +0800

                            临时修改版本弹窗高度

                        commit e0376902fb956ee58c40b86ae97b924ce5955e75
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 21:10:27 2019 +0800

                            化验导入删除填值推送

                        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 20:43:48 2019 +0800

                            添加删除辅捡右侧推送

                        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 20:30:50 2019 +0800

                            修改杂音选中项bug

                        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                        Merge: b489e52 6a1a3df
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 18:58:07 2019 +0800

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

                        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 18:57:50 2019 +0800

                            既往史无殊选中bug

                        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 18:57:03 2019 +0800

                            css

                        commit 96efc7b8118a99db629f898960621b98786bd42e
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 18:26:40 2019 +0800

                            合罗磊分支

                        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:49:02 2019 +0800

                            回退

                        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                        Merge: 6732dbb 1dd6c92
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:44:02 2019 +0800

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

                            # Conflicts:
                            #	src/common/components/TailInlineTag/index.less
                            #	src/common/components/Textarea/index.jsx
                            #	src/components/AddAssistCheck/index.jsx
                            #	src/containers/OtherHistory.js
                            #	src/store/actions/otherHistory.js

                        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                        Merge: bc168f8 abd1267
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

                        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                        Merge: 3559798 6d55c59
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:34:30 2019 +0800

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

                        commit 3559798c04e69583c1f05fc9125c812a9933892f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:31:13 2019 +0800

                            既往史下拉滚动条添加

                        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:22:01 2019 +0800

                            修改请求地址

                        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 17:16:22 2019 +0800

                            辅检横向滚动

                        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                        Merge: adc853a 45b1158
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 16:53:11 2019 +0800

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

                            # Conflicts:
                            #	src/utils/config.js

                        commit cf97be2f425bdef386a137e92929969c321ab047
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 16:08:25 2019 +0800

                            去掉一个字

                        commit 1a8521d3c3019063a3124a142e3241f84b43c409
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 16:01:26 2019 +0800

                            bug

                        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 15:58:40 2019 +0800

                            其他史高血压选中bug修改

                        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 15:16:32 2019 +0800

                            删除项有问题

                        commit ac64b868290f94c0a30e3242110a38cda67249eb
                        Merge: d2eca9d 1a6bf74
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 14:59:26 2019 +0800

                            Merge branch 'dev/liucf' into dev/luolei

                        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 14:51:07 2019 +0800

                            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 14:43:46 2019 +0800

                            日期bug

                        commit 38f972082b4a6b58e73f17d4d15302045cd48981
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 13:46:29 2019 +0800

                            请求地址修改-刚才反了

                        commit 70e9420d59b745c59f3abe04c33100777184d024
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 13:44:13 2019 +0800

                            请求地址修改

                        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 13:39:05 2019 +0800

                            打印图标

                        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 11:31:48 2019 +0800

                            其他史高血压数据展开

                        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 11:00:06 2019 +0800

                            查体type修改

                        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:58:27 2019 +0800

                            查体type修改

                        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                        Merge: 4b8aa34 540b6a8
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 10:51:52 2019 +0800

                            Merge branch 'dev/new' into dev/luolei

                        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 10:47:15 2019 +0800

                            搜索弹窗被遮挡问题解决

                        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:23:04 2019 +0800

                            地址临时修改

                        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:20:05 2019 +0800

                            版本信息弹窗高度限制

                        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:13:40 2019 +0800

                            推送接口主诉现病史合并，治疗方案容错

                        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                        Merge: 4a897b4 5a39d90
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:57:50 2019 +0800

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

                        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                        Merge: 7f1c7c8 abd1267
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:57:43 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            # Conflicts:
                            #	src/common/components/ItemBox/index.jsx
                            #	src/components/AddInspect/index.jsx
                            #	src/components/Diagnosis/index.jsx
                            #	src/components/Diagnosis/index.less

                        commit 5a39d90dd616740bce7e833646a455b713f5e579
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Wed Jan 23 09:52:01 2019 +0800

                            层级问题

                        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                        Merge: e5d0122 7f1c7c8
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Wed Jan 23 09:43:34 2019 +0800

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

                        commit e5d0122382957b2f9157a83b72adfb651b355f96
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Wed Jan 23 09:43:21 2019 +0800

                            11

                        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:39:50 2019 +0800

                            修改请求地址

                        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:38:05 2019 +0800

                            修改请求地址

                        commit b14968d42d5ed583714b5941365dc97fe24ea61b
                        Merge: df67559 a82d18c
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:26:50 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        commit df67559cc42c79c6ed6b27254ce12178918e32b0
                        Merge: ff817bf 6805811
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:26:39 2019 +0800

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

                        commit 68058110e041e72b8c95979a4fd23e690912746b
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 20:43:26 2019 +0800

                            遮罩统一0.6透明度

                        commit 625ca181024a268f16f32eb2773ea337cf62db43
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 20:34:59 2019 +0800

                            透明度ie8

                        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 20:24:39 2019 +0800

                            修改治疗方案无内容按钮置灰

                        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                        Merge: 9c0e078 84ec971
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 20:09:22 2019 +0800

                            merge from 'lcf'

                        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 19:01:31 2019 +0800

                            修改药品说明样式

                        commit ff817bf6d6d928b98557371362374859bec3aabd
                        Merge: d50ffe0 b2e679a
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:52:34 2019 +0800

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

                        commit b2e679a35e0ff4831f689758eb14521541f967e2
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:50:45 2019 +0800

                            导入ie8暂时先灰掉

                        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                        Merge: 573f0b5 b286d0a
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:25:09 2019 +0800

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

                            # Conflicts:
                            #	src/utils/config.js

                        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:23:57 2019 +0800

                            文本模式ie8onInput存值，搜索下拉项样式

                        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 15:30:07 2019 +0800

                            修改开单项到医嘱逗号

                        commit 573f0b59ff517de16f94296240572544e31c9f46
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:23:46 2019 +0800

                            合并后报错处理

                        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                        Merge: 55d15d6 fbab9de
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:18:22 2019 +0800

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

                            # Conflicts:
                            #	src/components/CurrentIll/index.jsx
                            #	src/containers/EditableSpan.js
                            #	src/store/actions/currentIll.js
                            #	src/store/reducers/checkBody.js
                            #	src/utils/ajax.js
                            #	src/utils/config.js

                        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                        Merge: 2d40e6e ad68815
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:10:38 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:02:18 2019 +0800

                            ie8的onInput代替函数

                        commit ad688156064254d6b615284642882ba5486ff764
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 10:29:36 2019 +0800

                            init

                        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 22 10:13:57 2019 +0800

                            updata pro

                        commit 26649f42178c7177ee34dae46038ce2370bf5b26
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 22 10:12:21 2019 +0800

                            test

                    commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Fri Jan 25 13:13:11 2019 +0800

                        单选和多选编辑失焦时调用推送接口

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

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

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

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

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

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

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

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

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

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

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

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

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

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

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

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

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

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

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

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

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

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

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

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

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

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

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

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

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

                # Conflicts:
                #	src/components/AddInspect/index.jsx
                #	src/components/Inspect/index.jsx
                #	src/components/PushItems/index.less
                #	src/store/actions/checkBody.js
                #	src/store/actions/currentIll.js
                #	src/store/actions/mainSuit.js
                #	src/store/actions/otherHistory.js

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

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

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

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

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

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

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

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

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

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

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

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

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

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

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

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

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

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

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

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

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

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

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

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

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

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

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

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

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/NumberDrop/index.jsx
            #	src/components/NumberUnitDrop/index.jsx
            #	src/store/actions/mainSuit.js

        commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 11:44:56 2019 +0800

            NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

        commit eec53100dcee36be4a80af88e65a5b9772f71f4d
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:41:03 2019 +0800

            Squashed commit of the following:

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:38:40 2019 +0800

            Squashed commit of the following:

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

        commit e36f2f1b811d6978117161f50b16dd5bae298547
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:33:30 2019 +0800

            Squashed commit of the following:

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

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

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

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

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

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

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

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

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

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

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

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

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

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

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

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

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

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

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

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

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

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

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

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

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

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

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

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

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

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

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

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

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

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

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

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

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

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

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

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

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

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

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

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

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

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

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

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

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

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

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

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

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

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

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

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

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

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

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

        # Conflicts:
        #	src/components/PushItems/index.jsx
        #	src/utils/tools.js

    commit 519f23c91954f87e836cbd400b158f774c498ba6
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 15:35:59 2019 +0800

        文本删除又出现的问题
        Squashed commit of the following:

        commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 11:44:56 2019 +0800

            NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

        commit eec53100dcee36be4a80af88e65a5b9772f71f4d
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:41:03 2019 +0800

            Squashed commit of the following:

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:38:40 2019 +0800

            Squashed commit of the following:

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

        commit e36f2f1b811d6978117161f50b16dd5bae298547
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:33:30 2019 +0800

            Squashed commit of the following:

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

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

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

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

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

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

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

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

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

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

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

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

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

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

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

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

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

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

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

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

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

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

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

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

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

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

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

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

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

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

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

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

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

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

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

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

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

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

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

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

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

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

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

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

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

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

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

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

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

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

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

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

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

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

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

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

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

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

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

        # Conflicts:
        #	src/components/AddInspect/index.jsx
        #	src/components/Inspect/index.jsx
        #	src/components/PushItems/index.less
        #	src/store/actions/checkBody.js
        #	src/store/actions/currentIll.js
        #	src/store/actions/mainSuit.js
        #	src/store/actions/otherHistory.js

    commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 15:59:14 2019 +0800

        单选、多选、时间单位组件双击编辑删除完内容时删除该标签

    commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 14:21:41 2019 +0800

        Squashed commit of the following:

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

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

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

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

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

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

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

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

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

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

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

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

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

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

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

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

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

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

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

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

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

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

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

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

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

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

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

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

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

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

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

    commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 13:13:11 2019 +0800

        单选和多选编辑失焦时调用推送接口

commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 17:35:01 2019 +0800

    底部几个按钮换行设置最小宽度

commit 7400613a1eb642e1d01004c7818883fd73c2350c
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 17:28:45 2019 +0800

    历史病例时间和按钮不能共存

commit c000d83fb6ac5f265951c0e1377b627d24d2da10
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 17:27:30 2019 +0800

    修改治疗方案边框

commit eda3f4b08a3460360541cd2af1c2ca071681c595
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 17:12:47 2019 +0800

    bug修改

commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 15:54:49 2019 +0800

    还是符号处理...

commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 15:58:28 2019 +0800

    导入化验结果，第一次添加诊断为主诉时不往主诉添加字符串

commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 15:56:03 2019 +0800

    治疗方案标题添加疾病名称

commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
Author: liucf <liucf@zjlantone.com>
Date:   Tue Jan 29 15:51:09 2019 +0800

    Squashed commit of the following:

    commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 14:17:40 2019 +0800

        顿号去重

    commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
    Merge: 4095b3f b09559b
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 13:59:54 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 13:55:47 2019 +0800

        样式宽度更改和逗号处理

    commit 79e0195a9b13069db729afe732bc5b466d43a37f
    Author: Luolei <16657115156@163.com>
    Date:   Fri Jan 25 14:06:09 2019 +0800

        date修改

commit fea9a721ccb5afb9f1873c2111e3722d7330d394
Author: liucf <liucf@zjlantone.com>
Date:   Tue Jan 29 15:50:07 2019 +0800

    Squashed commit of the following:

    commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 15:22:37 2019 +0800

        修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串

    commit 799eef5c34a21f9d90bc82a40240838cf10ba601
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:41:20 2019 +0800

        ie8治疗方案遮罩

    commit fee35d5473b69aafb5335759006a93fea8d14145
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:05:16 2019 +0800

        治疗方案遮罩IE8

    commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:04:58 2019 +0800

        修改右侧推送字体大小

    commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 13:26:56 2019 +0800

        修改化验项开单逗号问题

    commit 29b2499b796085a682a936d82c97decc35edf891
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Jan 25 13:50:07 2019 +0800

        修改版本信息和免责声明位置

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

commit 2c70e41e7a5254838436b499b1ad787f523585f8
Author: liucf <liucf@zjlantone.com>
Date:   Tue Jan 29 15:42:54 2019 +0800

    Squashed commit of the following:

    commit 519f23c91954f87e836cbd400b158f774c498ba6
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 15:35:59 2019 +0800

        文本删除又出现的问题
        Squashed commit of the following:

        commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 11:44:56 2019 +0800

            NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

        commit eec53100dcee36be4a80af88e65a5b9772f71f4d
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:41:03 2019 +0800

            Squashed commit of the following:

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:38:40 2019 +0800

            Squashed commit of the following:

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

        commit e36f2f1b811d6978117161f50b16dd5bae298547
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:33:30 2019 +0800

            Squashed commit of the following:

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

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

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

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

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

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

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

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

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

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

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

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

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

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

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

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

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

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

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

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

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

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

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

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

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

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

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

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

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

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

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

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

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

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

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

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

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

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

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

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

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

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

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

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

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

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

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

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

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

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

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

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

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

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

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

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

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

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

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

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

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

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

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

        # Conflicts:
        #	src/components/AddInspect/index.jsx
        #	src/components/Inspect/index.jsx
        #	src/components/PushItems/index.less
        #	src/store/actions/checkBody.js
        #	src/store/actions/currentIll.js
        #	src/store/actions/mainSuit.js
        #	src/store/actions/otherHistory.js

    commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 15:59:14 2019 +0800

        单选、多选、时间单位组件双击编辑删除完内容时删除该标签

    commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 14:21:41 2019 +0800

        Squashed commit of the following:

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

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

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

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

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

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

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

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

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

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

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

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

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

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

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

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

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

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

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

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

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

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

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

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

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

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

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

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

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

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

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

    commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 13:13:11 2019 +0800

        单选和多选编辑失焦时调用推送接口

    # Conflicts:
    #	src/common/components/EditableSpan/index.jsx
    #	src/components/NumberDrop/index.jsx
    #	src/components/NumberUnitDrop/index.jsx
    #	src/store/actions/mainSuit.js

commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 15:22:37 2019 +0800

    修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串

commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 14:41:20 2019 +0800

    ie8治疗方案遮罩

commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 14:17:40 2019 +0800

    顿号去重

commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 14:05:16 2019 +0800

    治疗方案遮罩IE8

commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 14:04:58 2019 +0800

    修改右侧推送字体大小

commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 13:59:54 2019 +0800

    Merge branch 'dev/new1' into dev/byll

commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 13:55:47 2019 +0800

    样式宽度更改和逗号处理

commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 13:26:56 2019 +0800

    修改化验项开单逗号问题

commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date:   Tue Jan 29 11:44:56 2019 +0800

    NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date:   Mon Jan 28 10:41:03 2019 +0800

    Squashed commit of the following:

    commit 79e0195a9b13069db729afe732bc5b466d43a37f
    Author: Luolei <16657115156@163.com>
    Date:   Fri Jan 25 14:06:09 2019 +0800

        date修改

commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date:   Mon Jan 28 10:38:40 2019 +0800

    Squashed commit of the following:

    commit 29b2499b796085a682a936d82c97decc35edf891
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Jan 25 13:50:07 2019 +0800

        修改版本信息和免责声明位置

commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date:   Mon Jan 28 10:33:30 2019 +0800

    Squashed commit of the following:

    commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 15:59:14 2019 +0800

        单选、多选、时间单位组件双击编辑删除完内容时删除该标签

    commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 14:21:41 2019 +0800

        Squashed commit of the following:

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

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

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

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

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

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

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

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

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

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

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

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

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

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

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

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

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

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

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

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

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

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

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

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

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

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

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

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

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

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

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

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

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

    commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 13:13:11 2019 +0800

        单选和多选编辑失焦时调用推送接口

commit d6751d916bd9aff60373a28ce2240bc078809e9a
Author: liucf <liucf@zjlantone.com>
Date:   Mon Jan 28 09:51:31 2019 +0800

    合并new1分支
    Squashed commit of the following:

    commit d3e160a516240b77576567b993223816a68231a6
    Merge: 79e63ed c7e9e73
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 13:46:48 2019 +0800

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

    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 13:46:16 2019 +0800

        化验辅捡ie8搜索卡死修改

    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 13:12:43 2019 +0800

        默认host地址删除

    commit e01035349f92405572238a0a97d80bb557dda802
    Merge: 8a8015d caad36f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 11:45:20 2019 +0800

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

    commit caad36f002904aa859a0d780eefdf5b9cdc9011e
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 11:24:02 2019 +0800

        时间单位组件IE兼容

    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 10:59:52 2019 +0800

        修改样式

    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 09:46:01 2019 +0800

        合并报错修改

    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
    Merge: bbe85ff 58e0fdd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 09:42:51 2019 +0800

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

    commit 58e0fdd1ab99664163923ff7ae455efff5850195
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 09:20:30 2019 +0800

        主诉IE兼容性处理

    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
    Merge: b86268a 3bfa819
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

    commit b86268a57afae26c7972b4b2362ae656a6784a8d
    Merge: 79c59d3 105488f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
    Merge: db90e04 de190a5
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 20:24:40 2019 +0800

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

    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 20:18:42 2019 +0800

        中英文逗号

    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 18:31:55 2019 +0800

        去掉英文逗号

    commit 105488feef9e89309ecc23f2c9bce944da3490fb
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 17:22:34 2019 +0800

        修改治疗方案

    commit db90e04f23baf95466e34498ca06101f49a7ac7e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 16:49:10 2019 +0800

        下拉项间距调整，ie8事件兼容

    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:09:49 2019 +0800

        药品说明书样式

    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:08:17 2019 +0800

        修改药品说明书

    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:06:17 2019 +0800

        修改开单样式

    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:02:30 2019 +0800

        修改获取患者信息路径

    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 13:43:38 2019 +0800

        添加诊断判断有没有治疗方案

    commit f617e5c267246786e7a6801cc87811f0d2527235
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 13:39:13 2019 +0800

        merge from 'dev/zxc'

    commit 87e941c29ed951540497c18c0a493c55b222ce00
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 10:33:44 2019 +0800

        提示语

    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
    Merge: d3ade00 95e9a94
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 10:09:57 2019 +0800

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

        # Conflicts:
        #	src/components/DiagnosticList/index.jsx
        #	src/components/Operation/index.jsx
        #	src/containers/SpreadDrop.js
        #	src/store/actions/otherHistory.js
        #	src/store/async-actions/treat.js
        #	src/store/types/checkBody.js

    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
    Merge: 2fd497e 2458ea1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 10:05:17 2019 +0800

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

    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 10:03:28 2019 +0800

        提示语消失默认时间改为2秒

    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 10:02:00 2019 +0800

        治疗方案置灰

    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:59:16 2019 +0800

        治疗方案

    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
    Merge: 62bd7fb 38f9720
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:47:47 2019 +0800

        Merge branch 'dev/new' into dev/zhangxc

    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:46:32 2019 +0800

        Revert "Revert "修改药品说明样式""

        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
    Merge: 28c364a c37d1cc
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 09:46:00 2019 +0800

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

    commit 1cba16137b012f54873b193ab6b16968022d0c96
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:45:29 2019 +0800

        Revert "修改药品说明样式"

        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 09:25:58 2019 +0800

        搜索列表显示样式更改

    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 09:15:40 2019 +0800

        样式调整

    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 21:22:29 2019 +0800

        修改导入host

    commit f75c649c857013b890959fa7e1d3992912ddd1ca
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 21:15:44 2019 +0800

        临时修改版本弹窗高度

    commit e0376902fb956ee58c40b86ae97b924ce5955e75
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 21:10:27 2019 +0800

        化验导入删除填值推送

    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 20:43:48 2019 +0800

        添加删除辅捡右侧推送

    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 20:30:50 2019 +0800

        修改杂音选中项bug

    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
    Merge: b489e52 6a1a3df
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 18:58:07 2019 +0800

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

    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 18:57:50 2019 +0800

        既往史无殊选中bug

    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 18:57:03 2019 +0800

        css

    commit 96efc7b8118a99db629f898960621b98786bd42e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 18:26:40 2019 +0800

        合罗磊分支

    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:49:02 2019 +0800

        回退

    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
    Merge: 6732dbb 1dd6c92
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:44:02 2019 +0800

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

        # Conflicts:
        #	src/common/components/TailInlineTag/index.less
        #	src/common/components/Textarea/index.jsx
        #	src/components/AddAssistCheck/index.jsx
        #	src/containers/OtherHistory.js
        #	src/store/actions/otherHistory.js

    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
    Merge: bc168f8 abd1267
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
    Merge: 3559798 6d55c59
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:34:30 2019 +0800

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

    commit 3559798c04e69583c1f05fc9125c812a9933892f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:31:13 2019 +0800

        既往史下拉滚动条添加

    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:22:01 2019 +0800

        修改请求地址

    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 17:16:22 2019 +0800

        辅检横向滚动

    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
    Merge: adc853a 45b1158
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 16:53:11 2019 +0800

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

        # Conflicts:
        #	src/utils/config.js

    commit cf97be2f425bdef386a137e92929969c321ab047
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 16:08:25 2019 +0800

        去掉一个字

    commit 1a8521d3c3019063a3124a142e3241f84b43c409
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 16:01:26 2019 +0800

        bug

    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 15:58:40 2019 +0800

        其他史高血压选中bug修改

    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 15:16:32 2019 +0800

        删除项有问题

    commit ac64b868290f94c0a30e3242110a38cda67249eb
    Merge: d2eca9d 1a6bf74
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 14:59:26 2019 +0800

        Merge branch 'dev/liucf' into dev/luolei

    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 14:51:07 2019 +0800

        文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 14:43:46 2019 +0800

        日期bug

    commit 38f972082b4a6b58e73f17d4d15302045cd48981
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 13:46:29 2019 +0800

        请求地址修改-刚才反了

    commit 70e9420d59b745c59f3abe04c33100777184d024
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 13:44:13 2019 +0800

        请求地址修改

    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 13:39:05 2019 +0800

        打印图标

    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 11:31:48 2019 +0800

        其他史高血压数据展开

    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 11:00:06 2019 +0800

        查体type修改

    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:58:27 2019 +0800

        查体type修改

    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
    Merge: 4b8aa34 540b6a8
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 10:51:52 2019 +0800

        Merge branch 'dev/new' into dev/luolei

    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 10:47:15 2019 +0800

        搜索弹窗被遮挡问题解决

    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:23:04 2019 +0800

        地址临时修改

    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:20:05 2019 +0800

        版本信息弹窗高度限制

    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:13:40 2019 +0800

        推送接口主诉现病史合并，治疗方案容错

    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
    Merge: 4a897b4 5a39d90
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:57:50 2019 +0800

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

    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
    Merge: 7f1c7c8 abd1267
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:57:43 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        # Conflicts:
        #	src/common/components/ItemBox/index.jsx
        #	src/components/AddInspect/index.jsx
        #	src/components/Diagnosis/index.jsx
        #	src/components/Diagnosis/index.less

    commit 5a39d90dd616740bce7e833646a455b713f5e579
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 23 09:52:01 2019 +0800

        层级问题

    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
    Merge: e5d0122 7f1c7c8
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 23 09:43:34 2019 +0800

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

    commit e5d0122382957b2f9157a83b72adfb651b355f96
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 23 09:43:21 2019 +0800

        11

    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:39:50 2019 +0800

        修改请求地址

    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:38:05 2019 +0800

        修改请求地址

    commit b14968d42d5ed583714b5941365dc97fe24ea61b
    Merge: df67559 a82d18c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:26:50 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

    commit df67559cc42c79c6ed6b27254ce12178918e32b0
    Merge: ff817bf 6805811
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:26:39 2019 +0800

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

    commit 68058110e041e72b8c95979a4fd23e690912746b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 20:43:26 2019 +0800

        遮罩统一0.6透明度

    commit 625ca181024a268f16f32eb2773ea337cf62db43
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 20:34:59 2019 +0800

        透明度ie8

    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 20:24:39 2019 +0800

        修改治疗方案无内容按钮置灰

    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
    Merge: 9c0e078 84ec971
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 20:09:22 2019 +0800

        merge from 'lcf'

    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 19:01:31 2019 +0800

        修改药品说明样式

    commit ff817bf6d6d928b98557371362374859bec3aabd
    Merge: d50ffe0 b2e679a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:52:34 2019 +0800

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

    commit b2e679a35e0ff4831f689758eb14521541f967e2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:50:45 2019 +0800

        导入ie8暂时先灰掉

    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
    Merge: 573f0b5 b286d0a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:25:09 2019 +0800

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

        # Conflicts:
        #	src/utils/config.js

    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:23:57 2019 +0800

        文本模式ie8onInput存值，搜索下拉项样式

    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 15:30:07 2019 +0800

        修改开单项到医嘱逗号

    commit 573f0b59ff517de16f94296240572544e31c9f46
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:23:46 2019 +0800

        合并后报错处理

    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
    Merge: 55d15d6 fbab9de
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:18:22 2019 +0800

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

        # Conflicts:
        #	src/components/CurrentIll/index.jsx
        #	src/containers/EditableSpan.js
        #	src/store/actions/currentIll.js
        #	src/store/reducers/checkBody.js
        #	src/utils/ajax.js
        #	src/utils/config.js

    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
    Merge: 2d40e6e ad68815
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:10:38 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:02:18 2019 +0800

        ie8的onInput代替函数

    commit ad688156064254d6b615284642882ba5486ff764
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 10:29:36 2019 +0800

        init

    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 22 10:13:57 2019 +0800

        updata pro

    commit 26649f42178c7177ee34dae46038ce2370bf5b26
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 22 10:12:21 2019 +0800

        test

commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date:   Fri Jan 25 14:06:09 2019 +0800

    date修改

commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri Jan 25 13:50:07 2019 +0800

    修改版本信息和免责声明位置

commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 13:46:48 2019 +0800

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

commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 13:46:16 2019 +0800

    化验辅捡ie8搜索卡死修改

commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 13:12:43 2019 +0800

    默认host地址删除

commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 11:45:20 2019 +0800

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

commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 10:59:52 2019 +0800

    修改样式

commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 09:46:01 2019 +0800

    合并报错修改

commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 09:42:51 2019 +0800

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

commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 20:30:05 2019 +0800

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

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

commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 20:25:44 2019 +0800

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

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

commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 20:24:40 2019 +0800

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

commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 24 20:18:42 2019 +0800

    中英文逗号

commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 24 18:31:55 2019 +0800

    去掉英文逗号

commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 17:22:34 2019 +0800

    修改治疗方案

commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 16:49:10 2019 +0800

    下拉项间距调整，ie8事件兼容

commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 14:09:49 2019 +0800

    药品说明书样式

commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 14:08:17 2019 +0800

    修改药品说明书

commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 14:06:17 2019 +0800

    修改开单样式

commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 14:02:30 2019 +0800

    修改获取患者信息路径

commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 13:43:38 2019 +0800

    添加诊断判断有没有治疗方案

commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 13:39:13 2019 +0800

    merge from 'dev/zxc'

commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 24 10:33:44 2019 +0800

    提示语

commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 10:09:57 2019 +0800

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

    # Conflicts:
    #	src/components/DiagnosticList/index.jsx
    #	src/components/Operation/index.jsx
    #	src/containers/SpreadDrop.js
    #	src/store/actions/otherHistory.js
    #	src/store/async-actions/treat.js
    #	src/store/types/checkBody.js

commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 10:05:17 2019 +0800

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

commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 10:03:28 2019 +0800

    提示语消失默认时间改为2秒

commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 10:02:00 2019 +0800

    治疗方案置灰

commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 09:59:16 2019 +0800

    治疗方案

commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 09:47:47 2019 +0800

    Merge branch 'dev/new' into dev/zhangxc

commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 09:46:32 2019 +0800

    Revert "Revert "修改药品说明样式""

    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 09:46:00 2019 +0800

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

commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 09:45:29 2019 +0800

    Revert "修改药品说明样式"

    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 24 09:25:58 2019 +0800

    搜索列表显示样式更改

commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 24 09:15:40 2019 +0800

    样式调整

commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 21:22:29 2019 +0800

    修改导入host

commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 21:15:44 2019 +0800

    临时修改版本弹窗高度

commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 21:10:27 2019 +0800

    化验导入删除填值推送

commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 20:43:48 2019 +0800

    添加删除辅捡右侧推送

commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 20:30:50 2019 +0800

    修改杂音选中项bug

commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 18:58:07 2019 +0800

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

commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 18:57:50 2019 +0800

    既往史无殊选中bug

commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 18:57:03 2019 +0800

    css

commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 18:26:40 2019 +0800

    合罗磊分支

commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:49:02 2019 +0800

    回退

commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:44:02 2019 +0800

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

    # Conflicts:
    #	src/common/components/TailInlineTag/index.less
    #	src/common/components/Textarea/index.jsx
    #	src/components/AddAssistCheck/index.jsx
    #	src/containers/OtherHistory.js
    #	src/store/actions/otherHistory.js

commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:36:50 2019 +0800

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

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

commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:34:30 2019 +0800

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

commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:31:13 2019 +0800

    既往史下拉滚动条添加

commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:22:01 2019 +0800

    修改请求地址

commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 17:16:22 2019 +0800

    辅检横向滚动

commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 16:53:11 2019 +0800

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

    # Conflicts:
    #	src/utils/config.js

commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 16:08:25 2019 +0800

    去掉一个字

commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 16:01:26 2019 +0800

    bug

commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 15:58:40 2019 +0800

    其他史高血压选中bug修改

commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 15:16:32 2019 +0800

    删除项有问题

commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 14:59:26 2019 +0800

    Merge branch 'dev/liucf' into dev/luolei

commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 14:51:07 2019 +0800

    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 14:43:46 2019 +0800

    日期bug

commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 13:46:29 2019 +0800

    请求地址修改-刚才反了

commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 13:44:13 2019 +0800

    请求地址修改

commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 13:39:05 2019 +0800

    打印图标

commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 11:31:48 2019 +0800

    其他史高血压数据展开

commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 11:00:06 2019 +0800

    查体type修改

commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 10:58:27 2019 +0800

    查体type修改

commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 10:51:52 2019 +0800

    Merge branch 'dev/new' into dev/luolei

commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 10:47:15 2019 +0800

    搜索弹窗被遮挡问题解决

commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 10:23:04 2019 +0800

    地址临时修改

commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 10:20:05 2019 +0800

    版本信息弹窗高度限制

commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 10:13:40 2019 +0800

    推送接口主诉现病史合并，治疗方案容错

commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:57:50 2019 +0800

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

commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:57:43 2019 +0800

    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

    # Conflicts:
    #	src/common/components/ItemBox/index.jsx
    #	src/components/AddInspect/index.jsx
    #	src/components/Diagnosis/index.jsx
    #	src/components/Diagnosis/index.less

commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jan 23 09:52:01 2019 +0800

    层级问题

commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jan 23 09:43:34 2019 +0800

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

commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jan 23 09:43:21 2019 +0800

    11

commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:39:50 2019 +0800

    修改请求地址

commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:38:05 2019 +0800

    修改请求地址

commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:26:50 2019 +0800

    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:26:39 2019 +0800

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

commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 20:43:26 2019 +0800

    遮罩统一0.6透明度

commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 20:34:59 2019 +0800

    透明度ie8

commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 22 20:24:39 2019 +0800

    修改治疗方案无内容按钮置灰

commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 22 20:09:22 2019 +0800

    merge from 'lcf'

commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 22 19:01:31 2019 +0800

    修改药品说明样式

commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 16:52:34 2019 +0800

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

commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 16:50:45 2019 +0800

    导入ie8暂时先灰掉

commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 16:25:09 2019 +0800

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

    # Conflicts:
    #	src/utils/config.js

commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 16:23:57 2019 +0800

    文本模式ie8onInput存值，搜索下拉项样式

commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 22 15:30:07 2019 +0800

    修改开单项到医嘱逗号

commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 15:23:46 2019 +0800

    合并后报错处理

commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 15:18:22 2019 +0800

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

    # Conflicts:
    #	src/components/CurrentIll/index.jsx
    #	src/containers/EditableSpan.js
    #	src/store/actions/currentIll.js
    #	src/store/reducers/checkBody.js
    #	src/utils/ajax.js
    #	src/utils/config.js

commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 15:10:38 2019 +0800

    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

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

commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 15:02:18 2019 +0800

    ie8的onInput代替函数

commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 22 10:29:36 2019 +0800

    init

commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 22 10:13:57 2019 +0800

    updata pro

commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 22 10:12:21 2019 +0800

    test
liucf 6 年之前
父节点
945c448395
当前提交
0bfa615782
共有 77 个文件被更改，包括 577 次插入 和 375 次删除
分列视图 显示文件统计
  1. 4 1
      src/common/components/ConfirmModal/index.jsx
  2. 0 1
      src/common/components/ConfirmModal/index.less
  3. 15 11
      src/common/components/EditableSpan/index.jsx
  4. 1 1
      src/common/components/EditableSpan/index.less
  5. 1 1
      src/common/components/InspectCommon/index.less
  6. 2 2
      src/common/components/ItemBox/index.jsx
  7. 3 1
      src/common/components/NumberPan/index.jsx
  8. 1 1
      src/common/components/SearchOption/index.less
  9. 1 1
      src/common/components/Textarea/index.jsx
  10. 1 1
      src/components/AddAssistCheck/Textarea/index.jsx
  11. 7 0
      src/components/AddAssistCheck/Textarea/index.less
  12. 1 0
      src/components/AddAssistCheck/index.jsx
  13. 6 0
      src/components/AddAssistCheck/index.less
  14. 1 1
      src/components/AddInspect/index.jsx
  15. 10 15
      src/components/CheckBody/index.jsx
  16. 4 4
      src/components/CopyRight/index.jsx
  17. 10 3
      src/components/CopyRight/index.less
  18. 6 3
      src/components/DiagnosticList/index.jsx
  19. 1 1
      src/components/EMRContainer/index.less
  20. 6 1
      src/components/HistoryCaseContainer/HistoryList/index.jsx
  21. 14 12
      src/components/HistoryCaseContainer/HistoryList/index.less
  22. 10 7
      src/components/Inspect/index.jsx
  23. 1 0
      src/components/Inspect/index.less
  24. 1 0
      src/components/NumberDrop/index.jsx
  25. 3 1
      src/components/NumberUnitDrop/index.jsx
  26. 52 30
      src/components/Operation/index.jsx
  27. 2 1
      src/components/Operation/index.less
  28. 2 2
      src/components/OtherHistory/index.jsx
  29. 22 76
      src/components/PreviewBody/index.jsx
  30. 5 1
      src/components/PreviewBody/index.less
  31. 8 7
      src/components/PushContainer/index.jsx
  32. 6 4
      src/components/SpreadDrop/index.jsx
  33. 1 0
      src/components/TemplateItems/TemplateItem/index.jsx
  34. 22 17
      src/components/Treat/DrugTreat/index.jsx
  35. 10 2
      src/components/Treat/DrugTreat/index.less
  36. 3 2
      src/components/Treat/GeneralTreat/index.jsx
  37. 13 0
      src/components/Treat/GeneralTreat/index.less
  38. 14 16
      src/components/Treat/index.jsx
  39. 32 17
      src/components/Treat/index.less
  40. 6 0
      src/components/TreatDesc/DrugInfo/index.jsx
  41. 9 7
      src/components/TreatDesc/DrugInfo/index.less
  42. 7 6
      src/components/TreatDesc/index.jsx
  43. 19 5
      src/components/TreatDesc/index.less
  44. 10 4
      src/containers/CheckBody.js
  45. 2 1
      src/containers/DiagnosticList.js
  46. 4 0
      src/containers/EditableSpan.js
  47. 2 1
      src/containers/HistoryCases.js
  48. 2 3
      src/containers/NumberUnitDrop.js
  49. 10 5
      src/containers/OperationContainer.js
  50. 10 6
      src/containers/OtherHistory.js
  51. 1 1
      src/containers/SpreadDrop.js
  52. 6 2
      src/containers/Treat.js
  53. 0 1
      src/containers/TreatDrug.js
  54. 1 1
      src/containers/eleType.js
  55. 37 16
      src/store/actions/checkBody.js
  56. 1 1
      src/store/actions/currentIll.js
  57. 10 6
      src/store/actions/mainSuit.js
  58. 35 21
      src/store/actions/otherHistory.js
  59. 7 0
      src/store/actions/print.js
  60. 1 1
      src/store/actions/tabTemplate.js
  61. 12 0
      src/store/actions/treat.js
  62. 0 1
      src/store/async-actions/assistCheck.js
  63. 1 3
      src/store/async-actions/diagnosticList.js
  64. 9 1
      src/store/async-actions/fetchModules.js
  65. 4 5
      src/store/async-actions/homePage.js
  66. 10 7
      src/store/async-actions/patInfo.js
  67. 19 2
      src/store/async-actions/tabTemplate.js
  68. 6 3
      src/store/async-actions/treat.js
  69. 10 10
      src/store/reducers/assistCheck.js
  70. 4 2
      src/store/reducers/checkBody.js
  71. 1 1
      src/store/reducers/getInfoByUuid.js
  72. 6 3
      src/store/reducers/print.js
  73. 1 1
      src/store/reducers/tabTemplate.js
  74. 6 2
      src/store/reducers/treat.js
  75. 2 1
      src/store/types/print.js
  76. 2 0
      src/store/types/treat.js
  77. 2 1
      src/utils/tools.js

+ 4 - 1
src/common/components/ConfirmModal/index.jsx
查看文件 

@@ -68,6 +68,7 @@ const defaultProps = {
 
     cancelBorderColor: '#414141',
 
     cancelBg: '#fff',
 
     width: '300px',
 
+    height: '200px',
 
 };
 
 
 class ConfirmModal extends Component {
 
@@ -123,10 +124,12 @@ class ConfirmModal extends Component {
 
             closable, 
             noFooter
 
         } = this.props;
 
+        const marginLeft = -parseInt(width)/2
 
+        const marginTop = -parseInt(height)/2
 
         return (
 
             <NewPortal visible={visible}>
 
                 <div className={styles['modal-wrapper']} id='confirm'>
 
-                    <div className={styles[['modal']]} style = {{width: width, height:height}}>
 
+                    <div className={styles[['modal']]} style = {{width: width, marginLeft:marginLeft, height:height, marginTop:marginTop}}>
 
                         <div className={styles['modal-title']} style={{background: titleBg}}>{title ? title : ''} {closable ? <img onClick={this.closeModal} className={styles['modal-close']} src = {close}/> : false}</div>
 
                         <div className={styles['modal-content']}>{children}</div>
 
                         {noFooter ? '' : <div className={styles['modal-operator']+' clearfix'}>

+ 0 - 1
src/common/components/ConfirmModal/index.less
查看文件 

@@ -2,7 +2,6 @@
 
     position: fixed;
 
     top: 50%;
 
     left: 50%;
 
-    transform: translate(-50%,-50%);
 
     margin: auto;
 
     border-radius: 5px;
 
     background: #fff;

+ 15 - 11
src/common/components/EditableSpan/index.jsx
查看文件 

@@ -50,7 +50,7 @@ class EditableSpan extends Component{
 
   onChange(e){
 
     e.stopPropagation();
 
     const {handleChange,boxMark,i,handleSearch,value,mainSaveText,mainIds} = this.props;
 
-    const {labelVal,oldText,searchPre} = this.state;
 
+    const {labelVal,searchPre} = this.state;
 
     const text1 =e.target.innerText;
 
     let mainText = filterArr(mainSaveText);//主诉字数
 
     if(+boxMark==1){
 
@@ -80,17 +80,18 @@ class EditableSpan extends Component{
 
     clearTimeout(this.state.timer);
 
     const timer = setTimeout(function(){
 
       let newText = e.target.innerText;
 
-      let temp = '';
 
+      let temp = '',isEnd=false;
 
       let search='';
 
       clearTimeout(that.state.timer);
 
-      // temp = newText.replace(oldText.replace(/(^\s*)|(\s*$)/g,''),'');
 
-      temp = newText.replace(searchPre.replace(/(^\s*)|(\s*$)|(^\,*)|(\,*$)/g,''),'');
 
-      search = temp.replace(/(^\s*)|(\s*$)|(^\,*)|(\,*$)/g,'');
 
-      // console.log(111,labelVal,searchPre,333,newText,444,search);
 
-      handleSearch&&handleSearch({text:search,boxMark,mainIds});
 
-      /*that.setState({
 
-        oldText:newText.replace(search,'')
 
-      })*/
 
+      temp = newText.replace(searchPre,'');
 
+      isEnd = !(newText.indexOf(searchPre)>0);
 
+      search = temp.replace(/[(^\s*)|(\s*$)|(^\,*)|(\,*$)]/g,'');
 
+      //console.log(labelVal,'旧：',searchPre,'新：',newText,'搜索：',search);
 
+      handleSearch&&handleSearch({text:search,isEnd,boxMark,mainIds});
 
+      //搜索后保持现在的值，继续输入时要用于对比
 
+      that.setState({
 
+        searchPre:newText
 
+      });
 
     },config.delayTime);
 
     this.setState({
 
       timer
 
@@ -114,6 +115,9 @@ class EditableSpan extends Component{
 
     const ev = e||window.event;
 
     const target = ev.target||ev.srcElement;
 
     let innerVal = target.innerText;
 
+    /*if(this.props.full){
 
+      return false;
 
+    }*/
 
     //禁止回车事件
 
     if(ev.keyCode==13){return false;}
 
     //backspace事件
 
@@ -171,7 +175,7 @@ class EditableSpan extends Component{
 
   }
 
 
   render() {
 
-    return <span className={style['editable-span']}
 
+    return <span className={style['editable-span']+(this.props.full?' '+style['full']:'')}
 
                       contentEditable='true'
 
                       ref={this.$span}
 
                       onInput={this.onChange}

+ 1 - 1
src/common/components/EditableSpan/index.less
查看文件 

@@ -7,7 +7,7 @@
 
   /*height: 20px;*/
 
   line-height: 16px;
 
   /*vertical-align: middle;*/
 
-  text-align: center;
 
+  text-align: left;
 
 }
 
 .full{
 
   width: 100%;

+ 1 - 1
src/common/components/InspectCommon/index.less
查看文件 

@@ -2,7 +2,7 @@
 
 .wrapper {
 
     position: absolute;
 
     top: 40px;
 
-    z-index: 20;
 
+    z-index: 99;
 
     background-color: #fff;
 
     padding:28px 8px 8px 8px;
 
     min-width: 300px;

+ 2 - 2
src/common/components/ItemBox/index.jsx
查看文件 

@@ -33,7 +33,7 @@ class ItemBox extends Component {
 
   }
 
   handleInput(e){
 
     const {onchange,data} = this.props;
 
-    if(data&&data.length==0){//避免结构化下触发onchange，导致下拉要点两下
 
+    if((data&&data.length==0)||!data){//避免结构化下触发onchange，导致下拉要点两下
 
       onchange&&onchange(e)
 
     }
 
   }
 
@@ -49,7 +49,7 @@ class ItemBox extends Component {
 
   render(){
 
     const {title,children,editable,className,handleFocus,onchange,fuzhen,border,handleBlur,titleTop,backgroundColor} = this.props;
 
     return <div className={style["box"]+" "+"clearfix"} >
 
-      <div className={style["title"] + ' ' + className} style={{marginTop:titleTop?'22px':''}}>{title}</div>
 
+      <div className={style["title"] + ' '+(className||'')} style={{marginTop:titleTop?'22px':''}}>{title}</div>
 
       <div ref={this.$div} className={`${style["content"]} ${border?style["border"]:''} ${backgroundColor?style["noBorder"]:''}`} contentEditable={editable} style={this.getBoxStyle()} onFocus={handleFocus} onInput={this.handleInput} onClick={(e)=>{this.handleClick(e);}} onBlur={handleBlur}>
 
         {fuzhen?children||fuzhen:children}
 
       </div>

+ 3 - 1
src/common/components/NumberPan/index.jsx
查看文件 

@@ -49,7 +49,9 @@ class NumberPan extends Component{
 
   render(){
 
     const select = this.handleSelect.bind(this);
 
     const {show} = this.props;      //table onBlur阻止冒泡是为了修复multSpread中数字键盘点击触发最外层数字组件onBlur事件
 
-    return <div className={style['panBox']} onBlur={(e)=>e.stopPropagation()} style={{display:show?'table':'none'}}>
 
+    return <div className={style['panBox']}
 
+                onBlur={(e)=>e.stopPropagation()} style={{display:show?'table':'none'}}
 
+                onDoubleClick={(e)=>e.stopPropagation()}>
 
     <table className={style['pan']} >
 
       <tr>
 
         <td><button onClick={select}>1</button></td>

+ 1 - 1
src/common/components/SearchOption/index.less
查看文件 

@@ -6,7 +6,7 @@
 
     box-sizing: border-box;
 
     position: absolute;
 
     top: 40px;
 
-    z-index: 20;
 
+    z-index: 99;
 
     background-color: #fff;
 
     box-shadow: 0 6px 20px 0 #989DA3;
 
     margin-bottom: 80px;

+ 1 - 1
src/common/components/Textarea/index.jsx
查看文件 

@@ -77,7 +77,7 @@ class Textarea extends Component {
 
   }
 
   componentWillReceiveProps(next){
 
     const isRead = this.props.isRead;
 
-    if(next.isRead != isRead){
 
+    if(next.isRead != isRead||next.value!=this.props.value){      //value对比解决复诊不显示bug
 
       this.$dom.current.innerText = next.value||'';
 
     }
 
   }

+ 1 - 1
src/components/AddAssistCheck/Textarea/index.jsx
查看文件 

@@ -50,7 +50,7 @@ class Textarea extends Component {
 
       <div className={style.divTextarea}
 
           contenteditable={true}
 
           ref={this.$dom}
 
-          onInput={this.handleInput}
 
+          onChange={this.handleInput}
 
       ></div>
 
     );
 
   }

+ 7 - 0
src/components/AddAssistCheck/Textarea/index.less
查看文件 

@@ -10,4 +10,11 @@
 
   line-height: 20px;
 
   resize: none;
 
   font-family: inherit;
 
+}
 
+.divTextarea:empty:before{ 
+  content: '报告描述或意见'; 
+  color: gray; 
+} 
+.divTextarea:focus:before{
 
+  content:none;
 
 }

+ 1 - 0
src/components/AddAssistCheck/index.jsx
查看文件 

@@ -111,6 +111,7 @@ class AddAssistCheck extends React.Component {
 
                     return (<li key={item.id}> 
                         <span style={{float:"left"}}>{item.name}:</span>
 
                         <p style={{float:"none",overflow:"hidden",marginRight:"215px",paddingLeft:'8px'}}>
 
+                        {/* <p className={styles.textareaWrap}> */}
 
                             {/* <textarea
 
                                 className={styles.divTextarea}
 
                                 onChange={(e)=>{

+ 6 - 0
src/components/AddAssistCheck/index.less
查看文件 

@@ -114,6 +114,12 @@
 
             font-family: inherit;
 
         }
 
     }
 
+    .textareaWrap {
 
+      float: none;
 
+      overflow: hidden;
 
+      margin-right: 215px;
 
+      padding-left: 8px;
 
+    }
 
 }
 
 .center {
 
     text-align: center;

+ 1 - 1
src/components/AddInspect/index.jsx
查看文件 

@@ -340,7 +340,7 @@ class Inspect extends React.Component {
 
                                                     handleClear={(e)=>{
 
                                                         handleClear(e,idx)
 
                                                         this.setState({
 
-                                                            showFill:false
 
+                                                          currentData:fillActive
 
                                                         })
 
                                                     }}
 
                                                     handleConfirm={(e)=>{

+ 10 - 15
src/components/CheckBody/index.jsx
查看文件 

@@ -15,7 +15,7 @@ class CheckBody extends Component{
 
     this.handleClick = this.handleClick.bind(this);
 
     this.handleSearchSelect = this.handleSearchSelect.bind(this);
 
     this.getData = this.getData.bind(this);
 
-    this.handleInput = this.handleInput.bind(this);
 
+    //this.handleInput = this.handleInput.bind(this);
 
   }
 
   getLabels(){
 
     const {data,showArr,saveText,selecteds} = this.props;
 
@@ -38,6 +38,7 @@ class CheckBody extends Component{
 
     if(totalHide){
 
       return ;
 
     }
 
+
 
     let boxLeft = e.pageX -102 + 'px';
 
     let boxTop =  (+e.target.offsetTop+22)+'px';
 
     this.setState({
 
@@ -47,34 +48,28 @@ class CheckBody extends Component{
 
   }
 
   handleSearchSelect(obj){
 
    const {questionId,name} = obj;
 
-   const {fetchModules,focusTextIndex,span} = this.props;//console.log(focusTextIndex)
 
-    fetchModules&&fetchModules({id:questionId,index:focusTextIndex,name,span});
 
+   const {fetchModules,focusTextIndex,span,searchInEnd} = this.props;
 
+    fetchModules&&fetchModules({id:questionId,index:focusTextIndex,name,span,searchInEnd});
 
   }
 
   getData(){
 
     //第一次聚焦查体时，主诉有数据则调接口，主诉无数据则显示提示；其他时间查体模板数据不调接口
 
-    const {hasMain,saveText,data,fetchPushInfos} = this.props;
 
+    const {hasMain,saveText,data,isEmpty} = this.props;
 
     const hasData = saveText.join("")||data.length>0;
 
 
-    if(hasData){
 
+    if(!hasMain&&isEmpty){          //无主诉且本身无数据时，点击提示（空白页、清空）
 
+      Notify.error("无法操作，请先输入主诉");
 
       return ;
 
     }
 
-    if(hasMain){
 
+    //有主诉时且本身无数据，第一次点击获取数据，(不论获取成功与否)再点击不获取（直到刷新成空白页或清空）
 
+    if(hasMain&&isEmpty){
 
       this.props.getInit();
 
-    }else{
 
-      Notify.error("无法操作，请先输入主诉");
 
-    }
 
-
 
-  }
 
-  handleInput(e){  //主诉未填无法输入
 
-    if(!this.props.hasMain){
 
-      e.target.innerText='';
 
     }
 
   }
 
   render(){
 
     const {searchData,totalHide,data} = this.props;
 
     const {boxLeft,boxTop,boxMark} = this.state;
 
     return  <div className={style['container']}>
 
-      <ItemBox title='查体' editable={!data.length}  handleClick={this.handleClick} onchange={this.handleInput}>
 
+      <ItemBox title='查体' handleClick={this.handleClick}>
 
         {this.getLabels()}
 
         {searchData && searchData.length>0?<SearchDrop data={searchData} show={!totalHide} left={boxLeft} top={boxTop} onSelect={this.handleSearchSelect}></SearchDrop>:''}
 
       </ItemBox>

+ 4 - 4
src/components/CopyRight/index.jsx
查看文件 

@@ -87,7 +87,7 @@ class CopyRight extends Component {
 
           {hasNewVersion && <span>new</span>} &copy;<b>朗通医疗</b>
 
           <div className={style['disclaimer']} onClick={showDisclatmerModal}>免责声明</div>
 
         </div>
 
-        <div
 
+        {copyVisible && <div
 
           className={style["copyModal"]}
 
           style={copyVisible ? { display: "block" } : { display: "none" }}
 
         >
 
@@ -100,8 +100,8 @@ class CopyRight extends Component {
 
             </div>
 
             <div className={style["content"]}>{copyContent}</div>
 
           </div>
 
-        </div>
 
-        <div
 
+        </div>}
 
+       {disVisible && <div
 
           className={style["disModal"]}
 
           style={disVisible ? { display: "block" } : { display: "none" }}
 
         >
 
@@ -111,7 +111,7 @@ class CopyRight extends Component {
 
             <div className={style["content"]}>{this.disclatmerContent()}</div>
 
             <div className={style["btnBox"]}><span  className={style["btn"]} onClick={closeDisclatmerModal}>确定</span></div>
 
           </div>
 
-        </div>
 
+        </div>}
 
       </div>
 
     );
 
   }

+ 10 - 3
src/components/CopyRight/index.less
查看文件 

@@ -50,21 +50,28 @@
 
         position: fixed;
 
         width: 820px;
 
         left: 50%;
 
+        top: 20%;
 
         margin-left: -410px;
 
         background: #fff;
 
-        top: 65px;
 
-       
+        height: 60%;
 
+        padding: 80px 0 40px;
 
         img{
 
           float: right;
 
           margin: -5px 5px 0px 0px;
 
           cursor: pointer;
 
         }
 
         .header {
 
+          position: absolute;
 
+          width: 100%;
 
+          top: 0;
 
           font-size: 14px;
 
           padding: 10px 0px 10px 10px;
 
           border-bottom: 1px solid #EAEDF1;
 
         }
 
         .now{
 
+          position: absolute;
 
+          width: 100%;
 
+          top: 35px;
 
           font-size: 18px;
 
           padding: 15px 10px;
 
           border-bottom:1px solid #EAEDF1;
 
@@ -75,8 +82,8 @@
 
           }
 
         }
 
         .content {
 
+          height: 100%;
 
           padding: 10px;
 
-          max-height: 400px;
 
           overflow-y: auto;
 
         }
 
       }

+ 6 - 3
src/components/DiagnosticList/index.jsx
查看文件 

@@ -22,8 +22,11 @@ class DiagnosticList extends Component {
 
         this.handleClickDiag = this.handleClickDiag.bind(this);
 
     }
 
 
-    componentWillReceiveProps() {
 
-        this.props.getBilling();
 
+    componentWillReceiveProps(nextprops) {
 
+        if (this.props.diagnosticStr != nextprops.diagnosticStr) {
 
+            this.props.getBilling();
 
+        }
 
+        
     }
 
 
     upDiagnostic(index) {
 
@@ -88,7 +91,7 @@ class DiagnosticList extends Component {
 
                                     <span className={style['diag-name']} onClick={()=>{this.handleClickDiag(item)}}>{item.name}<span></span></span> 
                                     {item.type === 1 ? <span className={style['diag-first']}>初诊</span> :<span className={style['diag-second']}> 复诊</span>}
 
                                     <span className={style['treat']}
 
-                                          style ={{ color: hasTreat ?'' : 'gray', border: hasTreat ?'' : '1px solid gray'}}
 
+                                          style ={{ color: hasTreat ?'' : 'gray', border: hasTreat ?'1px solid #3B9ED0' : '1px solid gray'}}
 
                                           onClick={() =>{hasTreat && this.showTreat(item)}}>
 
                                           治疗方案
 
                                     </span>

+ 1 - 1
src/components/EMRContainer/index.less
查看文件 

@@ -6,7 +6,7 @@
 
   padding: 0px 0 10px 0 ;
 
   box-sizing: border-box;
 
   position: relative;
 
-  min-width: 720px;
 
+  min-width: 700px;
 
 }
 
 .inner{
 
 //   overflow-y: auto;

+ 6 - 1
src/components/HistoryCaseContainer/HistoryList/index.jsx
查看文件 

@@ -49,11 +49,16 @@ class HistoryCaseContainer extends React.Component {
 
                                 items && items.length > 0? items.map((val,idx)=>{
 
                                     return <li key={val.id} className={val.id == activeHistory.id?styles.bgc:''} onClick={(e)=>{handleCaseClick(e,idx)}}>
 
                                         <span title={val.diagnose}>{val.diagnose}</span>
 
-                                        <span className={val.id == activeHistory.id?`${styles.time} ${styles.quoteHide}`:styles.time}>{val.inquiryDate}</span>
 
+                                        {/* <span className={val.id == activeHistory.id?`${styles.time} ${styles.quoteHide}`:styles.time}>{val.inquiryDate}</span>
 
                                         <button 
                                             className={val.id == activeHistory.id?`${styles.quote} ${styles.quoteShow}`:styles.quote} 
                                             onClick={(e)=>{handleQuoteClick(e,val)}}
 
+                                        >引 用</button> */}
 
+                                        <button 
+                                            className={styles.quote} 
+                                            onClick={(e)=>{handleQuoteClick(e,val,idx)}}
 
                                         >引 用</button>
 
+                                        <span className={styles.time}>{val.inquiryDate}</span>
 
                                     </li>
 
                                 }):<Empty message={'无历史病历'}></Empty>
 
                             }

+ 14 - 12
src/components/HistoryCaseContainer/HistoryList/index.less
查看文件 

@@ -6,7 +6,7 @@
 
     right: 0;
 
     bottom:0;
 
     margin: auto;
 
-    width: 1080px;
 
+    width: 1120px;
 
     top: 70px;
 
     bottom: 70px;
 
     background-color: #fff;
 
@@ -17,9 +17,9 @@
 
         right: 0;
 
     }
 
     .mainHistoryLeft {
 
-        width: 260px;
 
+        width: 300px;
 
         height: 100%;
 
-        background: #F1F1F1;
 
+        background: #d2d1d1;
 
         position: relative;
 
         .title {
 
             height: 80px;
 
@@ -29,7 +29,7 @@
 
             top: 0;
 
             left: 0;
 
             width: 100%;
 
-            background: #F1F1F1;
 
+            background: #d2d1d1;
 
         }
 
         .his {
 
             font-size: 18px;
 
@@ -50,7 +50,7 @@
 
             height: 100%;
 
             span {
 
                 display: inline-block;
 
-                max-width: 150px;
 
+                max-width: 130px;
 
                 overflow: hidden;
 
                 text-overflow: ellipsis;
 
                 white-space: nowrap;
 
@@ -58,7 +58,7 @@
 
             li {
 
                 height: 54px;
 
                 line-height: 54px;
 
-                padding: 0 20px;
 
+                padding: 0 10px;
 
                 font-size: 14px;
 
                 cursor: pointer;
 
                 border: 1px solid transparent;
 
@@ -73,17 +73,19 @@
 
                 background-color: #fff;
 
             }
 
             .quote {
 
-                width: 60px;
 
-                height: 30px;
 
-                line-height: 30px;
 
+                width: 50px;
 
+                height: 22px;
 
+                line-height: 22px;
 
                 border-radius: 15px;
 
                 border: 0 none;
 
                 color: #fff;
 
                 background-color: @template-color;
 
                 float: right;
 
-                margin-top: 12px;
 
-                display: none;
 
+                margin-top: 16px;
 
+                font-size: 12px;
 
+                // display: none;
 
                 outline: none;
 
+                margin-left: 10px;
 
             }
 
             .quoteShow {
 
                 display: block;
 
@@ -94,6 +96,6 @@
 
         }
 
     }
 
     .mainHistoryRight {
 
-        margin-left: 260px;
 
+        margin-left: 300px;
 
     }
 
 }

+ 10 - 7
src/components/Inspect/index.jsx
查看文件 

@@ -40,21 +40,22 @@ class Inspect extends React.Component {
 
             visible:false,
 
             dom:[],
 
             isIE:isIE(),
 
-            ieVersion:null
 
+            ieVersion:null,
 
+            height:'-1'
 
         }
 
         this.handleImportExcel = this.handleImportExcel.bind(this)
 
         this.cancel = this.cancel.bind(this)
 
         this.getWarings = this.getWarings.bind(this)
 
     }
 
-    componentDidMount(){ 
-        var ua = navigator.userAgent;  
+    componentDidMount(){
 
+        var ua = navigator.userAgent;
 
         var _isIE = ua.indexOf("MSIE")>-1;
 
-        if(_isIE){  
+        if(_isIE){
 
             let version =  ua.match(/MSIE ([\d.]+)/)[1];
 
             this.setState({
 
                 ieVersion:version
 
             })
 
-        }      
+        }
 
         $('iframe').bind( 'load', function(){} )
 
       const {fetchPushInfos} = this.props;
 
         // FileAPI.debug = true
 
@@ -77,7 +78,7 @@ class Inspect extends React.Component {
 
             },
 
             function (files, rejected){
 
                 if( files.length ){
 
-                    // console.log(files[0])
 
+                    console.log(files[0])
 
                     FileAPI.upload({
 
                         // url: '/api/icss/lisExcelRes/lisExcelAnalysis',
 
                         url: api.upload,
 
@@ -99,7 +100,8 @@ class Inspect extends React.Component {
 
                                 if (message.length != 0) {
 
                                     that.setState({
 
                                         visible:true,
 
-                                        dom:message
 
+                                        dom:message,
 
+                                        height:message.length
 
                                     })
 
                                 }
 
                                 $("#choose").val("");
 
@@ -183,6 +185,7 @@ class Inspect extends React.Component {
 
                     okText='删除' 
                     cancelText='确定' 
                     width="450"
 
+                    height={(this.state.height > 2 && this.state.height < 8)?((this.state.height * 30 + 120)+'px') : this.state.height > 8 ? '350px' : '200px'}
 
                     noFooter= {true}
 
                     close={this.cancel}>
 
                     <ul className={styles.excelList}>

+ 1 - 0
src/components/Inspect/index.less
查看文件 

@@ -65,5 +65,6 @@
 
     text-align: center;
 
     color: #fff;
 
     margin-bottom: 20px;
 
+    cursor: pointer;
 
 }

+ 1 - 0
src/components/NumberDrop/index.jsx
查看文件 

@@ -83,6 +83,7 @@ class NumberDrop extends Component{
 
     });
 
     const {handleSelect,ikey,suffix,prefix,mainSaveText,placeholder} = this.props;
 
     const text = e.target.innerText===placeholder?'':e.target.innerText;
 
+    e.target.innerText = '';      //避免出现重复输入值
 
     handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
 
   }
 
   handleSpanInp(e){    //数字框输入事件

+ 3 - 1
src/components/NumberUnitDrop/index.jsx
查看文件 

@@ -48,7 +48,7 @@ class NumberUnitDrop extends Component{
 
     handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
 
   }
 
   
-  handleNumClick(e){
 
+  handleNumClick(e){ 
     e.stopPropagation();
 
     const {show,handleShow,ikey,id,patId,handleHide,value} = this.props;
 
     const {hasSelect} = this.state;
 
@@ -77,6 +77,7 @@ class NumberUnitDrop extends Component{
 
       // this.$span.current.innerText='';      //修改生成文字变成输入的2倍bug 
       // handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
 
       handleLabelChange&&handleLabelChange({ikey,changeVal:text,suffix,prefix,mainSaveText,type:boxMark});
 
+      
     }
 
     this.setState({
 
       isClosed:false,
 
@@ -84,6 +85,7 @@ class NumberUnitDrop extends Component{
 
       hasSelect:false,
 
       editable:false
 
     });
 
+    
   }
 
 
   handleSpanInp(e){ //数字框输入事件

+ 52 - 30
src/components/Operation/index.jsx
查看文件 

@@ -6,7 +6,6 @@ import saveHistory from '@common/images/saveHistory.png';
 
 import PrintPreviewContainer from '@containers/PrintPreviewContainer';
 
 import PreviewContainer from '@containers/PreviewContainer';
 
 import { ConfirmModal, Notify } from '@commonComp';
 
-import { changeVisible } from '@store/actions/tabTemplate';
 
 import {getAllDataList,getAllDataStringList} from '@utils/tools';
 
 import store from '@store';
 
 
@@ -16,7 +15,6 @@ class Operation extends Component {
 
     super(props)
 
     this.state = {
 
       title: '',
 
-      visible: false,
 
       okText: '',
 
       borderColor: '',
 
       okColor: '',
 
@@ -69,13 +67,14 @@ class Operation extends Component {
 
     if(flg){
 
       this.setState({
 
         type: type,
 
-        visible: true,
 
         okText: '保存',
 
         borderColor: '#3B9ED0',
 
         okColor: '#fff',
 
         oKBg: '#3B9ED0',
 
         msg: <p className={style['msg']}>是否保存该病历？</p>
 
       })
 
+      
+      this.props.diagShowTmp(true)
 
     }
 
   }
 
   keepHistory(){
 
@@ -99,13 +98,14 @@ class Operation extends Component {
 
     if(flg){
 
       this.setState({
 
         type: type,
 
-        visible: true,
 
         okText: '清除',
 
         borderColor: 'red',
 
         okColor: 'red',
 
         oKBg: '#fff',
 
         msg: <p className={style['msg']}>是否清空所有内容？</p>
 
       })
 
+      
+      this.props.diagShowTmp(true)
 
     }
 
   }
 
   isClear(){
 
@@ -143,17 +143,18 @@ class Operation extends Component {
 
       title: val
 
     })
 
   }
 
-  keypress(e) {
 
+  keypress(event) {
 
+    let e = event?event:window.event;
 
     if (e.keyCode == 13) {
 
-      this.makeSure()
 
-      store.dispatch(changeVisible(false))
 
+      // this.makeSure()
 
+      // store.dispatch(changeVisible(false))
 
     }
 
   }
 
   saveHis(type) {
 
-    let flg = this.getAllData()
 
+    const { diagShowTmp } = this.props;
 
+    let flg = this.getAllData();
 
     if(flg){
 
       this.setState({
 
-        visible: true,
 
         title: '',
 
         type: type,
 
         okText: '保存',
 
@@ -162,6 +163,7 @@ class Operation extends Component {
 
         oKBg: '#3B9ED0',
 
         msg: this.changeTitle()
 
       })
 
+      diagShowTmp(true)
 
     }
 
   }
 
   getAllData(){
 
@@ -169,16 +171,18 @@ class Operation extends Component {
 
     let jsonData = getAllDataList(baseList);
 
     let jsonStr = getAllDataStringList(baseList);
 
     let whichSign = baseList.typeConfig.typeConfig;
 
-    let activeItemData = baseList.tabTemplate.activeItem;
 
-    // let preview = (activeItemData.preview).split('-').join('');
 
-
 
+    let tmpLis = baseList.tabTemplate.items;
 
     if (whichSign == 0) {
 
-      if (activeItemData && JSON.stringify(activeItemData) != '{}' && (activeItemData.dataJson == JSON.stringify(jsonData)) && (JSON.stringify(jsonStr) == JSON.stringify(JSON.parse(activeItemData.preview)))) {
 
-        Notify.info('该模板已保存');
 
-        return false;
 
-      }else if (
 
+      for(let i = 0;i <tmpLis.length;i++){
 
+        let dataStr = tmpLis[i].dataJson;
 
+        if(dataStr == JSON.stringify(jsonData)){
 
+          Notify.info('该模板已保存');
 
+          return false;
 
+        }
 
+      }
 
+      if (
 
         JSON.stringify(jsonData.advice) == '{}' &&
 
-        jsonData.chief.length < 1 &&
 
+        (jsonData.chief.length < 1 && jsonStr.chief == '[]') &&
 
         jsonData.diag.length < 1 &&
 
         jsonData.vital.length < 1 &&
 
         jsonData.other.length < 1 &&
 
@@ -193,10 +197,16 @@ class Operation extends Component {
 
         return true;
 
       }
 
     } else if(whichSign == 1) {
 
-      if (activeItemData && JSON.stringify(activeItemData) != '{}' && (JSON.stringify(jsonStr) == JSON.stringify(JSON.parse(activeItemData.preview)))) {
 
-        Notify.info('该模板已保存');
 
-        return false;
 
-      }else if (JSON.stringify(jsonData.advice) == '{}' && 
+      for(let i = 0;i <tmpLis.length;i++){
 
+        let dataStr = tmpLis[i].preview;
 
+        let jsStr = tmpLis[i].dataJson;
 
+        console.log(dataStr == JSON.stringify(jsonStr))
 
+        if(JSON.stringify(JSON.parse(dataStr)) == JSON.stringify(jsonStr) && jsStr == JSON.stringify(jsonData)){
 
+          Notify.info('该模板已保存');
 
+          return false;
 
+        }
 
+      }
 
+      if (JSON.stringify(jsonData.advice) == '{}' && 
           jsonStr.chief == '[]' && 
           jsonStr.present == '[]' && 
           jsonStr.other == '[]' && 
@@ -236,28 +246,40 @@ class Operation extends Component {
 
     </div>
 
   }
 
   makeSure() {
 
-    const { save, clear, saveDataAll } = this.props;
 
+    const { save, clear, saveDataAll,diagShowTmp } = this.props;
 
     const { type } = this.state;
 
     if (type == 1) {
 
-      this.setState({ visible: false, title: '' })
 
+      diagShowTmp(false)
 
+      this.setState({ title: '' })
 
       save();
 
     } else if (type == 2) {
 
-      this.setState({ visible: false, title: '' })
 
+      diagShowTmp(false)
 
+      this.setState({ title: '' })
 
       clear();
 
     } else if (type == 3) {
 
       if (this.state.title.trim() == '') {
 
         Notify.error('请输入模板名称')
 
         return;
 
       }
 
+      // diagShowTmp(false)
 
       saveDataAll(this.state.title);
 
-      this.setState({ visible: false, title: '' });
 
+    }
 
+  }
 
+  closeDiagBox(){
 
+    const { diagShowTmp } = this.props;
 
+    const { type } = this.state;
 
+    if (type == 3){
 
+      diagShowTmp(false)
 
+      this.setState({ title: '' })
 
+    }else{
 
+      diagShowTmp(false)
 
+      this.setState({ title: '' }) 
     }
 
   }
 
   render() {
 
     const { showPrint, closePrint, showPreview, closePreview } = this;
 
-    const { visible, preVisible } = this.props.print;
 
+    const { visible, preVisible,diagShow } = this.props.print;
 
     const {zIndex} = this.state;
 
-
 
     return <div className={style['container']} style={{zIndex:zIndex}}>
 
       <button className={style['button']} onClick={showPrint}><img src={printImg} /> 打印病历</button>
 
       <button className={style['preButton']} onClick={showPreview}><img src={preview} /> 预览</button>
 
@@ -267,10 +289,10 @@ class Operation extends Component {
 
       <PrintPreviewContainer visible={visible} onClose={closePrint} />
 
       <PreviewContainer visible={preVisible} onClose={closePreview} />
 
       <ConfirmModal
 
-        visible={this.state.visible}
 
+        visible={diagShow}        //改为全局控制
 
         confirm={() => { this.makeSure() }}
 
-        close={() => { this.setState({ visible: false, title: '' }) }}
 
-        cancel={() => { this.setState({ visible: false, title: '' }) }}
 
+        close={() => { this.closeDiagBox()}}
 
+        cancel={() => {this.closeDiagBox()}}
 
         okText={this.state.okText}
 
         okBorderColor={this.state.borderColor}
 
         okColor={this.state.okColor}

+ 2 - 1
src/components/Operation/index.less
查看文件 

@@ -5,7 +5,8 @@
 
     position: fixed;
 
     bottom: 0;
 
     left: 10px;
 
-    right: 480px;
 
+    right: 470px;
 
+    min-width: 720px;
 
     background-color: #fff;
 
     // z-index: 240;
 
     padding-bottom: 10px;

+ 2 - 2
src/components/OtherHistory/index.jsx
查看文件 

@@ -26,8 +26,8 @@ class OtherHistory extends Component{
 
   }
 
   handleSearchSelect(obj){
 
     const {questionId,name} = obj;
 
-    const {fetchModules,focusTextIndex,span} = this.props;
 
-    fetchModules&&fetchModules({id:questionId,index:focusTextIndex,name,span});
 
+    const {fetchModules,focusTextIndex,span,searchInEnd} = this.props;
 
+    fetchModules&&fetchModules({id:questionId,index:focusTextIndex,name,span,searchInEnd});
 
   }
 
   getLabels(){
 
     const {data,showArr,selecteds,saveText} = this.props;

+ 22 - 76
src/components/PreviewBody/index.jsx
查看文件 

@@ -2,75 +2,22 @@ import React, { Component } from "react";
 
 import style from "./index.less";
 
 import $ from "jquery";
 
 import {filterDataArr} from '@utils/tools'
 
-(function ($) {
 
-    var opt;
 
-
 
-    $.fn.jqprint = function (options) {
 
-        opt = $.extend({}, $.fn.jqprint.defaults, options);
 
-
 
-        var $element = (this instanceof $) ? this : $(this);
 
-
 
-        if (opt.operaSupport && $.browser.opera) {
 
-            var tab = window.open("", "jqPrint-preview");
 
-            tab.document.open();
 
-
 
-            var doc = tab.document;
 
-        }
 
-        else {
 
-            var $iframe = $("<iframe  />");
 
-
 
-            if (!opt.debug) { $iframe.css({ position: "absolute", width: "200px", height: "0px", left: "-300px", top: "-300px" }); }
 
-
 
-            $iframe.appendTo("body");
 
-            var doc = $iframe[0].contentWindow.document;
 
-        }
 
-
 
-        if (opt.importCSS) {
 
-            if ($("link[media=print]").length > 0) {
 
-                $("link[media=print]").each(function () {
 
-                    doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' media='print' />");
 
-                });
 
-            }
 
-            else {
 
-                $("link").each(function () {
 
-                    doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' />");
 
-                });
 
-            }
 
-        }
 
-
 
-        if (opt.printContainer) { doc.write($element.outer()); }
 
-        else { $element.each(function () { doc.write($(this).html()); }); }
 
-
 
-        doc.close();
 
-
 
-        (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).focus();
 
-        setTimeout(function () { (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).print(); if (tab) { tab.close(); } }, 1000);
 
-    }
 
-
 
-    $.fn.jqprint.defaults = {
 
-        debug: false,
 
-        importCSS: true,
 
-        printContainer: true,
 
-        operaSupport: true
 
-    };
 
-
 
-    $.fn.outer = function () {
 
-        return $($('<div></div>').html(this.clone())).html();
 
-    }
 
-})($);
 
 class PreviewBody extends Component {
 
     constructor(props) {
 
         super(props)
 
         this.state={
 
             dateTime:"",
 
         }
 
-        this.onPrint = this.onPrint.bind(this);
 
+        this.$content = React.createRef();
 
         this.normalVal = this.normalVal.bind(this);
 
         this.getCurrentDate = this.getCurrentDate.bind(this);
 
     }
 
     componentDidMount(){
 
         this.getCurrentDate();
 
     }
 
+    componentWillReceiveProps(){
 
+        $(this.$content.current)[0].scrollIntoView(true);
 
+    }
 
     getCurrentDate(){
 
         let myDate = new Date();
 
         let year = myDate.getFullYear();       //获取完整的年份(4位,1970-????)
 
@@ -79,15 +26,6 @@ class PreviewBody extends Component {
 
         let date = year+'-'+(mon<10?'0'+mon:mon)+'-'+(day<10?'0'+day:day);
 
         this.setState({dateTime:date})
 
     }
 
-    onPrint() {
 
-        $("#content").jqprint({
 
-            debug: false,
 
-            importCSS: true,
 
-            printContainer: true,
 
-            operaSupport: false
 
-        });
 
-        this.props.onClose()
 
-    }
 
     normalVal(min,max){
 
         if((min-0) && (max-0)){
 
             return `正常值: (${min}~${max})`
 
@@ -116,8 +54,9 @@ class PreviewBody extends Component {
 
     }
 
     render() {
 
         const { show, preInfo, dataJson, dataStr,baseObj } = this.props;
 
+
 
         return <div className={style['content']}>
 
-            <div style={{ clear: 'both', fontSize: '24px', margin: '0px 0px 30px 0px',textAlign:'center' }}>{preInfo.hospitalName}</div>
 
+            <div ref={this.$content} style={{ clear: 'both', fontSize: '24px', margin: '0px 0px 30px 0px',textAlign:'center' }}>{preInfo.hospitalName}</div>
 
             <table className={style['patInfo']} style={{ margin: '0px 15px 30px 0px', borderCollapse: 'collapse', width: "100%",fontSize:'12px' }}>
 
                 <tr>
 
                     <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>卡号：{baseObj?baseObj.patientIdNo:JSON.stringify(preInfo) == '{}'?'':preInfo.patientIdNo}</td>
 
@@ -177,12 +116,12 @@ class PreviewBody extends Component {
 
                                             {
 
                                                 item.lisExcelItem && item.lisExcelItem.map((value)=>{
 
                                                     return <tr style={{lineHeight:'1.5',width:'650px'}}>
 
-                                                        <td style={{width:'23%',fontSize:'12px'}}>{value.itemName}</td>
 
+                                                        <td style={{width:'25%',fontSize:'12px'}}>{value.itemName}</td>
 
                                                         <td style={{width:'23%',fontSize:'12px'}}><span className={value.type == 1?'red':null} style={{fontSize:'12px'}}>{value.value}</span> {value.unit}</td>
 
                                                         <td style={{width:'24%',fontSize:'12px'}}>
 
                                                             {this.normalVal(value.min,value.max)}
 
                                                         </td>
 
-                                                        <td style={{width:'30%',fontSize:'12px'}}>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+value.time}</td>
 
+                                                        <td style={{width:'28%',fontSize:'12px'}}>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+value.time}</td>
 
                                                     </tr>
 
                                                 })
 
                                             }
 
@@ -199,14 +138,14 @@ class PreviewBody extends Component {
 
                                                 item.details.map((val)=>{
 
                                                     if(val.value && val.value != ''){
 
                                                         return <tr style={{lineHeight:'1.5',width:'100%',fontSize:'12px'}}>
 
-                                                            <td style={{width:'23%'}}>{val.name}</td>
 
+                                                            <td style={{width:'25%'}}>{val.name}</td>
 
                                                             {/* <td style={{width:'23%'}} className={item.abnormal != '0' ?"red":'' }>{val.value} { val.labelSuffix}</td> */}
 
                                                             {this.showDetails(val)}
 
                                                             
                                                             <td style={{width:'24%'}}>
 
                                                                 {this.normalVal(val.minValue,val.maxValue)}
 
                                                             </td>
 
-                                                            <td style={{width:'30%'}}>{'化验时间:'+item.time}</td>
 
+                                                            <td style={{width:'28%'}}>{'化验时间:'+item.time}</td>
 
                                                         </tr>
 
                                                     }
 
                                                 })
 
@@ -262,10 +201,11 @@ class PreviewBody extends Component {
 
                     </td>
 
                 </tr>
 
             </table>
 
-            <table className={style.partTtable} style={{ marginTop: '10px',display: show ? 'block' : 'none' }}>
 
-                <tr className={style.verticalT}>
 
-                    <td style={{ width: 70, textAlign: 'right',verticalAlign:'top', padding: '0px 5px 16px 0px', fontSize: '14px' }}>签名：</td>
 
-                    <td style={{ width: '220px',
 
+            <table className={style.partTtable} style={{ marginTop: '10px',marginBottom:'30px',display: show ? 'block' : 'none' }}>
 
+                <tr className={`${style.verticalT} ${style.siginNature}`}>
 
+                    <td style={{ width: 80, textAlign: 'right',verticalAlign:'top', padding: '0px 5px 0 0px', fontSize: '14px' }}>医生签名：</td>
 
+                    {/* <td style={{ 
+                        width: '220px',
 
                         height: '60px',
 
                         textAlign: 'center',
 
                         lineHeight: '60px',
 
@@ -273,7 +213,13 @@ class PreviewBody extends Component {
 
                         color: '#cbc7c7',
 
                         border: '1px solid #cbc7c7',
 
                         paddingBottom: '0'
 
-                    }}>此处签名</td>
 
+                    }}>此处签名</td> */}
 
+                    <td style={{
 
+                      minWidth:'50px',
 
+                      padding:'0 5px 2px 5px',
 
+                      borderBottom:'1px solid #333',
 
+                    }}
 
+                    >{baseObj?baseObj.doctorName:(JSON.stringify(preInfo) == '{}'?'':preInfo.doctorName)}</td>
 
                 </tr>
 
             </table>
 
         </div>

+ 5 - 1
src/components/PreviewBody/index.less
查看文件 

@@ -4,7 +4,7 @@
 
       overflow: auto;
 
       top:120px;
 
       width: 820px;
 
-      padding: 0 40px 20px 40px;
 
+      padding: 0 40px 60px 40px;
 
     }
 
 
     .foot{
 
@@ -78,6 +78,10 @@
 
       .verticalT {
 
           vertical-align: top;
 
       }
 
+      .siginNature {
 
+        vertical-align: bottom;
 
+        float: right;
 
+      }
 
       .partTtableList {
 
           width: 70px;
 
           text-align: right;

+ 8 - 7
src/components/PushContainer/index.jsx
查看文件 

@@ -27,11 +27,11 @@ class PushContainer extends Component {
 
             }],
 
             visible:false,
 
             message:'',                 //提示的内容
 
-            type:'',                   //1:删除模板 2：批量删除   3.修改标题   4.引用  
+            type:'',                    //1:删除模板 2：批量删除   3.修改标题   4.引用  
             id:'',                      //单个删除
 
-            obj:{},                       //修改模板标题      
+            obj:{},                     //修改模板标题      
             title:'',                   //修改后的标题
 
-            okText:'确定',                  //确认按钮
 
+            okText:'确定',              //确认按钮
 
             okBorderColor:'red',
 
             oKBg:'',
 
             okColor:'red',
 
@@ -110,10 +110,11 @@ class PushContainer extends Component {
 
             })
 
         })
 
     }
 
-    keypress(e){
 
+    keypress(event){
 
+        let e = event?event:window.event;
 
         if(e.keyCode == 13) {
 
-            this.makeSure()
 
-            store.dispatch(changeVisible(false))
 
+            // this.makeSure()
 
+            // store.dispatch(changeVisible(false))
 
         }
 
     }
 
     changeTitle(){
 
@@ -192,7 +193,7 @@ class PushContainer extends Component {
 
         }else if(this.state.type == 3){
 
             if(this.state.title == this.state.obj.text){
 
                 store.dispatch(changeVisible(false))
 
-                Notify.info('标题修改成功');
 
+                Notify.success('标题修改成功');
 
                 return;
 
             }
 
             let tempObj = {

+ 6 - 4
src/components/SpreadDrop/index.jsx
查看文件 

@@ -61,7 +61,7 @@ class SpreadDrop extends Component{
 
       boxTop:boxTop
 
     })
 
     // window.event? window.event.cancelBubble = true : e.stopPropagation();
 
-    // this.setStateInit();      //恢复初始选中状态
 
+     this.setStateInit();      //恢复初始选中状态
 
     const {ikey,handleShow,placeholder,flag,id,value,tagType,type} = this.props;
 
     const that = this;
 
     this.btnClickFlag = false;
 
@@ -77,10 +77,12 @@ class SpreadDrop extends Component{
 
   }
 
 
   changeToEdit(e){//双击
 
-    const {value,id,placeholder,handleDbclick} = this.props;
 
+    const {value,id,placeholder,handleDbclick,handleHide} = this.props;
 
     let text = e.target.innerText;
 
+    handleHide&&handleHide();       //展开情况下双击收起
 
     // clearTimeout(this.state.timer);//取消延时的单击事件
 
     e.stopPropagation();
 
+    // e.preventDefault();
 
     if(value&&value.trim()){//有选中值的标签才能双击编辑
 
       this.setState({
 
         labelVal:text,
 
@@ -91,7 +93,7 @@ class SpreadDrop extends Component{
 
     }
 
   }
 
 
-  onChange(e){  
+  onChange(e){
 
     const {mainSaveText,ikey,type,handleLabelChange} = this.props;
 
     const {labelVal,editable} = this.state;
 
     let mainText = filterArr(mainSaveText);//主诉字数
 
@@ -127,7 +129,7 @@ class SpreadDrop extends Component{
 
     this.setState({
 
       editable:false
 
     });
 
-    
+
 
 
   }
 
   setStateInit(){

+ 1 - 0
src/components/TemplateItems/TemplateItem/index.jsx
查看文件 

@@ -74,6 +74,7 @@ class TemplateItem extends React.Component {
 
                     isOpen: false
 
                 });
 
             });
 
+            console.log($(this.content).parent().siblings().find('.content'))
 
             return;
 
         }
 
         $(this.content).slideDown(() => {

+ 22 - 17
src/components/Treat/DrugTreat/index.jsx
查看文件 

@@ -28,9 +28,10 @@ class DrugTreat extends Component {
 
         setDrugInfo && setDrugInfo(item);
 
     }
 
     showTreatDesc() {
 
-        $('#treatWrapper').animate({'width': '940px'}, 500);
 
-        $('#treatDescBox').animate({'width': '260px'}, 500);
 
+        $('#treatDescBox').css({'display': 'block'});
 
         $('#treatWrapper').animate({'margin-left': '-470px'}, 300);
 
+        $('#treatDescBox').animate({'width': '260px'}, 500);
 
+        
     }
 
     
 
@@ -42,21 +43,25 @@ class DrugTreat extends Component {
 
                 <h3 className={style['drug-title']}><img className={style['drug-icon']} src={drugIcon}/> 常用药物治疗</h3>
 
                 {treatment.map((item, index) => {
 
                     return(<div className={style['drug-content']}>
 
-                        {index + 1 + '. ' }{item.drugsName}:&nbsp;
 
-                        {item.medicitionsList.map((it, ii) => {
 
-                            return ((it.isShow == 1 || it.selected) && <span style={it.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)'} : ''}>
 
-                                    {ii === 0 ? '' : ', '}
 
-                                    <span className={style['drug-name']}  
-                                          onDoubleClick={() =>{this.setDrugInfo(it);showDrugInfo();}} 
-                                          onClick={()=>{it.forbidden === '2' ? '' : this.handleSelect(index,ii)}} style={it.selected ? {color: '#3B9ED0', borderBottom: '1px solid #3B9ED0'}:''}>
 
-                                        {it.medicitionName}
 
-                                    </span>
 
-                                    {/* {it.showInfo && it.showInfo==='1'&& <img className={style['info-img']} src={info} onClick={() =>{this.setDrugInfo(it);showDrugInfo();}}/>} */}
 
-                                    {it.forbidden === '1' ? <span className={style['info-flag']} style={{border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: it.forbidden === '2' ? <span className={style['info-flag']} style={{border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''}, 使用率{it.rate}
 
-                                    
-                                </span>)
 
-                        })}
 
-                        {<span className={style['drug-more']} onClick={() =>this.setOtherRecommend(item, index)} ><img className={style['info-img']} src={more} />更多同类药</span> }
 
+                        <div  className={style['drug-name-box']}>
 
+                            {index + 1 + '. ' }{item.drugsName}:&nbsp;
 
+                            {item.medicitionsList.map((it, ii) => {
 
+                                return ((it.isShow == 1 || it.selected) && <span style={it.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)'} : ''}>
 
+                                        {ii === 0 ? '' : ', '}
 
+                                        <span className={style['drug-name']}  
+                                            onDoubleClick={() =>{this.setDrugInfo(it);showDrugInfo();}} 
+                                            onClick={()=>{it.forbidden === '2' ? '' : this.handleSelect(index,ii)}} style={it.selected ? {color: '#3B9ED0', borderBottom: '1px solid #3B9ED0'}:''}>
 
+                                            {it.medicitionName}
 
+                                        </span>
 
+                                        {/* {it.showInfo && it.showInfo==='1'&& <img className={style['info-img']} src={info} onClick={() =>{this.setDrugInfo(it);showDrugInfo();}}/>} */}
 
+                                        {it.forbidden === '1' ? <span className={style['info-flag']} style={{border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: it.forbidden === '2' ? <span className={style['info-flag']} style={{border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''}, 使用率{it.rate}
 
+                                        
+                                    </span>)
 
+                            })}
 
+
 
+                        </div>
 
+                        {<div className={style['drug-more']} onClick={() =>this.setOtherRecommend(item, index)} ><img className={style['info-img']} src={more} />更多同类药</div> }
 
+                        
                     </div>)
 
                 })}
 
             </div>

+ 10 - 2
src/components/Treat/DrugTreat/index.less
查看文件 

@@ -2,6 +2,7 @@
 
     background: #EAF7FA;
 
     height: 36px;
 
     line-height: 36px;
 
+    font-weight: bold;
 
 }
 
 .drug-icon {
 
     width: 16px;
 
@@ -9,6 +10,7 @@
 
     margin: 10px;
 
 }
 
 .drug-content {
 
+    position: relative;
 
     line-height: 36px;
 
     border-bottom: 1px dashed #D2D2D2;
 
 }
 
@@ -31,10 +33,16 @@
 
     text-align: center;
 
 }
 
 .drug-more {
 
-    display: inline-block;
 
     cursor: pointer;
 
-    float: right;
 
     color: #3B9ED0;
 
+    position: absolute;
 
+    right: 0;
 
+    top: 50%;
 
+    margin-top: -18px;
 
+}
 
+.drug-name-box {
 
+    float: left;
 
+    width: 530px;
 
 }
 
 .drug-content:after{display:block;clear:both;content:"";visibility:hidden;height:0}
 
 .drug-content{zoom:1}

+ 3 - 2
src/components/Treat/GeneralTreat/index.jsx
查看文件 

@@ -7,10 +7,11 @@ class GeneralTreat extends Component {
 
     }
 
 
     render() {
 
-        const { icon, titleBg, filter, title, generalTreat } = this.props
 
+        const { icon, titleStyle,titleBg, filter, title, generalTreat } = this.props
 
         return(
 
             generalTreat && generalTreat.length > 0 && <div className={style['general-wrapper']}>
 
-                <div className={style['general-title']} style={{background: titleBg,filter:filter}}><img className={style['general-icon']} src={icon}/>{title}</div>
 
+                <div className={style['general-title-box']} style={titleStyle}></div>
 
+                <div className={style['general-title']} ><img className={style['general-icon']} src={icon}/>{title}</div>
 
                 <div className={style['general-item']} dangerouslySetInnerHTML={{__html: generalTreat}}>
 
                 </div>

+ 13 - 0
src/components/Treat/GeneralTreat/index.less
查看文件 

@@ -1,9 +1,22 @@
 
 .general-wrapper {
 
+    position: relative;
 
     padding: 10px 0 0 0;
 
 }
 
+.general-title-box {
 
+    height: 36px;
 
+    line-height: 36px;
 
+    background: rgb(47,199,156);
 
+    opacity: 0.1;
 
+    filter:alpha(opacity=10);
 
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=10);";
 
+}
 
 .general-title {
 
+    position: absolute;
 
+    width: 100%;
 
+    top: 10px;
 
     height: 36px;
 
     line-height: 36px;
 
+    font-weight: bold;
 
 }
 
 .general-icon {
 
     width: 16px;

+ 14 - 16
src/components/Treat/index.jsx
查看文件 

@@ -7,8 +7,8 @@ import DrugInfo from '@components/TreatDesc/DrugInfo';
 
 import Notify from '@commonComp/Notify'
 
 import close from './img/close.png';
 
 import generalIcon from './img/general.png';
 
-
 
 import surgicalIcon from './img/surgical.png';
 
+import $ from "jquery";
 
 
 class Treat extends Component {
 
     constructor(props){
 
@@ -38,16 +38,14 @@ class Treat extends Component {
 
     }
 
 
     render(){
 
-        const { generalTreat, treatment, surgeryTreat, selectDrug, drugInfo, treatDesc, setOtherRecommend, setDrugInfo, showDrug, showDrugInfo,hideDrugInfo, title} = this.props;
 
+        const { generalTreat, treatment, treatItem, surgeryTreat, selectDrug, drugInfo, treatDesc, setOtherRecommend, setDrugInfo, showDrug, showDrugInfo,hideDrugInfo, title} = this.props;
 
         return(
 
-        <div>
 
-            <div className={style['treat-mask']}>
 
-            </div>
 
+            <div   className={style['treat-wrapper']}>
 
+                <div className={style['treat-mask']}>
 
+                </div>
 
+                <div id='treatWrapper' className={style['treat-box']}>
 
+                    <div className={style['treat-title']}>治疗方案 ({treatItem.name})<img onClick={this.hideTreat} src={close}/></div>
 
 
-            <div  id='treatWrapper' className={style['treat-wrapper']}>
 
-                
-                <div className={style['treat-box']}>
 
-                    <p className={style['treat-title']}>治疗方案 <img onClick={this.hideTreat} src={close}/></p>
 
                     <div className={style['treat-inner-box']}>
 
                         <GeneralTreat icon={generalIcon} title='一般治疗'   generalTreat={generalTreat}></GeneralTreat>
 
                         <DrugTreat treatment={ treatment } 
@@ -55,15 +53,13 @@ class Treat extends Component {
 
                                 setOtherRecommend={ setOtherRecommend } 
                                 showDrugInfo = {showDrugInfo}
 
                                 setDrugInfo={ setDrugInfo }>
 
-                        </DrugTreat>
 
-                        <GeneralTreat icon={surgicalIcon} title='手术治疗' titleBg='#FAEAEA' generalTreat={surgeryTreat}></GeneralTreat>
 
+                        </DrugTreat> 
+                        <GeneralTreat icon={surgicalIcon} title='手术治疗' titleStyle={{background:'#FAEAEA',opacity:'1', filter:'alpha(opacity=100);',filter:'progid:DXImageTransform.Microsoft.Alpha(opacity=100);'}} titleBg='#FAEAEA' generalTreat={surgeryTreat}></GeneralTreat>
 
                     </div>
 
                     <div className={style['bottom']}>
 
                         <span className={style['prescription-btn']} onClick={this.handlePrescription}>开处方</span> <span className={style['determine-btn']} onClick={this.handleDetermine}>确定</span>
 
                     </div>
 
-                    
-                </div>
 
-                {treatDesc && <TreatDesc 
+                    {treatDesc && <TreatDesc 
                     treatment={treatment} 
                     treatDesc={treatDesc} 
                     selectDrug={selectDrug} 
@@ -71,12 +67,14 @@ class Treat extends Component {
 
                     showDrugInfo = {showDrugInfo}
 
                     showDrug = {showDrug}
 
                     >
 
-                </TreatDesc>}
 
+                    </TreatDesc>}
 
+                </div>
 
+                
+                
                 {showDrug && drugInfo && <DrugInfo drugInfo = {drugInfo} hideDrugInfo = {hideDrugInfo}></DrugInfo>}
 
             </div>
 
                 
             
-        </div>
 
         
         )
 
     }

+ 32 - 17
src/components/Treat/index.less
查看文件 

@@ -1,15 +1,18 @@
 
 @import "~@less/mixin.less";
 
 .treat-wrapper{
 
     position: fixed;
 
-    background: #fff;
 
-    z-index: 102;
 
-    left: 50%;
 
-    top: 50%;
 
-    width: 680px;
 
-    height: 680px;
 
-    margin-left: -340px;
 
-    margin-top: -340px;
 
-    z-index: 301;
 
+    width: 100%;
 
+    height: 100%;
 
+    left: 0;
 
+    top: 0;
 
+    // background: #fff;
 
+    // left: 50%;
 
+    // top: 25%;
 
+    // width: 680px;
 
+    // margin-left: -340px;
 
+    // margin-top: -340px;
 
+    // z-index: 301;
 
+    z-index: 300;
 
 }
 
 .treat-mask {
 
     position: fixed;
 
@@ -24,12 +27,22 @@
 
     -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=60);";
 
 }
 
 .treat-box {
 
+    position: fixed;
 
+    background: #fff;
 
     width: 680px;
 
-    float: left;
 
-    border-right: 1px solid #e0e2e4;
 
-    padding-bottom: 100px;
 
+    left: 50%;
 
+    top: 20%;
 
+    height: 60%;
 
+    margin-left: -340px;
 
+    z-index: 301;
 
+    padding-top: 40px;
 
+    padding-bottom: 80px;
 
 }
 
 .treat-title {
 
+    width: 100%;
 
+    position: absolute;
 
+    top: 0px;
 
+    background: #fff;
 
     height: 40px;
 
     line-height: 40px;
 
     border-bottom: 1px solid #e0e2e4;
 
@@ -43,18 +56,19 @@
 
     }
 
 }
 
 .treat-inner-box {
 
-    width: 680px;
 
-    height: 540px;
 
+    width: 100%;
 
+    height: 100%;
 
     padding: 10px 20px 0 20px;
 
-    overflow: hidden;
 
+
 
     overflow-y: auto;
 
 }
 
 
 .bottom {
 
     position: absolute;
 
-    bottom: 20px;
 
-    height: 40px;
 
+    width: 100%;
 
+    height: 80px;
 
     line-height: 40px;
 
+    background: #fff;
 
 }
 
 .prescription-btn,.determine-btn {
 
     position: absolute;
 
@@ -65,6 +79,7 @@
 
     border-radius: 4px;
 
     text-align: center;
 
     cursor: pointer;
 
+    top: 20px;
 
 }
 
 
 .prescription-btn {

+ 6 - 0
src/components/TreatDesc/DrugInfo/index.jsx
查看文件 

@@ -17,6 +17,12 @@ class DrugInfo extends Component {
 
                         return <div className={style['drug-desc-item']}><span className={style['drug-desc-title']}>{item.title}</span> <span className={style['drug-desc-content']} dangerouslySetInnerHTML ={{__html: item.content}}></span> </div>
 
                     })}
 
                 </div> }
 
+                { !drugInfo || (drugInfo && drugInfo.drugDesc.length === 0) && <div className={style['drug-desc-wrapper']}>
 
+                    <div>
 
+                        该药品暂无说明
 
+                    </div>
 
+                    
+                </div> }
 
 
         </div>)
 
     }

+ 9 - 7
src/components/TreatDesc/DrugInfo/index.less
查看文件 

@@ -1,21 +1,23 @@
 
 .drug-info-wrapper {
 
     position: fixed;
 
-    width: 850px;
 
-    height: 680px;
 
+    width: 950px;
 
+    height: 70%;
 
     left: 50%;
 
-    top: 50%;
 
-    margin-left: -425px;
 
-    margin-top: -340px;
 
+    top: 15%;
 
+    margin-left: -475px;
 
     background: #fff;
 
-    z-index: 103;
 
+    z-index: 303;
 
+    padding: 40px 0 60px;
 
     
 }
 
 .drug-desc-wrapper {
 
-    height: 640px;
 
+    height: 100%;
 
     overflow-y: auto;
 
     padding: 0 40px;
 
 }
 
 .drug-title {
 
+    position: absolute;
 
+    top: 0;
 
     width: 100%;
 
     height: 40px;
 
     line-height: 40px;

+ 7 - 6
src/components/TreatDesc/index.jsx
查看文件 

@@ -17,17 +17,17 @@ class TreatDesc extends Component {
 
         selectDrug && selectDrug(index,ii);
 
     }
 
     hideTreatDesc() {
 
-        $('#treatWrapper').animate({'width': '680px'}, 500);
 
-        $('#treatDescBox').animate({'width': '0px'}, 500);
 
+        $('#treatDescBox').css({'display': 'none'});
 
+        $('#treatDescBox').animate({'display': 'none'}, 500);
 
         $('#treatWrapper').animate({'margin-left': '-340px'}, 500);
 
     }
 
 
     render(){
 
         const  { treatment, treatDesc, setDrugInfo, showDrugInfo} = this.props
 
         const { title, basic, otherDrugIndex, drugDesc} = treatDesc
 
-        return (treatment && treatment.length >0 && <div id='treatDescBox' className={style['treat-desc-box']}>
 
-            <h3 className={style['drug-desc-title']}>同类药物  <img src={close} onClick={this.hideTreatDesc} className={style['close-drug-desc']} /></h3>
 
-            {title && title === '药品推荐' ? <div>
 
+        return (treatment && treatment.length >0 && <div  className={style['treat-desc-box']}>
 
+            
+            {title && title === '药品推荐' ? <div className={style['similar-drug-box']} id='treatDescBox'>
 
                 {/* { basic && basic.length > 0 && <div> //推荐依据不需要展示
 
                     <h3 className={style['recommend-title']}>推荐依据</h3>
 
                     {basic.map((item, index) =>{
 
@@ -36,7 +36,8 @@ class TreatDesc extends Component {
 
                     })}
 
                     
                 </div> } */}
 
-                { otherDrugIndex > -1 && <div className={style['similar-drug']}>
 
+                { otherDrugIndex > -1 && <div  className={style['similar-drug']}>
 
+                    <h3 className={style['drug-desc-title']}>同类药物  <img src={close} onClick={this.hideTreatDesc} className={style['close-drug-desc']} /></h3>
 
                     {treatment[otherDrugIndex].medicitionsList.map((item, index) =>{
 
                         return (<span style={item.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)'} : ''}>
 
                         {index === 0 ? '' : ', '}

+ 19 - 5
src/components/TreatDesc/index.less
查看文件 

@@ -4,8 +4,8 @@
 
     overflow: hidden;
 
 }
 
 .drug-desc-wrapper {
 
-    max-height: 650px;
 
-    overflow-y: scroll;
 
+  height: 100%;
 
+  overflow-y: auto
 
 }
 
 .drug-desc-title {
 
     height: 40px;
 
@@ -13,7 +13,10 @@
 
     border-bottom: 1px solid #e0e2e4;
 
     padding-left: 20px;
 
     width: 260px;
 
-    position: relative;
 
+    position: absolute;
 
+    background: #fff;
 
+    top: 0px;
 
+    margin-left: -20px;
 
 }
 
 .recommend-title, .drug-title {
 
     padding: 30px 0 15px 20px;
 
@@ -29,8 +32,19 @@
 
     position: absolute;
 
     right: 0px;
 
 }
 
+.similar-drug-box {
 
+    display: none;
 
+}
 
 .similar-drug {
 
-    padding: 20px;
 
+    position: absolute;
 
+    padding-top: 40px;
 
+    overflow-y: auto;
 
+    width: 260px;
 
+    left: 680px;
 
+    height: 100%;
 
+    top: 0;
 
+    background: #fff;
 
+    padding: 60px 20px 80px;
 
 }
 
 
 .drug-name {
 
@@ -48,4 +62,4 @@
 
     line-height: 16px;
 
     border-radius: 4px;
 
     text-align: center;
 
-}
 
+}

+ 10 - 4
src/containers/CheckBody.js
查看文件 

@@ -1,15 +1,16 @@
 
 import {connect} from 'react-redux';
 
 import CheckBody from '@components/CheckBody';
 
 import {getModule,getInitData} from '@store/async-actions/fetchModules.js';
 
-import {HIDE,RESET,SETDROPSHOW} from '@store/types/homePage.js';
 
+import {HIDE,RESET,SETDROPSHOW,ISREAD} from '@store/types/homePage.js';
 
 import {SELECTSEARCHDATA} from "@store/types/checkBody";
 
 import {billing} from '@store/async-actions/pushMessage';
 
 
 function mapStateToProps(state){ 
   const {homePage,mainSuit,checkBody} = state;
 
-  const hasMain = mainSuit.saveText.join('')||mainSuit.data.length;
 
+  const hasMain = mainSuit.saveText.join('');//||mainSuit.data.length;
 
   return {
 
     data:checkBody.data,
 
+    isEmpty:checkBody.isEmpty,
 
     update:checkBody.update,   //用于触发更新
 
     showArr:homePage.showDrop,
 
     totalHide:homePage.totalHide,
 
@@ -18,6 +19,7 @@ function mapStateToProps(state){
 
     hasMain,//主诉选中的数据
 
     focusTextIndex:checkBody.focusIndex,    //聚焦的自由文本标签index
 
     span:checkBody.span,
 
+    searchInEnd:checkBody.searchInEnd,      //是否在搜索末尾插入结果
 
     selecteds:checkBody.selecteds       //普通多选选中状态
 
   }
 
 }
 
@@ -28,7 +30,7 @@ function mapDispatchToProps(dispatch,state){
 
       dispatch(getInitData());
 
     },
 
     fetchModules(param){
 
-      const {id,name,index,span} = param;
 
+      const {id,name,index,span,searchInEnd} = param;
 
       getModule(id).then((res)=>{
 
         if(res.data.code=='0'){
 
           dispatch({
 
@@ -37,7 +39,11 @@ function mapDispatchToProps(dispatch,state){
 
             name,
 
             data: res.data.data,
 
             span,
 
-            isReplace:false
 
+            isReplace:false,
 
+            searchInEnd
 
+          })
 
+          dispatch({
 
+            type:ISREAD
 
           })
 
         }
 
       });

+ 2 - 1
src/containers/DiagnosticList.js
查看文件 

@@ -13,7 +13,8 @@ function mapStateToProps(state) {
 
     return {
 
         list: state.diagnosticList.diagnosticList,
 
         treatment: state.treat.show,
 
-        isFirst: state.diagnosticList.isFirst
 
+        isFirst: state.diagnosticList.isFirst,
 
+        diagnosticStr: state.diagnosticList.diagnosticStr
 
     }
 
 }

+ 4 - 0
src/containers/EditableSpan.js
查看文件 

@@ -26,6 +26,7 @@ function mainSuitSearch(obj){
 
         dispatch({
 
           type:SET_SEARCH,
 
           data:res.data.data,
 
+          isEnd:obj.isEnd,      //true为在末尾插入搜索结果否则在前面插入
 
           inpStr:text //搜索输入的值
 
         })
 
       }
 
@@ -41,6 +42,7 @@ function currentSearch(obj){
 
         dispatch({
 
           type:SET_CURRENT_SEARCH,
 
           data:res.data.data,
 
+          isEnd:obj.isEnd,      //true为在末尾插入搜索结果否则在前面插入
 
           inpStr:text
 
         })
 
       }
 
@@ -56,6 +58,7 @@ function checkBodySearch(obj){
 
         dispatch({
 
           type:SETSEARCHDATA,
 
           data:res.data.data,
 
+          isEnd:obj.isEnd,      //true为在末尾插入搜索结果否则在前面插入
 
           inpStr:text
 
         });
 
       }
 
@@ -71,6 +74,7 @@ function otherHisSearch(obj) {
 
         dispatch({
 
           type:SETOTHERSEARCHDATA,
 
           data:res.data.data,
 
+          isEnd:obj.isEnd,      //true为在末尾插入搜索结果否则在前面插入
 
           inpStr:text
 
         });
 
       }

+ 2 - 1
src/containers/HistoryCases.js
查看文件 

@@ -24,9 +24,10 @@ function mapDispatchToProps(dispatch) {
 
             e.stopPropagation();
 
             dispatch(activeHistory(val))
 
         },
 
-        handleQuoteClick(e,data){
 
+        handleQuoteClick(e,data,idx){
 
             e.stopPropagation();
 
             dispatch(keepPushData(data,'his'))      //历史病历引用
 
+            dispatch(activeHistory(idx))
 
             dispatch(visibleHistory(true))
 
         },
 
         handleSortClick(){

+ 2 - 3
src/containers/NumberUnitDrop.js
查看文件 

@@ -75,7 +75,7 @@ function handleModuleDiff(dispatch,params){
 
 function mainSuitLabel(dispatch,params){
 
   const index = params.ikey;
 
   let ikey = getLabelIndex(index);
 
-  const {changeVal,totalVal} = params;console.log(11,params);
 
+  const {changeVal,totalVal} = params;
 
   dispatch({
 
     type:CHANGE_LABELVAL,
 
     data:{changeVal:changeVal,ikey:ikey,totalVal}
 
@@ -160,7 +160,7 @@ function mapDispatchToProps(dispatch,store){
 
       });*/
 
     },
 
     handleLabelChange(params){
 
-      const {type} = params;console.log(2,type);
 
+      const {type} = params;
 
       switch (+type){
 
         case 1:
 
           mainSuitLabel(dispatch,params);
 
@@ -179,7 +179,6 @@ function mapDispatchToProps(dispatch,store){
 
       dispatch({
 
         type: ISREAD
 
       });
 
-      console.log("更新span");
 
     }
 
   }
 
 }

+ 10 - 5
src/containers/OperationContainer.js
查看文件 

@@ -5,15 +5,14 @@ import {
 
     SHOW_PRINT_PREVIEW,
 
     CLOSE_PRINT_PREVIEW,
 
     SHOW_PREVIEW,
 
-    CLOSE_PREVIEW
 
+    CLOSE_PREVIEW,
 
+    DIAG_SHOW
 
 } from "../store/types/print";
 
 import {saveMessage,clearMessages} from "../store/async-actions/print";
 
 import {saveTemplateDetail} from '@store/async-actions/tabTemplate';
 
 import {saveClickNum} from '@store/async-actions/homePage';
 
 
-function mapStateToProps({
 
-    print
 
-}) {
 
+function mapStateToProps({print}) {
 
     return ({
 
         print
 
     });
 
@@ -49,8 +48,14 @@ function mapDispatchToProps(dispatch) {
 
             clearMessages()
 
         },
 
         saveDataAll(val){
 
-            dispatch(saveTemplateDetail(val))
 
+          dispatch(saveTemplateDetail(val))
 
         },
 
+        diagShowTmp(bool){
 
+          dispatch({
 
+            type: DIAG_SHOW,
 
+            data:bool
 
+          });
 
+        }
 
     };
 
 }

+ 10 - 6
src/containers/OtherHistory.js
查看文件 

@@ -2,16 +2,15 @@ import React from 'react';
 
 import {connect} from 'react-redux';
 
 import OtherHistory from "../components/OtherHistory";
 
 import {SETSELECTED,CLEARSELECTED,CONFIRMSELECTED,SELECTOTHERSEARCHDATA,SETDATA,SETTEXTMODEVALUE,OTHEREDICLEAR} from '@types/otherHistory';
 
-import {HIDE,RESET} from '@store/types/homePage.js';
 
+import {HIDE,RESET,ISREAD} from '@store/types/homePage.js';
 
 import {getModule} from '@store/async-actions/fetchModules.js';
 
 import {billing} from '@store/async-actions/pushMessage';
 
 import {fullfillText} from '@common/js/func';
 
 import {didPushParamChange} from '@utils/tools.js';
 
-import {ISREAD} from "../store/types/homePage";
 
 
 function mapStateToProps(state){
 
   const {otherHistory,homePage,typeConfig,mainSuit} = state;
 
-  const hasMain = mainSuit.saveText.join('')||mainSuit.data.length;
 
+  const hasMain = mainSuit.saveText.join('');//||mainSuit.data.length;
 
   return {
 
     data: otherHistory.data,
 
     //initData:state.homePage.initData.otherHis,
 
@@ -24,6 +23,7 @@ function mapStateToProps(state){
 
     searchData:otherHistory.searchData,    //延迟搜索结果
 
     focusTextIndex:otherHistory.focusIndex,    //聚焦的自由文本标签index
 
     span:otherHistory.span,
 
+    searchInEnd:otherHistory.searchInEnd,      //是否在搜索末尾插入结果
 
     selecteds:otherHistory.selecteds,       //普通多选选中状态
 
     editClear:otherHistory.editClear,       //编辑状态
 
     isRead:state.homePage.isRead
 
@@ -57,7 +57,7 @@ function mapDispatchToProps(dispatch,store){
 
       },500);
 
     },
 
     fetchModules(param){
 
-      const {id,name,index,span} = param;
 
+      const {id,name,index,span,searchInEnd} = param;
 
       getModule(id).then((res)=>{
 
         if(res.data.code=='0'){
 
           dispatch({
 
@@ -66,8 +66,12 @@ function mapDispatchToProps(dispatch,store){
 
             name,
 
             data: res.data.data,
 
             span,
 
-            isReplace:false
 
-          })
 
+            isReplace:false,
 
+            searchInEnd
 
+          });
 
+          dispatch({
 
+            type:ISREAD
 
+          });
 
         }
 
       });
 
     },

+ 1 - 1
src/containers/SpreadDrop.js
查看文件 

@@ -82,7 +82,7 @@ function currentIll(dispatch,store,params){
 
   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)=>{

+ 6 - 2
src/containers/Treat.js
查看文件 

@@ -1,7 +1,7 @@
 
 import React from 'react';
 
 import { connect } from 'react-redux';
 
 import Treat from '@components/Treat';
 
-import { SELECT_DRUG, SET_OTHER_DRUG, SET_DRUG_INFO, HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO } from '@store/types/treat.js';
 
+import { SELECT_DRUG, SET_OTHER_DRUG, SET_DRUG_INFO, CLEAR_DRUG_INFO,HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO } from '@store/types/treat.js';
 
 import { getInstroduce, getRecommendBasic } from '@store/async-actions/treat';
 
 import { ADD_SCHEME } from '@store/types/pushMessage.js'
 
 import { showDrugInfo } from '../store/actions/treat';
 
@@ -15,7 +15,8 @@ function mapStateToProps(state){
 
         surgeryTreat: treat.surgeryTreat,
 
         treatDesc: treat.treatDesc,
 
         drugInfo: treat.drugInfo,
 
-        showDrug: treat.showDrugInfo
 
+        showDrug: treat.showDrugInfo,
 
+        treatItem: treat.treatItem,
 
     }
 
 }
 
  
@@ -56,6 +57,9 @@ function mapDispatchToProps(dispatch) {
 
             })
 
         },
 
         hideDrugInfo: () =>{
 
+            dispatch({
 
+                type: CLEAR_DRUG_INFO
 
+            })
 
             dispatch({
 
                 type: HIDE_DRUG_INFO
 
             })

+ 0 - 1
src/containers/TreatDrug.js
查看文件 

@@ -4,7 +4,6 @@ import TreatDrug from '@components/TreatDrug';
 
 // import { ADD_DRUG } from '@stroe/types/treatDrug.js';
 
 
 function mapStateToProps(state){
 
-    console.log('state1111',state.treatDrug)
 
     return {
 
         treatDrugList: state.treatDrug
 
     }

+ 1 - 1
src/containers/eleType.js
查看文件 

@@ -124,7 +124,7 @@ export default function(params){
 
     case 8:
 
       // return <EditableSpan {...params} value={data.value||data.name} update={Math.random()}/>;
 
       // 删除后value为空，应展示空而不是name
 
-      return <EditableSpan {...params} value={data.value||data.value==''?data.value:data.name} update={Math.random()}/>;
 
+      return <EditableSpan {...params} value={data.value||data.value==''?data.value:data.name} full={data.full} update={Math.random()}/>;
 
     case 11://推送类型
 
       return multCheckLabels(params,data.tagType);
 
     default:

+ 37 - 16
src/store/actions/checkBody.js
查看文件 

@@ -7,6 +7,7 @@ export function set(state,action){
 
   res.data = [...data];
 
   res.saveText = fullfillText(res.data).saveText;//存逗号
 
   res.update = Math.random();
 
+  res.isEmpty = false;
 
   return res;
 
 }
 
 //查体中数字键盘选中事件
 
@@ -37,7 +38,7 @@ export function setNumberValue(state,action){
 
 }
 
 
 //查体单选下拉选中
 
-export function setRadioValue(state,action){
 
+export function setRadioValue(state,action){console.log(221)
 
   let res = Object.assign({},state);
 
   const {ikey,id,text} = action;
 
   let labelInx = getLabelIndex(ikey);
 
@@ -130,31 +131,44 @@ export function setSearchData(state,action){
 
   let res = Object.assign({},state);
 
   res.searchData = action.data;
 
   res.searchStr = action.inpStr;
 
+  res.searchInEnd = action.isEnd;
 
   return res;
 
 }
 
 
-//插入标签数据
 
+//插入标签数据-搜索
 
 export function insertLabelData(state,action){
 
   let res = Object.assign({},state);
 
   const text = Object.assign({},JSON.parse(config.textLabel));
 
   const searchStr = res.searchStr;
 
-  const {index,data,isReplace,span}=action;
 
+  const {index,data,isReplace,span,searchInEnd}=action;
 
   const showText = res.saveText[index];
 
   const spreadLabels = data;
 
-  const toEnd = showText.indexOf(searchStr)>0;    //替换前或后的搜索词（中间不可搜）
 
-  let reg = toEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
 
-  const newText=showText.replace(reg,'')||' ';
 
+  let reg = searchInEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
 
+  const newText=showText.replace(reg,'')||'';
 
   if(!isReplace){
 
     span.current.innerText = newText;
 
     const pText = Object.assign({},text,{value:newText});
 
-    res.data.splice(index,1,pText,spreadLabels,text);
 
-    res.saveText.splice(index,1,newText,'','');
 
-    res.selecteds.splice(index,1,null,null,null);
 
+    if(searchInEnd){
 
+      res.data.splice(index,1,pText,spreadLabels,text);
 
+      res.saveText.splice(index,1,newText,'','');
 
+      res.selecteds.splice(index,1,null,null,null);
 
+    }else{
 
+      res.data.splice(index,1,text,spreadLabels,pText);
 
+      res.saveText.splice(index,1,'','',newText);
 
+      res.selecteds.splice(index,1,null,null,null);
 
+    }
 
+
 
   }else{
 
     span.current.innerText = ' ';
 
-    res.data.splice(index+1,0,spreadLabels,text);
 
-    res.saveText.splice(index+1,0,'','');
 
-    res.selecteds.splice(index+1,0,null,null);
 
+    if(searchInEnd){
 
+      res.data.splice(index+1,0,spreadLabels,text);
 
+      res.saveText.splice(index+1,0,'','');
 
+      res.selecteds.splice(index+1,0,null,null);
 
+    }else{
 
+      res.data.splice(index,0,text,spreadLabels);
 
+      res.saveText.splice(index,0,'','');
 
+      res.selecteds.splice(index,0,null,null);
 
+    }
 
   }
 
   res.searchData = [];    //选中清空搜索内容（即关闭搜索弹窗）
 
   res.update = Math.random();
 
@@ -190,10 +204,16 @@ export const changeNumLabelVal = (state,action)=>{
 
   const index = action.data.ikey;
 
   const newVal = action.data.changeVal;
 
   let item = res.data[index];
 
-  if(item){
 
-    item.value = newVal;
 
-  }
 
-  res.saveText[index] = newVal;
 
+  if(newVal.trim()){
 
+    if(item){
 
+      item.value = newVal;
 
+    }
 
+    res.saveText[index] = newVal;
 
+  }else{//删除完标签内容则删除该标签
 
+    res.data.splice(index,1);
 
+    res.saveText = fullfillText(res.data).saveText;
 
+  } 
+  
   res.update = Math.random();
 
   return res;
 
 }
 
@@ -202,6 +222,7 @@ export function clearCheckBody(state,action){  //清空
 
   let res = Object.assign({},state);
 
   res.data = action.data;
 
   res.saveText = action.saveText;
 
+  res.isEmpty = action.isEmpty;
 
   res.selecteds = action.selecteds?action.selecteds:[];
 
   return res;
 
 }

+ 1 - 1
src/store/actions/currentIll.js
查看文件 

@@ -211,7 +211,7 @@ function getLabel(lid,lname){
 
 // 多选展开确定事件--主、伴、无
 
 export const confirm = (state,action) =>{
 
   let res = Object.assign({},state);
 
-  let length1 = res.data.length;
 
+  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 = exists && exists.length>0?getIds(exists):[];

+ 10 - 6
src/store/actions/mainSuit.js
查看文件 

@@ -388,15 +388,19 @@ export const changeNumLabelVal = (state,action)=>{
 
   const index = action.data.ikey;
 
   const newVal = action.data.changeVal;
 
   let item = res.data[index];
 
-  if(item){
 
-    item.value = newVal;
 
-  }
 
-  res.saveText[index] = newVal;
 
-  res.update = Math.random();
 
+  if(newVal.trim()){
 
+    if(item){
 
+      item.value = newVal;
 
+      res.saveText[index] = newVal;
 
+    }
 
+  }else{//删除完标签内容则删除该标签
 
+    res.data.splice(index,1);
 
+    res.saveText = fullfillText(res.data).saveText;
 
+  }  
+  res.update = Math.random();//console.log(44,action,res);
 
   return res;
 
 }
 
 
-
 
 // 保存自由输入文本--无模板
 
 export const saveFreeVal = (state,action)=>{
 
   const res = Object.assign({},state);

+ 35 - 21
src/store/actions/otherHistory.js
查看文件 

@@ -6,7 +6,8 @@ export const confirm = (state,action) =>{
 
   let res = Object.assign({},state);
 
   let arr = res.data;
 
   const {nones,exists,withs,ikey,exclusion,excluName,copyType} = action.data;
 
-  if((!exists||!withs||[...exists,...withs].length==0)&&!nones&&!exclusion){       //取消无殊的选中，空白提交
 
+  const items = [...exists||[],...withs||[]];
 
+  if((!exists||!withs||items.length==0)&&!nones&&!exclusion){       //取消无殊的选中，空白提交
 
     arr[ikey].value = '';
 
     res.saveText[ikey] = '';
 
     res.selecteds.splice(ikey,1);
 
@@ -26,25 +27,27 @@ export const confirm = (state,action) =>{
 
     arr.splice(ikey,1);
 
   }
 
   if(arr[ikey].value)  arr[ikey].value= '';
 
-  let newPreText = (arr[ikey-1].value||arr[ikey-1].name||'')+nones;//console.log(arr[ikey-1],newPreText)
 
-  if([...exists,...withs].length==0&&nones){
 
+  let preText = arr[ikey-1].value!==undefined?arr[ikey-1].value:arr[ikey-1].name||'';
 
+  let newPreText =preText +nones;//console.log(arr[ikey-1],newPreText)
 
+  if(items.length==0&&nones){
 
     arr[ikey-1].value = newPreText;
 
     res.saveText[ikey-1] = newPreText;
 
     res.update=Math.random();
 
     return res;
 
   }
 
-  //有，无，伴随配
 
-    arr.splice(ikey-1,1);
 
-    let flabel = [...exists,...withs][0];         //要插入的第一个标签
 
-    let text = newPreText;
 
-    //要插入的第一个标签为自由文本，则和前一个文本标签文字合并
 
+  //有，伴，无随配
 
+    //arr.splice(ikey-1,1);
 
+    let flabel = items[items.length-1];         //要插入的最后一个标签
 
+    let labelText = flabel.value!==undefined?flabel.value:flabel.name;
 
+    let text = labelText;
 
+    //要插入的最后一个标签为自由文本，则和后面的文本标签文字合并
 
     if(flabel.tagType==8){
 
-      flabel.value = newPreText+(flabel.value||flabel.name);
 
+      flabel.value = labelText+nones;
 
       text = flabel.value;
 
     }
 
-    arr.splice(ikey-1,0,...exists,...withs);
 
-    arr[ikey-1].value = text;
 
-    // res.saveText[ikey-1] = text;
 
+    arr.splice(ikey,0,...exists,...withs);
 
+    //arr[ikey-1].value = text;
 
+    //res.saveText[ikey+items.length] = text;
 
     res.saveText = fullfillText(arr).saveText;
 
     res.update=Math.random();         //用于触发组件更新（data变化了因在对象中无法被组件检测到）
 
     return res;
 
@@ -168,29 +171,40 @@ export function setSearchData(state,action){
 
   let res = Object.assign({},state);
 
   res.searchData = action.data;
 
   res.searchStr = action.inpStr;
 
+  res.searchInEnd = action.isEnd;
 
   return res;
 
 }
 
 
-//插入标签数据
 
+//插入标签数据-搜索
 
 export function insertLabelData(state,action){
 
   let res = Object.assign({},state);
 
   const text = Object.assign({},JSON.parse(config.textLabel));
 
   const searchStr = res.searchStr;
 
-  const {index,data,isReplace,span}=action;
 
+  const {index,data,isReplace,span,searchInEnd}=action;
 
   const showText = res.saveText[index];
 
   const spreadLabels = data;
 
-  const toEnd = showText.indexOf(searchStr)>0;    //替换前或后的搜索词（中间不可搜）
 
-  let reg = toEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
 
+  let reg = searchInEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
 
   const newText=showText.replace(reg,'')||' ';
 
   if(!isReplace){
 
     span.current.innerText = newText;
 
     const pText = Object.assign({},text,{value:newText});
 
-    res.data.splice(index,1,pText,spreadLabels,text);
 
-    res.saveText.splice(index,1,newText,'','');
 
+    if(searchInEnd){
 
+      res.data.splice(index,1,pText,spreadLabels,text);
 
+      res.saveText.splice(index,1,newText,'','');
 
+    }else{
 
+      res.data.splice(index,1,spreadLabels,pText,text);
 
+      res.saveText.splice(index,1,'',newText,'');
 
+    }
 
   }else{
 
     span.current.innerText = ' ';
 
-    res.data.splice(index+1,0,spreadLabels,text);
 
-    res.saveText.splice(index+1,0,'','');
 
+    if(searchInEnd){
 
+      res.data.splice(index+1,0,spreadLabels,text);
 
+      res.saveText.splice(index+1,0,'','');
 
+    }else{
 
+      res.data.splice(index,0,text,spreadLabels);
 
+      res.saveText.splice(index,0,'','');
 
+    }
 
+
 
   }
 
   res.searchData = [];    //选中清空搜索内容（即关闭搜索弹窗）
 
   res.update = Math.random();
 
@@ -210,7 +224,7 @@ export function changeTextLabel(state,action) {
 
   }else{//删除完标签内容则删除该标签
 
     res.data.splice(index,1);
 
     res.saveText = fullfillText(res.data).saveText;
 
-  } 
+  }
 
   res.update = Math.random();
 
   return res;
 
 }

+ 7 - 0
src/store/actions/print.js
查看文件 

@@ -27,3 +27,10 @@ export const saveMessage=(state,action)=>{
 
   res.saveMessage = action.data
 
   return res;
 
 };
 
+
 
+export const diagShow=(state,action)=>{
 
+  const res=Object.assign({},state);
 
+  console.log(action)
 
+  res.diagShow = action.data
 
+  return res;
 
+};

+ 1 - 1
src/store/actions/tabTemplate.js
查看文件 

@@ -9,7 +9,7 @@ import {
 
     CHANGE_VISIBLE,
 
     SHOW_MESSAGE,
 
     KEEP_PUSH_DATA,
 
-    ALL_CHECKED_SHOW
 
+    ALL_CHECKED_SHOW,
 
 } from '@store/types/tabTemplate';
 
 
 export const delItems = (id) => ({ //删除模板

+ 12 - 0
src/store/actions/treat.js
查看文件 

@@ -59,6 +59,12 @@ export const setDrugInfo = (state, action) => {
 
     return res
 
 }
 
 
+export const clearDrugInfo = (state, action) => {
 
+    const res = JSON.parse(JSON.stringify(state));
 
+    res.drugInfo.drugDesc = [];
 
+    return res
 
+}
 
+
 
 export const setRecommendBasic = (state, action) => {
 
     // const res = Object.assign({}, state)
 
     const res = JSON.parse(JSON.stringify(state));
 
@@ -79,3 +85,9 @@ export const hideDrugInfo = (state, action) => {
 
     return res;
 
 }
 
 
+export const setTreatInfo = (state, action) => {
 
+    const res = Object.assign({}, state);
 
+    res.treatItem = action.treatItem;
 
+    return res;
 
+}
 
+

+ 0 - 1
src/store/async-actions/assistCheck.js
查看文件 

@@ -18,7 +18,6 @@ export const getSearchList = (val) => {
 
             sexType: sex == '男'?'1' : sex == '女'?'2':'3'
 
         })
 
         .then((res)=>{
 
-            console.log(res.data.data)
 
             const data = res.data.data;
 
             dispatch(searchList(data));
 
         })

+ 1 - 3
src/store/async-actions/diagnosticList.js
查看文件 

@@ -4,13 +4,11 @@ import {ISREAD} from "../types/homePage";
 
 export const isAddMainSuit = () =>{
 
     return (dispatch, getState) => {
 
         const state = getState();
 
-        console.log('state',state);
 
         if(state.diagnosticList.diagnosticList.length === 1 && state.diagnosticList.diagnosticList[0].type === 2) {
 
             const isAddMainSuitFlag = state.mainSuit.data && state.mainSuit.data.length === 0 && state.mainSuit.saveText    //判断主诉和化验查体是否为空
 
                                       && (state.mainSuit.saveText.length === 0 || state.mainSuit.saveText.length === 1 
                                       &&  state.mainSuit.saveText[0] === '') && state.assistCheck && state.assistCheck.dataString.length === 0
 
-                                      && state.inspect.labelList && state.inspect.labelList.length === 0
 
-                                    
+                                      && state.inspect.labelList && state.inspect.labelList.length === 0 && state.inspect.inspectStrPlus.length === 0
 
             if(isAddMainSuitFlag) {
 
                 dispatch({
 
                     type:ISREAD

+ 9 - 1
src/store/async-actions/fetchModules.js
查看文件 

@@ -6,6 +6,7 @@ import store from '@store';
 
 import {getEMRParams} from '@utils/tools.js';
 
 import {Notify} from '@commonComp';
 
 import {SETOTHERHISTORY} from "../types/homePage";
 
+import config from "@config/index";
 
 
 const api={
 
   getSpreadModule:'/api/icss/questionInfo/getByIds',
 
@@ -106,9 +107,16 @@ export function getInitData(){
 
         const arr = fullfillText(JSON.parse(str),false,false,false).newArr;
 
         dispatch({
 
           type:SET,
 
-          data:[...arr]
 
+          data:[...arr],
 
+          isEmpty:false
 
         });
 
       }else{
 
+        const block = Object.assign(JSON.parse(config.textLabel),{full:true});      //无数据时保留一个自由文本标签可输入
 
+        dispatch({
 
+          type:SET,
 
+          data:[block],
 
+          isEmpty:false
 
+        });
 
         Notify.error(res.data.msg);
 
       }
 
     });

+ 4 - 5
src/store/async-actions/homePage.js
查看文件 

@@ -68,11 +68,10 @@ export const getInitModules= (dispatch,getStore)=>{
 
 
 export const initHis = (dispatch)=> {
 
     let timer = setInterval(()=>{
 
-        let baseDate = store.getState().patInfo.message;
 
-        //console.log(baseDate)
 
-        if(JSON.stringify(baseDate) != '{}') {
 
-            dispatch(initHistoryDetails(baseDate));
 
-            clearInterval(timer)
 
+        let baseDate = store.getState();
 
+        if(JSON.stringify(baseDate.patInfo.message) != '{}') {
 
+          dispatch(initHistoryDetails(baseDate.patInfo.message));
 
+          clearInterval(timer)
 
         }
 
     },500)
 
 }

+ 10 - 7
src/store/async-actions/patInfo.js
查看文件 

@@ -6,6 +6,7 @@ import {getUrlArgObject,pushAllDataList} from '@utils/tools';
 
 import {getInitModules} from '@store/async-actions/homePage.js';
 
 import store from '@store'
 
 import {ISREAD} from "../types/homePage";
 
+import { initItemList } from '@store/async-actions/tabTemplate';
 
 
 const api = {
 
     getPatInfo: '/api/icss/patientInfo/getTopPatientInfo',
 
@@ -20,6 +21,7 @@ export const initPersonInfo = (dispatch, getState) => {
 
         const data = res.data;
 
         if (data.code == 0) {
 
             dispatch(getInfos(data.data));
 
+            console.log(data.data)
 
             getPatientMessage(dispatch, getState);
 
         } else {
 
             console.log(res)
 
@@ -47,16 +49,14 @@ export const initHistoryDetails = (dispatch) => {
 
                   type:ISREAD
 
                 });
 
                 // 设置初始模式
 
-                if(detail.sign == 1){
 
+                if(detail.sign == 1 || detail.sign == 0){
 
                     dispatch({
 
                         type: CONFIRM_TYPE,
 
-                        confirmType: 1
 
-                    })
 
-                }else if(detail.sign == 0){
 
-                    dispatch({
 
-                        type: CONFIRM_TYPE,
 
-                        confirmType: 0
 
+                        confirmType: detail.sign
 
                     })
 
+                    if(baseList.tabTemplate.items.length == 0){
 
+                      dispatch(initItemList());        //模板列表没有就获取模板列表用于保存时做数据对比是否保存过
 
+                    }
 
                 }
 
             } else {
 
                 console.log(res)
 
@@ -94,5 +94,8 @@ export const getPatientMessage = (dispatch, getState) => {
 
         type: CONFIRM_TYPE,
 
         confirmType:data1.modeValue
 
       });
 
+      if(state.tabTemplate.items.length == 0){
 
+        dispatch(initItemList(data1.modeValue));        //模板列表没有就获取模板列表用于保存时做数据对比是否保存过
 
+      }
 
     })
 
 };

+ 19 - 2
src/store/async-actions/tabTemplate.js
查看文件 

@@ -4,8 +4,9 @@ import {
 
   delItems,
 
   batchDelItems,
 
   changeTitle,
 
-  keepPushData
 
+  keepPushData,
 
 } from '@store/actions/tabTemplate';
 
+import {DIAG_SHOW} from "@store/types/print";
 
 import Notify from '@commonComp/Notify';
 
 import store from '@store';
 
 import {
 
@@ -17,6 +18,7 @@ export const initItemList = (type) => { //初始化数据
 
   let baseList = store.getState();
 
   let whichSign = baseList.typeConfig.typeConfig;
 
   let state = baseList.patInfo.message;
 
+
 
   return (dispatch) => {
 
     axios.json('/api/icss/templateInfo/getByDoctorIdTemplates', {
 
       "doctorId": state.doctorId,
 
@@ -34,7 +36,7 @@ export const initItemList = (type) => { //初始化数据
 
   }
 
 };
 
 
-export const saveTemplateDetail = (val) => { //保存为模板（先判断是否引入模板，是的话需要判断是否改变了值）
 
+export const saveTemplateDetail = (val) => { //保存为模板
 
   let baseList = store.getState();
 
   let jsonData = getAllDataList(baseList);
 
   let jsonStr = getAllDataStringList(baseList);
 
@@ -69,7 +71,22 @@ export const saveTemplateDetail = (val) => { //保存为模板（先判断是否
 
         Notify.success('模板保存成功');
 
         dispatch(initItemList());
 
         dispatch(keepPushData(getdata(1),'part'));
 
+        dispatch({
 
+          type: DIAG_SHOW,
 
+          data:false
 
+        });
 
       } else {
 
+        if(data.msg == '该模板名存在'){         //存在不关闭弹窗
 
+          dispatch({
 
+            type: DIAG_SHOW,
 
+            data:true
 
+          });
 
+        }else{
 
+          dispatch({
 
+            type: DIAG_SHOW,
 
+            data:false
 
+          });
 
+        }
 
         Notify.error(data.msg);
 
       }
 
     })

+ 6 - 3
src/store/async-actions/treat.js
查看文件 

@@ -1,7 +1,7 @@
 
 import { json } from "@utils/ajax";
 
 import { SET_TREAT } from '@store/types/diagnosticList';
 
 import { ADD_DIAGNOSTIC, GET_DIAGNOSTIC_STR} from '@store/types/diagnosticList';
 
-import { SET_DRUG_INFO, SET_TREATMENT, SET_RECOMMEND_BASIC } from '@store/types/treat';
 
+import { SET_DRUG_INFO, SET_TREATMENT, SET_TREAT_INFO, SET_RECOMMEND_BASIC } from '@store/types/treat';
 
 import {storageLocal,getEMRParams} from '@utils/tools';
 
 import { isAddMainSuit } from '@store/async-actions/diagnosticList';
 
 
@@ -76,6 +76,10 @@ export const addDiagnostic = (item) => {
 
 
 export const getTreatResult = (item) =>{
 
     return (dispatch, getState) => {
 
+        dispatch({
 
+            type: SET_TREAT_INFO,
 
+            treatItem: item
 
+        })
 
         const state = getState();
 
         let url = api.push;
 
         if(+state.typeConfig.confirmType===1){
 
@@ -126,7 +130,7 @@ export const getTreatResult = (item) =>{
 
                      treat = data.data.data.treat || {}
 
                 }
 
                 if(treat) {
 
-                    return dispatch({
 
+                   dispatch({
 
                         type: SET_TREATMENT,
 
                         treatment: treat.treatment,
 
                         generalTreat: treat.commonTreatment,
 
@@ -134,7 +138,6 @@ export const getTreatResult = (item) =>{
 
                     })
 
                 }
 
                 
-            return
 
         }).catch((e) =>{
 
             console.log(e)
 
         })

+ 10 - 10
src/store/reducers/assistCheck.js
查看文件 

@@ -26,7 +26,7 @@ export default (state = initSearchList, action) => {
 
         newState.list = action.list
 
         return newState;
 
     }
 
-    if (action.type == GET_ASSIST_LABEL) {
 
+    if (action.type == GET_ASSIST_LABEL) {             //默认
 
         const newState = Object.assign({}, state);
 
         const tempArr = newState.list;
 
         const tempArrs = newState.assistLabel;
 
@@ -37,14 +37,14 @@ export default (state = initSearchList, action) => {
 
                 tempArrs.push(tempArr[i]);
 
                 newState.assistLabel = [...tempArrs];
 
             }
 
-            for (let j = 0; j < tempArrs.length; j++) {
 
-                tmpString += (tempArrs[j].name+(tempArrs[j].value?(','+tempArrs[j].value):'')+(tempArrs[j].time?',报告日期,'+tempArrs[j].time:'')+';')
 
-            }
 
+        }
 
+        for (let j = 0; j < tempArrs.length; j++) {
 
+            tmpString += (tempArrs[j].name+(tempArrs[j].value?('：'+tempArrs[j].value):'')+(tempArrs[j].time?'，报告日期：'+tempArrs[j].time:'')+';')
 
         }
 
         newState.dataString = tmpString
 
         return newState;
 
     }
 
-    if (action.type == DEL_ASSIST_LABEL) {
 
+    if (action.type == DEL_ASSIST_LABEL) {        //删除
 
         const newState = Object.assign({}, state);
 
         const tempArr = newState.assistLabel;
 
         let tmpString = '';
 
@@ -54,13 +54,13 @@ export default (state = initSearchList, action) => {
 
             return
 
         }
 
         for (let i = 0; i < tempArr.length; i++) {
 
-            tmpString += (tempArr[i].name+(tempArr[i].value?(','+tempArr[i].value):'')+(tempArr[i].time?',报告日期,'+tempArr[i].time:'')+';')
 
+            tmpString += (tempArr[i].name+(tempArr[i].value?('：'+tempArr[i].value):'')+(tempArr[i].time?'，报告日期：'+tempArr[i].time:'')+';')
 
         }
 
         newState.assistLabel = [...tempArr]
 
         newState.dataString = tmpString
 
         return newState;
 
     }
 
-    if (action.type == CHANGE_ASSIST_VAL) {
 
+    if (action.type == CHANGE_ASSIST_VAL) {           //改变输入值
 
         const newState = Object.assign({}, state);
 
         const tempArr = newState.assistLabel;
 
         let tmpString = '';
 
@@ -69,12 +69,12 @@ export default (state = initSearchList, action) => {
 
                 tempArr[i].value = action.val
 
                 newState.assistLabel = [...tempArr]
 
             }
 
-            tmpString += (tempArr[i].name+(tempArr[i].value?(','+tempArr[i].value):'')+(tempArr[i].time?',报告日期,'+tempArr[i].time:'')+';')
 
+            tmpString += (tempArr[i].name+(tempArr[i].value?('：'+tempArr[i].value):'')+(tempArr[i].time?'，报告日期：'+tempArr[i].time:'')+';')
 
         }
 
         newState.dataString = tmpString
 
         return newState;
 
     }
 
-    if (action.type == CHANGE_DATE) {
 
+    if (action.type == CHANGE_DATE) {             //新增
 
         const newState = Object.assign({}, state);
 
         const tempArr = newState.assistLabel;
 
         let tmpString = '';
 
@@ -83,7 +83,7 @@ export default (state = initSearchList, action) => {
 
                 tempArr[i].time = action.date
 
                 newState.assistLabel = [...tempArr]
 
             }
 
-            tmpString += (tempArr[i].name+(tempArr[i].value?(','+tempArr[i].value):'')+(tempArr[i].time?',报告日期,'+tempArr[i].time:'')+';')
 
+            tmpString += (tempArr[i].name+(tempArr[i].value?('：'+tempArr[i].value):'')+(tempArr[i].time?'，报告日期：'+tempArr[i].time:'')+';')
 
         }
 
         newState.dataString = tmpString
 
         return newState;

+ 4 - 2
src/store/reducers/checkBody.js
查看文件 

@@ -3,13 +3,15 @@ import {SET,SETNUMBER4,SETSELECTED4,SETCHECKBOX,ADDLABELITEM,SETCHECKTEXT,SETSEA
 
 import {set,setNumberValue,setRadioValue,setCheckBoxValue,addLabelItem,setCheckText,setSearchData,insertLabelData,changeLabelVal,clearCheckBody,setInputLabel,backspaceText,changeNumLabelVal} from '../actions/checkBody.js';
 
 import config from '@config/index.js';
 
 
-const block = Object.assign(JSON.parse(config.textLabel),{full:true});
 
+//const block = Object.assign(JSON.parse(config.textLabel),{full:false});//空白时保留一个自由文本标签
 
 const initState = {
 
                 data:[],
 
                 saveText:[],    //saveText为生成的纯文本
 
                 searchData:[],
 
                 selecteds:[],
 
-                focusIndex:''};
 
+                focusIndex:'',
 
+                isEmpty:true      //是否为空白，需要请求数据
 
+          };
 
 export default function(state=initState,action){
 
   let res = Object.assign({},state);
 
   switch(action.type){

+ 1 - 1
src/store/reducers/getInfoByUuid.js
查看文件 

@@ -17,4 +17,4 @@ export default (state = initPersonList, action) => {
 
         return newState;
 
     }
 
     return state;
 
-}
 
+}

+ 6 - 3
src/store/reducers/print.js
查看文件 

@@ -1,10 +1,11 @@
 
-import { SHOW_PRINT_PREVIEW, CLOSE_PRINT_PREVIEW, SAVE_MESSAGE, CLOSE_PREVIEW, SHOW_PREVIEW,CLEAR_MESSAGE } from "../types/print";
 
-import { showPrintPreview, closePrintPreview, saveMessage, showPreview, closePreview } from "../actions/print";
 
+import { SHOW_PRINT_PREVIEW, CLOSE_PRINT_PREVIEW, SAVE_MESSAGE, CLOSE_PREVIEW, SHOW_PREVIEW,CLEAR_MESSAGE,DIAG_SHOW } from "../types/print";
 
+import { showPrintPreview, closePrintPreview, saveMessage, showPreview, closePreview,diagShow } from "../actions/print";
 
 
 const initState = {
 
   visible: false,
 
   preVisible: false,
 
-  saveMessage: {}
 
+  saveMessage: {},
 
+  diagShow: false
 
 };
 
 export default function(state = initState, action) {
 
   switch (action.type) {
 
@@ -20,6 +21,8 @@ export default function(state = initState, action) {
 
       return saveMessage(state, action);
 
     case CLEAR_MESSAGE:
 
       return clearMessage(state, action);
 
+    case DIAG_SHOW:
 
+      return diagShow(state, action);
 
     default:
 
       return state;
 
   }

+ 1 - 1
src/store/reducers/tabTemplate.js
查看文件 

@@ -9,7 +9,7 @@ import {
 
   CHANGE_VISIBLE,
 
   SHOW_MESSAGE,
 
   KEEP_PUSH_DATA,
 
-  ALL_CHECKED_SHOW
 
+  ALL_CHECKED_SHOW,
 
 } from '../types/tabTemplate';

+ 6 - 2
src/store/reducers/treat.js
查看文件 

@@ -1,5 +1,5 @@
 
-import { SELECT_DRUG, SET_OTHER_DRUG, SET_DRUG_INFO, SHOW_TREAT, HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO, SET_GENERAL_TREAT, SET_TREATMENT, SET_SURGERY_TREAT, SET_RECOMMEND_BASIC } from '../types/treat'
 
-import { selectDrug, setOtherDrug, setDrugInfo, showTreat, hideTreat, clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, setRecommendBasic } from '../actions/treat'
 
+import { SELECT_DRUG, SET_TREAT_INFO, SET_OTHER_DRUG, SET_DRUG_INFO, CLEAR_DRUG_INFO,SHOW_TREAT, HIDE_TREAT, CLEAR_TREAT, SHOW_DRUG_INFO, HIDE_DRUG_INFO, SET_GENERAL_TREAT, SET_TREATMENT, SET_SURGERY_TREAT, SET_RECOMMEND_BASIC } from '../types/treat'
 
+import { selectDrug, setTreatInfo, setOtherDrug, setDrugInfo, clearDrugInfo, showTreat, hideTreat, clearTreat, showDrugInfo, hideDrugInfo, setTreatment, setGeneralTreat, setSurgeryTreat, setRecommendBasic } from '../actions/treat'
 
 const initState = {
 
     show: false, //治疗方案显示隐藏
 
     showDrugInfo: false, //药品信息显示隐藏
 
@@ -191,6 +191,10 @@ export default function(state=initState, action){
 
             return showDrugInfo(state, action);
 
         case HIDE_DRUG_INFO:
 
             return hideDrugInfo(state, action);
 
+        case SET_TREAT_INFO:
 
+            return setTreatInfo(state, action);
 
+        case CLEAR_DRUG_INFO:
 
+            return clearDrugInfo(state, action);
 
         default:
 
             return state
 
     }

+ 2 - 1
src/store/types/print.js
查看文件 

@@ -3,4 +3,5 @@ export const CLOSE_PRINT_PREVIEW = 'CLOSE_PRINT_PREVIEW'
 
 export const SAVE_MESSAGE = 'SAVE_MESSAGE'
 
 export const CLEAR_MESSAGE = 'CLEAR_MESSAGE'
 
 export const SHOW_PREVIEW = 'SHOW_PREVIEW'
 
-export const CLOSE_PREVIEW = 'CLOSE_PREVIEW'
 
+export const CLOSE_PREVIEW = 'CLOSE_PREVIEW'
 
+export const DIAG_SHOW = 'DIAG_SHOW'

+ 2 - 0
src/store/types/treat.js
查看文件 

@@ -1,6 +1,7 @@
 
 export const SELECT_DRUG = 'SELECT_DRUG';   //选则药品
 
 export const SET_OTHER_DRUG = 'SET_OTHER_DRUG'; //设置其他推荐
 
 export const SET_DRUG_INFO = 'SET_DRUG_INFO'; //设置药品说明
 
+export const CLEAR_DRUG_INFO = 'CLEAR_DRUG_INFO'; //清除药品说明
 
 export const SHOW_TREAT = 'SHOW_TREAT';
 
 export const HIDE_TREAT = 'HIDE_TREAT';
 
 export const CLEAR_TREAT = 'CLEAR_TREAT'; //清除治疗方案内容
 
@@ -10,3 +11,4 @@ export const SET_GENERAL_TREAT = 'SET_GENERAL_TREAT'; //设置一般治疗
 
 export const SET_SURGERY_TREAT = 'SET_SURGERY_TREAT'; //设置手术治疗
 
 export const SET_TREATMENT = 'SET_TREATMENT' //设置治疗方案
 
 export const SET_RECOMMEND_BASIC = 'SET_RECOMMEND_BASIC'//设置其他推荐推荐依据
 
+export const SET_TREAT_INFO = 'SET_TREAT_INFO' //设置治疗方案信息（name,id等）

+ 2 - 1
src/utils/tools.js
查看文件 

@@ -8,6 +8,7 @@ import {clearAllLabel} from '@store/actions/inspect';
 
 import {CLEAR_ALL_DIAG} from '@store/types/diagnosticList';
 
 import {CLEAR_ALL_PUSH_MESSAGE, SET_TIPS} from '@store/types/pushMessage';
 
 import {ISREAD, SETREADDITEMS} from "../store/types/homePage";
 
+import config from '@config/index.js';
 
 
 /***
 
  * 工具函数
 
@@ -234,7 +235,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
 
         store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[]});
 
         store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],selecteds:[],editClear:true,symptomIds:[]});
 
         store.dispatch({type: CLEAROTHERHISTORY,data:[],saveText:[],selecteds:[],editClear:true});
 
-        store.dispatch({type: CLEARCHECKBODY,data:[],saveText:[],selecteds:[]});
 
+        store.dispatch({type: CLEARCHECKBODY,data:[],isEmpty:true,saveText:[],selecteds:[]});
 
         store.dispatch(clearAssistData([],''));
 
         store.dispatch(clearAllLabel([],[],''));
 
         store.dispatch({