Squashed commit of the following:

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

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

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

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

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

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

    滚动条弹窗调整

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

    Merge branch 'dev/new1' into dev/zhangxc1

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

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

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

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

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

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

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

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

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

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

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

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

    删除console

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

    诊断搜索添加同义词

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

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

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

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

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

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

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

    诊断延迟搜索

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

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

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

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

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

    nothing to do

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

    Merge branch 'dev/new1' into dev/zhangxc1

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

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

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

    翠加

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

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

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

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

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

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

    罗磊修改

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

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

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

    高度计算有误

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

    标点预览

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

    滚动条问题

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

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

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

    Merge branch 'dev/new1' into dev/zhangxc1

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

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

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

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

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

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

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

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

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

    修改诊断搜索参数

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

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

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

    只有标点符号时不搜索

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

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

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

    Merge branch 'dev/new1' into dev/byll

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

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

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

    药品说明书鼠标指向方式

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

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

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

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

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

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

    修改版本信息字体大小

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

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

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

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

    搜索为空清除列表数据

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

    输入框添加行高

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

    Merge branch 'dev/new1' into dev/zhangxc1

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

    删除console

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

    提示信息详情页弹窗显示

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

    化验没有参考值正常显示

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

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

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

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

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

    回读无查体点击唤出模板

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

    切换模式其他史数据bug

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

    血压类文本子标签存值

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

    清除移除患者信息缓存

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

    翠翠分支未合单独添加

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

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

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

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

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

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

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

    弹窗关闭时机

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

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

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

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

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

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

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

    Merge branch 'dev/byll' into dev/new1

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

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

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

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

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

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

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

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

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

    Merge branch 'dev/new1' into dev/zhangxc1

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

    上次提交回退

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

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

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

    删除多余代码

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

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

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

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

    ie8右浮动不生效

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

    免责声明弹窗层级bug修改

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

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

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

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

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

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

    11

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

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

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

    弹窗层级修改

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

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

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

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

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

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

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

    无殊选中状态遗留bug修改

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

    打印相关样式修改ie待测

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

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

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

    杂音类型下拉样式优化

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

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

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

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

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

    修改标题点击enter问题

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

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

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

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

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

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

    字体不一样，button问题

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

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

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

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

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

    双击编辑前后缀bug修改

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

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

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

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

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

    修改ie8多[]bug

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

    Merge branch 'dev/new1' into dev/byll

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

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

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

    打印保存判断问题

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

    写死参数更改

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

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

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

    查体框可编辑状态删除

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

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

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

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

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

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

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

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

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

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

    搜索bug修改

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

    11

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

    Merge branch 'dev/new1' into dev/zhangxc1

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

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

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

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

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

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

    # Conflicts:
    #	src/containers/OtherHistory.js

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

    之前修改的bug找回

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

    修改同类药物样式

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

    改为全局弹窗显示

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

    修改添加诊断推送

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

    弹窗高度动态设置

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

    无选中项体温输入bug修改

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

    Merge branch 'dev/new1' into dev/byll

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

    bug修改

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

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

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

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

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

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

     删除console

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

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

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

    合并

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

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

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

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

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

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

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

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

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

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

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

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

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

    更新

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

    其他史有伴无排序

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

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

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

    复诊主诉文本模式bug

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

    Merge branch 'dev/new1' into dev/otherHis

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

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

    双击隐藏下拉

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

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

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

    修改版本信息样式

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

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

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

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

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

    滚动兼容

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

    现病史病程变化

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

    注释scrollTo

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

    Squashed commit of the following:

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

        打印医生签名自动获取

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

        样式调整

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

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

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

        模板列表获取时机

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

        模板名称重复弹窗不关闭

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

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

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

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

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

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

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

        bug修改

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

        还是符号处理...

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

        顿号去重

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

        Merge branch 'dev/new1' into dev/byll

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

        样式宽度更改和逗号处理

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

        date修改

    # Conflicts:
    #	src/utils/tools.js

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

    Squashed commit of the following:

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

        治疗方案样式

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

        修改治疗方案样式

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

        修改治疗方案小标题样式

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

        修改治疗方案同类药物

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

        修改弹窗IE8不居中

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

        治疗方案高度自适应

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

        修改治疗方案边框

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

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

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

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

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

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

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

        ie8治疗方案遮罩

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

        治疗方案遮罩IE8

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

        修改右侧推送字体大小

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

        修改化验项开单逗号问题

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

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

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

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

    Squashed commit of the following:

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

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

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

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

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

            Squashed commit of the following:

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

                顿号去重

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

                Merge branch 'dev/new1' into dev/byll

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

                样式宽度更改和逗号处理

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

                date修改

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

            Squashed commit of the following:

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

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

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

                ie8治疗方案遮罩

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

                治疗方案遮罩IE8

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

                修改右侧推送字体大小

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

                修改化验项开单逗号问题

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

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

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

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

            Squashed commit of the following:

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

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

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

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

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

                    Squashed commit of the following:

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

                        date修改

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

                    Squashed commit of the following:

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

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

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

                    Squashed commit of the following:

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

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

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

                        Squashed commit of the following:

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

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

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

                            化验辅捡ie8搜索卡死修改

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

                            默认host地址删除

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

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

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

                            修改样式

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

                            合并报错修改

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

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

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

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

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

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

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

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

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

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

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

                            中英文逗号

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

                            去掉英文逗号

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

                            修改治疗方案

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

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

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

                            药品说明书样式

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

                            修改药品说明书

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

                            修改开单样式

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

                            修改获取患者信息路径

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

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

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

                            merge from 'dev/zxc'

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

                            提示语

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

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

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

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

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

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

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

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

                            治疗方案置灰

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

                            治疗方案

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

                            Merge branch 'dev/new' into dev/zhangxc

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

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

                            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

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

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

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

                            Revert "修改药品说明样式"

                            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

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

                            搜索列表显示样式更改

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

                            样式调整

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

                            修改导入host

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

                            临时修改版本弹窗高度

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

                            化验导入删除填值推送

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

                            添加删除辅捡右侧推送

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

                            修改杂音选中项bug

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

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

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

                            既往史无殊选中bug

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

                            css

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

                            合罗磊分支

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

                            回退

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

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

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

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

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

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

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

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

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

                            既往史下拉滚动条添加

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

                            修改请求地址

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

                            辅检横向滚动

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

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

                            # Conflicts:
                            #	src/utils/config.js

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

                            去掉一个字

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

                            bug

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

                            其他史高血压选中bug修改

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

                            删除项有问题

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

                            Merge branch 'dev/liucf' into dev/luolei

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

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

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

                            日期bug

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

                            请求地址修改-刚才反了

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

                            请求地址修改

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

                            打印图标

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

                            其他史高血压数据展开

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

                            查体type修改

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

                            查体type修改

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

                            Merge branch 'dev/new' into dev/luolei

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

                            搜索弹窗被遮挡问题解决

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

                            地址临时修改

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

                            版本信息弹窗高度限制

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

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

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

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

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

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

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

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

                            层级问题

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

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

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

                            11

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

                            修改请求地址

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

                            修改请求地址

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

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

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

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

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

                            遮罩统一0.6透明度

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

                            透明度ie8

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

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

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

                            merge from 'lcf'

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

                            修改药品说明样式

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

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

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

                            导入ie8暂时先灰掉

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

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

                            # Conflicts:
                            #	src/utils/config.js

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

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

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

                            修改开单项到医嘱逗号

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

                            合并后报错处理

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

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

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

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

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

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

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

                            ie8的onInput代替函数

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

                            init

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

                            updata pro

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

                            test

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

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

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

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

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

                    化验辅捡ie8搜索卡死修改

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

                    默认host地址删除

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

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

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

                    修改样式

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

                    合并报错修改

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

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

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

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

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

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

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

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

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

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

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

                    中英文逗号

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

                    去掉英文逗号

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

                    修改治疗方案

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

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

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

                    药品说明书样式

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

                    修改药品说明书

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

                    修改开单样式

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

                    修改获取患者信息路径

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

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

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

                    merge from 'dev/zxc'

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

                    提示语

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

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

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

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

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

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

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

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

                    治疗方案置灰

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

                    治疗方案

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

                    Merge branch 'dev/new' into dev/zhangxc

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

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

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

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

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

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

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

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

                    搜索列表显示样式更改

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

                    样式调整

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

                    修改导入host

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

                    临时修改版本弹窗高度

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

                    化验导入删除填值推送

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

                    添加删除辅捡右侧推送

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

                    修改杂音选中项bug

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

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

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

                    既往史无殊选中bug

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

                    css

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

                    合罗磊分支

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

                    回退

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

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

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

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

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

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

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

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

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

                    既往史下拉滚动条添加

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

                    修改请求地址

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

                    辅检横向滚动

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

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

                    # Conflicts:
                    #	src/utils/config.js

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

                    去掉一个字

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

                    bug

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

                    其他史高血压选中bug修改

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

                    删除项有问题

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

                    Merge branch 'dev/liucf' into dev/luolei

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

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

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

                    日期bug

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

                    请求地址修改-刚才反了

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

                    请求地址修改

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

                    打印图标

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

                    其他史高血压数据展开

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

                    查体type修改

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

                    查体type修改

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

                    Merge branch 'dev/new' into dev/luolei

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

                    搜索弹窗被遮挡问题解决

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

                    地址临时修改

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

                    版本信息弹窗高度限制

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

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

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

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

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

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

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

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

                    层级问题

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

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

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

                    11

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

                    修改请求地址

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

                    修改请求地址

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

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

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

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

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

                    遮罩统一0.6透明度

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

                    透明度ie8

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

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

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

                    merge from 'lcf'

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

                    修改药品说明样式

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

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

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

                    导入ie8暂时先灰掉

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

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

                    # Conflicts:
                    #	src/utils/config.js

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

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

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

                    修改开单项到医嘱逗号

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

                    合并后报错处理

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

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

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

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

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

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

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

                    ie8的onInput代替函数

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

                    init

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

                    updata pro

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

                    test

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

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

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

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

                Squashed commit of the following:

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

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

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

                    化验辅捡ie8搜索卡死修改

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

                    默认host地址删除

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

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

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

                    修改样式

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

                    合并报错修改

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

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

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

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

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

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

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

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

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

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

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

                    中英文逗号

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

                    去掉英文逗号

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

                    修改治疗方案

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

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

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

                    药品说明书样式

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

                    修改药品说明书

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

                    修改开单样式

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

                    修改获取患者信息路径

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

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

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

                    merge from 'dev/zxc'

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

                    提示语

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

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

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

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

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

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

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

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

                    治疗方案置灰

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

                    治疗方案

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

                    Merge branch 'dev/new' into dev/zhangxc

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

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

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

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

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

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

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

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

                    搜索列表显示样式更改

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

                    样式调整

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

                    修改导入host

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

                    临时修改版本弹窗高度

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

                    化验导入删除填值推送

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

                    添加删除辅捡右侧推送

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

                    修改杂音选中项bug

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

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

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

                    既往史无殊选中bug

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

                    css

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

                    合罗磊分支

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

                    回退

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

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

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

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

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

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

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

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

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

                    既往史下拉滚动条添加

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

                    修改请求地址

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

                    辅检横向滚动

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

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

                    # Conflicts:
                    #	src/utils/config.js

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

                    去掉一个字

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

                    bug

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

                    其他史高血压选中bug修改

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

                    删除项有问题

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

                    Merge branch 'dev/liucf' into dev/luolei

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

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

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

                    日期bug

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

                    请求地址修改-刚才反了

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

                    请求地址修改

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

                    打印图标

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

                    其他史高血压数据展开

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

                    查体type修改

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

                    查体type修改

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

                    Merge branch 'dev/new' into dev/luolei

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

                    搜索弹窗被遮挡问题解决

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

                    地址临时修改

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

                    版本信息弹窗高度限制

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

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

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

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

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

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

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

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

                    层级问题

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

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

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

                    11

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

                    修改请求地址

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

                    修改请求地址

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

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

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

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

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

                    遮罩统一0.6透明度

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

                    透明度ie8

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

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

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

                    merge from 'lcf'

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

                    修改药品说明样式

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

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

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

                    导入ie8暂时先灰掉

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

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

                    # Conflicts:
                    #	src/utils/config.js

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

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

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

                    修改开单项到医嘱逗号

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

                    合并后报错处理

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

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

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

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

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

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

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

                    ie8的onInput代替函数

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

                    init

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

                    updata pro

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

                    test

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

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

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

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

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

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

            Squashed commit of the following:

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

                date修改

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

            Squashed commit of the following:

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

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

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

            Squashed commit of the following:

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

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

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

                Squashed commit of the following:

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

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

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

                    化验辅捡ie8搜索卡死修改

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

                    默认host地址删除

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

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

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

                    修改样式

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

                    合并报错修改

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

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

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

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

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

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

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

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

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

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

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

                    中英文逗号

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

                    去掉英文逗号

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

                    修改治疗方案

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

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

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

                    药品说明书样式

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

                    修改药品说明书

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

                    修改开单样式

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

                    修改获取患者信息路径

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

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

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

                    merge from 'dev/zxc'

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

                    提示语

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

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

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

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

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

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

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

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

                    治疗方案置灰

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

                    治疗方案

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

                    Merge branch 'dev/new' into dev/zhangxc

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

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

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

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

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

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

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

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

                    搜索列表显示样式更改

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

                    样式调整

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

                    修改导入host

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

                    临时修改版本弹窗高度

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

                    化验导入删除填值推送

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

                    添加删除辅捡右侧推送

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

                    修改杂音选中项bug

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

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

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

                    既往史无殊选中bug

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

                    css

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

                    合罗磊分支

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

                    回退

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

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

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

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

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

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

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

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

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

                    既往史下拉滚动条添加

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

                    修改请求地址

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

                    辅检横向滚动

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

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

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/new' into dev/new

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

                    Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/components/MainSuit/index.jsx

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/containers/SpreadDrop.js

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            # Conflicts:
            #	src/store/async-actions/treat.js

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

            Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/AddAssistCheck/index.jsx

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/new' into dev/new

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

            Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/components/MainSuit/index.jsx

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

        # Conflicts:
        #	src/components/PushItems/index.jsx
        #	src/utils/tools.js

    commit 519f23c91954f87e836cbd400b158f774c498ba6
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 15:35:59 2019 +0800

        文本删除又出现的问题
        Squashed commit of the following:

        commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 11:44:56 2019 +0800

            NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

        commit eec53100dcee36be4a80af88e65a5b9772f71f4d
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:41:03 2019 +0800

            Squashed commit of the following:

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:38:40 2019 +0800

            Squashed commit of the following:

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

        commit e36f2f1b811d6978117161f50b16dd5bae298547
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:33:30 2019 +0800

            Squashed commit of the following:

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/containers/SpreadDrop.js

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                    # Conflicts:
                    #	src/store/async-actions/treat.js

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

                    Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/components/AddAssistCheck/index.jsx

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/new' into dev/new

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

                    Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/components/MainSuit/index.jsx

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/containers/SpreadDrop.js

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            # Conflicts:
            #	src/store/async-actions/treat.js

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

            Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/AddAssistCheck/index.jsx

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/new' into dev/new

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

            Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/components/MainSuit/index.jsx

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

        # Conflicts:
        #	src/components/AddInspect/index.jsx
        #	src/components/Inspect/index.jsx
        #	src/components/PushItems/index.less
        #	src/store/actions/checkBody.js
        #	src/store/actions/currentIll.js
        #	src/store/actions/mainSuit.js
        #	src/store/actions/otherHistory.js

    commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 15:59:14 2019 +0800

        单选、多选、时间单位组件双击编辑删除完内容时删除该标签

    commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 14:21:41 2019 +0800

        Squashed commit of the following:

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/containers/SpreadDrop.js

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            # Conflicts:
            #	src/store/async-actions/treat.js

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

            Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/AddAssistCheck/index.jsx

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/new' into dev/new

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

            Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/components/MainSuit/index.jsx

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

    commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 13:13:11 2019 +0800

        单选和多选编辑失焦时调用推送接口

    # Conflicts:
    #	src/containers/NumberUnitDrop.js
    #	src/store/actions/checkBody.js

commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 30 16:00:51 2019 +0800

    打印医生签名自动获取

commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Jan 30 15:20:06 2019 +0800

    治疗方案样式

commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Jan 30 15:18:20 2019 +0800

    修改治疗方案样式

commit 859a7364a96569f6aa92360efbce5a19b40681cb
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Jan 30 14:32:44 2019 +0800

    修改治疗方案小标题样式

commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 30 14:09:41 2019 +0800

    样式调整

commit 99789b23f06c18e5b588552066faf7f2ccacf198
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Jan 30 14:07:48 2019 +0800

    修改治疗方案同类药物

commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 30 14:02:27 2019 +0800

    化验填写单清空按钮，弹窗还在

commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Wed Jan 30 14:00:40 2019 +0800

    修改弹窗IE8不居中

commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 30 13:46:36 2019 +0800

    模板列表获取时机

commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 30 13:34:03 2019 +0800

    模板名称重复弹窗不关闭

commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 30 10:46:13 2019 +0800

    模板保存跟之前所有保存的模板作对比

commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 20:30:39 2019 +0800

    治疗方案高度自适应

commit 3e1c705ef6c2b2d0944ced37b8fa3f7c01307e25
Author: liucf <liucf@zjlantone.com>
Date:   Tue Jan 29 18:20:27 2019 +0800

    Squashed commit of the following:

    commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 18:17:15 2019 +0800

        查体模板添加逗号，主诉两个时间处理
        Squashed commit of the following:

        commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:51:09 2019 +0800

            Squashed commit of the following:

            commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 14:17:40 2019 +0800

                顿号去重

            commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
            Merge: 4095b3f b09559b
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:59:54 2019 +0800

                Merge branch 'dev/new1' into dev/byll

            commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
            Author: Luolei <16657115156@163.com>
            Date:   Tue Jan 29 13:55:47 2019 +0800

                样式宽度更改和逗号处理

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit fea9a721ccb5afb9f1873c2111e3722d7330d394
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:50:07 2019 +0800

            Squashed commit of the following:

            commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 15:22:37 2019 +0800

                修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串

            commit 799eef5c34a21f9d90bc82a40240838cf10ba601
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:41:20 2019 +0800

                ie8治疗方案遮罩

            commit fee35d5473b69aafb5335759006a93fea8d14145
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:05:16 2019 +0800

                治疗方案遮罩IE8

            commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 14:04:58 2019 +0800

                修改右侧推送字体大小

            commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Jan 29 13:26:56 2019 +0800

                修改化验项开单逗号问题

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

            # Conflicts:
            #	src/components/PushItems/index.jsx

        commit 2c70e41e7a5254838436b499b1ad787f523585f8
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 15:42:54 2019 +0800

            Squashed commit of the following:

            commit 519f23c91954f87e836cbd400b158f774c498ba6
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Jan 29 15:35:59 2019 +0800

                文本删除又出现的问题
                Squashed commit of the following:

                commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
                Author: liucf <liucf@zjlantone.com>
                Date:   Tue Jan 29 11:44:56 2019 +0800

                    NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

                commit eec53100dcee36be4a80af88e65a5b9772f71f4d
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Jan 28 10:41:03 2019 +0800

                    Squashed commit of the following:

                    commit 79e0195a9b13069db729afe732bc5b466d43a37f
                    Author: Luolei <16657115156@163.com>
                    Date:   Fri Jan 25 14:06:09 2019 +0800

                        date修改

                commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Jan 28 10:38:40 2019 +0800

                    Squashed commit of the following:

                    commit 29b2499b796085a682a936d82c97decc35edf891
                    Author: zhangxc <zhangxc@zjlantone.com>
                    Date:   Fri Jan 25 13:50:07 2019 +0800

                        修改版本信息和免责声明位置

                commit e36f2f1b811d6978117161f50b16dd5bae298547
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Jan 28 10:33:30 2019 +0800

                    Squashed commit of the following:

                    commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Fri Jan 25 15:59:14 2019 +0800

                        单选、多选、时间单位组件双击编辑删除完内容时删除该标签

                    commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Fri Jan 25 14:21:41 2019 +0800

                        Squashed commit of the following:

                        commit d3e160a516240b77576567b993223816a68231a6
                        Merge: 79e63ed c7e9e73
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 13:46:48 2019 +0800

                            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 13:46:16 2019 +0800

                            化验辅捡ie8搜索卡死修改

                        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 13:12:43 2019 +0800

                            默认host地址删除

                        commit e01035349f92405572238a0a97d80bb557dda802
                        Merge: 8a8015d caad36f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 11:45:20 2019 +0800

                            Merge remote-tracking branch 'origin/IE_test' into dev/new1

                        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 10:59:52 2019 +0800

                            修改样式

                        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 09:46:01 2019 +0800

                            合并报错修改

                        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                        Merge: bbe85ff 58e0fdd
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Fri Jan 25 09:42:51 2019 +0800

                            Merge remote-tracking branch 'origin/IE_test' into dev/new1

                        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                        Merge: b86268a 3bfa819
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 20:30:05 2019 +0800

                            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                            # Conflicts:
                            #	src/common/components/EditableSpan/index.jsx
                            #	src/containers/SpreadDrop.js

                        commit b86268a57afae26c7972b4b2362ae656a6784a8d
                        Merge: 79c59d3 105488f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 20:25:44 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                            # Conflicts:
                            #	src/store/async-actions/treat.js

                        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                        Merge: db90e04 de190a5
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 20:24:40 2019 +0800

                            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 20:18:42 2019 +0800

                            中英文逗号

                        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 18:31:55 2019 +0800

                            去掉英文逗号

                        commit 105488feef9e89309ecc23f2c9bce944da3490fb
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 17:22:34 2019 +0800

                            修改治疗方案

                        commit db90e04f23baf95466e34498ca06101f49a7ac7e
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 16:49:10 2019 +0800

                            下拉项间距调整，ie8事件兼容

                        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:09:49 2019 +0800

                            药品说明书样式

                        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:08:17 2019 +0800

                            修改药品说明书

                        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:06:17 2019 +0800

                            修改开单样式

                        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 14:02:30 2019 +0800

                            修改获取患者信息路径

                        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 13:43:38 2019 +0800

                            添加诊断判断有没有治疗方案

                        commit f617e5c267246786e7a6801cc87811f0d2527235
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 13:39:13 2019 +0800

                            merge from 'dev/zxc'

                        commit 87e941c29ed951540497c18c0a493c55b222ce00
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 10:33:44 2019 +0800

                            提示语

                        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                        Merge: d3ade00 95e9a94
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 10:09:57 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                            # Conflicts:
                            #	src/components/DiagnosticList/index.jsx
                            #	src/components/Operation/index.jsx
                            #	src/containers/SpreadDrop.js
                            #	src/store/actions/otherHistory.js
                            #	src/store/async-actions/treat.js
                            #	src/store/types/checkBody.js

                        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                        Merge: 2fd497e 2458ea1
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 10:05:17 2019 +0800

                            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 10:03:28 2019 +0800

                            提示语消失默认时间改为2秒

                        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 10:02:00 2019 +0800

                            治疗方案置灰

                        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:59:16 2019 +0800

                            治疗方案

                        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                        Merge: 62bd7fb 38f9720
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:47:47 2019 +0800

                            Merge branch 'dev/new' into dev/zhangxc

                        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:46:32 2019 +0800

                            Revert "Revert "修改药品说明样式""

                            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                        Merge: 28c364a c37d1cc
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Thu Jan 24 09:46:00 2019 +0800

                            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                        commit 1cba16137b012f54873b193ab6b16968022d0c96
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Thu Jan 24 09:45:29 2019 +0800

                            Revert "修改药品说明样式"

                            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 09:25:58 2019 +0800

                            搜索列表显示样式更改

                        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                        Author: Luolei <16657115156@163.com>
                        Date:   Thu Jan 24 09:15:40 2019 +0800

                            样式调整

                        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 21:22:29 2019 +0800

                            修改导入host

                        commit f75c649c857013b890959fa7e1d3992912ddd1ca
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 21:15:44 2019 +0800

                            临时修改版本弹窗高度

                        commit e0376902fb956ee58c40b86ae97b924ce5955e75
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 21:10:27 2019 +0800

                            化验导入删除填值推送

                        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 20:43:48 2019 +0800

                            添加删除辅捡右侧推送

                        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 20:30:50 2019 +0800

                            修改杂音选中项bug

                        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                        Merge: b489e52 6a1a3df
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 18:58:07 2019 +0800

                            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 18:57:50 2019 +0800

                            既往史无殊选中bug

                        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 18:57:03 2019 +0800

                            css

                        commit 96efc7b8118a99db629f898960621b98786bd42e
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 18:26:40 2019 +0800

                            合罗磊分支

                        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:49:02 2019 +0800

                            回退

                        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                        Merge: 6732dbb 1dd6c92
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:44:02 2019 +0800

                            Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                            # Conflicts:
                            #	src/common/components/TailInlineTag/index.less
                            #	src/common/components/Textarea/index.jsx
                            #	src/components/AddAssistCheck/index.jsx
                            #	src/containers/OtherHistory.js
                            #	src/store/actions/otherHistory.js

                        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                        Merge: bc168f8 abd1267
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:36:50 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                            # Conflicts:
                            #	src/common/components/EditableSpan/index.jsx
                            #	src/components/AddAssistCheck/index.jsx

                        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                        Merge: 3559798 6d55c59
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:34:30 2019 +0800

                            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                        commit 3559798c04e69583c1f05fc9125c812a9933892f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:31:13 2019 +0800

                            既往史下拉滚动条添加

                        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 17:22:01 2019 +0800

                            修改请求地址

                        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 17:16:22 2019 +0800

                            辅检横向滚动

                        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                        Merge: adc853a 45b1158
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 16:53:11 2019 +0800

                            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                            # Conflicts:
                            #	src/utils/config.js

                        commit cf97be2f425bdef386a137e92929969c321ab047
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 16:08:25 2019 +0800

                            去掉一个字

                        commit 1a8521d3c3019063a3124a142e3241f84b43c409
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 16:01:26 2019 +0800

                            bug

                        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 15:58:40 2019 +0800

                            其他史高血压选中bug修改

                        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 15:16:32 2019 +0800

                            删除项有问题

                        commit ac64b868290f94c0a30e3242110a38cda67249eb
                        Merge: d2eca9d 1a6bf74
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 14:59:26 2019 +0800

                            Merge branch 'dev/liucf' into dev/luolei

                        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 14:51:07 2019 +0800

                            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 14:43:46 2019 +0800

                            日期bug

                        commit 38f972082b4a6b58e73f17d4d15302045cd48981
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 13:46:29 2019 +0800

                            请求地址修改-刚才反了

                        commit 70e9420d59b745c59f3abe04c33100777184d024
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 13:44:13 2019 +0800

                            请求地址修改

                        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 13:39:05 2019 +0800

                            打印图标

                        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 11:31:48 2019 +0800

                            其他史高血压数据展开

                        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 11:00:06 2019 +0800

                            查体type修改

                        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:58:27 2019 +0800

                            查体type修改

                        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                        Merge: 4b8aa34 540b6a8
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 10:51:52 2019 +0800

                            Merge branch 'dev/new' into dev/luolei

                        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                        Author: Luolei <16657115156@163.com>
                        Date:   Wed Jan 23 10:47:15 2019 +0800

                            搜索弹窗被遮挡问题解决

                        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:23:04 2019 +0800

                            地址临时修改

                        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:20:05 2019 +0800

                            版本信息弹窗高度限制

                        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 10:13:40 2019 +0800

                            推送接口主诉现病史合并，治疗方案容错

                        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                        Merge: 4a897b4 5a39d90
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:57:50 2019 +0800

                            Merge remote-tracking branch 'origin/dev/new' into dev/new

                        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                        Merge: 7f1c7c8 abd1267
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:57:43 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            # Conflicts:
                            #	src/common/components/ItemBox/index.jsx
                            #	src/components/AddInspect/index.jsx
                            #	src/components/Diagnosis/index.jsx
                            #	src/components/Diagnosis/index.less

                        commit 5a39d90dd616740bce7e833646a455b713f5e579
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Wed Jan 23 09:52:01 2019 +0800

                            层级问题

                        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                        Merge: e5d0122 7f1c7c8
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Wed Jan 23 09:43:34 2019 +0800

                            Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                        commit e5d0122382957b2f9157a83b72adfb651b355f96
                        Author: liucf <liucf@zjlantone.com>
                        Date:   Wed Jan 23 09:43:21 2019 +0800

                            11

                        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:39:50 2019 +0800

                            修改请求地址

                        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:38:05 2019 +0800

                            修改请求地址

                        commit b14968d42d5ed583714b5941365dc97fe24ea61b
                        Merge: df67559 a82d18c
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:26:50 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                        commit df67559cc42c79c6ed6b27254ce12178918e32b0
                        Merge: ff817bf 6805811
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Wed Jan 23 09:26:39 2019 +0800

                            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        commit 68058110e041e72b8c95979a4fd23e690912746b
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 20:43:26 2019 +0800

                            遮罩统一0.6透明度

                        commit 625ca181024a268f16f32eb2773ea337cf62db43
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 20:34:59 2019 +0800

                            透明度ie8

                        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 20:24:39 2019 +0800

                            修改治疗方案无内容按钮置灰

                        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                        Merge: 9c0e078 84ec971
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 20:09:22 2019 +0800

                            merge from 'lcf'

                        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 19:01:31 2019 +0800

                            修改药品说明样式

                        commit ff817bf6d6d928b98557371362374859bec3aabd
                        Merge: d50ffe0 b2e679a
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:52:34 2019 +0800

                            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                        commit b2e679a35e0ff4831f689758eb14521541f967e2
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:50:45 2019 +0800

                            导入ie8暂时先灰掉

                        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                        Merge: 573f0b5 b286d0a
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:25:09 2019 +0800

                            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                            # Conflicts:
                            #	src/utils/config.js

                        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 16:23:57 2019 +0800

                            文本模式ie8onInput存值，搜索下拉项样式

                        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 15:30:07 2019 +0800

                            修改开单项到医嘱逗号

                        commit 573f0b59ff517de16f94296240572544e31c9f46
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:23:46 2019 +0800

                            合并后报错处理

                        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                        Merge: 55d15d6 fbab9de
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:18:22 2019 +0800

                            Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                            # Conflicts:
                            #	src/components/CurrentIll/index.jsx
                            #	src/containers/EditableSpan.js
                            #	src/store/actions/currentIll.js
                            #	src/store/reducers/checkBody.js
                            #	src/utils/ajax.js
                            #	src/utils/config.js

                        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                        Merge: 2d40e6e ad68815
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:10:38 2019 +0800

                            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                            # Conflicts:
                            #	src/components/MainSuit/index.jsx

                        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                        Author: zhouna <zhouna@zjlantone.com>
                        Date:   Tue Jan 22 15:02:18 2019 +0800

                            ie8的onInput代替函数

                        commit ad688156064254d6b615284642882ba5486ff764
                        Author: zhangxc <zhangxc@zjlantone.com>
                        Date:   Tue Jan 22 10:29:36 2019 +0800

                            init

                        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 22 10:13:57 2019 +0800

                            updata pro

                        commit 26649f42178c7177ee34dae46038ce2370bf5b26
                        Author: Luolei <16657115156@163.com>
                        Date:   Tue Jan 22 10:12:21 2019 +0800

                            test

                    commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
                    Author: liucf <liucf@zjlantone.com>
                    Date:   Fri Jan 25 13:13:11 2019 +0800

                        单选和多选编辑失焦时调用推送接口

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/containers/SpreadDrop.js

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                    # Conflicts:
                    #	src/store/async-actions/treat.js

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

                    Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/components/AddAssistCheck/index.jsx

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/new' into dev/new

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

                    Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/components/MainSuit/index.jsx

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

                # Conflicts:
                #	src/components/AddInspect/index.jsx
                #	src/components/Inspect/index.jsx
                #	src/components/PushItems/index.less
                #	src/store/actions/checkBody.js
                #	src/store/actions/currentIll.js
                #	src/store/actions/mainSuit.js
                #	src/store/actions/otherHistory.js

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/containers/SpreadDrop.js

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                    # Conflicts:
                    #	src/store/async-actions/treat.js

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

                    Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/components/AddAssistCheck/index.jsx

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/new' into dev/new

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

                    Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/components/MainSuit/index.jsx

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/NumberDrop/index.jsx
            #	src/components/NumberUnitDrop/index.jsx
            #	src/store/actions/mainSuit.js

        commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 11:44:56 2019 +0800

            NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

        commit eec53100dcee36be4a80af88e65a5b9772f71f4d
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:41:03 2019 +0800

            Squashed commit of the following:

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:38:40 2019 +0800

            Squashed commit of the following:

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

        commit e36f2f1b811d6978117161f50b16dd5bae298547
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:33:30 2019 +0800

            Squashed commit of the following:

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/containers/SpreadDrop.js

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                    # Conflicts:
                    #	src/store/async-actions/treat.js

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

                    Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/components/AddAssistCheck/index.jsx

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/new' into dev/new

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

                    Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/components/MainSuit/index.jsx

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/containers/SpreadDrop.js

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            # Conflicts:
            #	src/store/async-actions/treat.js

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

            Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/AddAssistCheck/index.jsx

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/new' into dev/new

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

            Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/components/MainSuit/index.jsx

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

        # Conflicts:
        #	src/components/PushItems/index.jsx
        #	src/utils/tools.js

    commit 519f23c91954f87e836cbd400b158f774c498ba6
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 15:35:59 2019 +0800

        文本删除又出现的问题
        Squashed commit of the following:

        commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 11:44:56 2019 +0800

            NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

        commit eec53100dcee36be4a80af88e65a5b9772f71f4d
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:41:03 2019 +0800

            Squashed commit of the following:

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:38:40 2019 +0800

            Squashed commit of the following:

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

        commit e36f2f1b811d6978117161f50b16dd5bae298547
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:33:30 2019 +0800

            Squashed commit of the following:

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/containers/SpreadDrop.js

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                    # Conflicts:
                    #	src/store/async-actions/treat.js

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

                    Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/components/AddAssistCheck/index.jsx

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/new' into dev/new

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

                    Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/components/MainSuit/index.jsx

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/containers/SpreadDrop.js

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            # Conflicts:
            #	src/store/async-actions/treat.js

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

            Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/AddAssistCheck/index.jsx

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/new' into dev/new

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

            Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/components/MainSuit/index.jsx

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

        # Conflicts:
        #	src/components/AddInspect/index.jsx
        #	src/components/Inspect/index.jsx
        #	src/components/PushItems/index.less
        #	src/store/actions/checkBody.js
        #	src/store/actions/currentIll.js
        #	src/store/actions/mainSuit.js
        #	src/store/actions/otherHistory.js

    commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 15:59:14 2019 +0800

        单选、多选、时间单位组件双击编辑删除完内容时删除该标签

    commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 14:21:41 2019 +0800

        Squashed commit of the following:

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/containers/SpreadDrop.js

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            # Conflicts:
            #	src/store/async-actions/treat.js

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

            Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/AddAssistCheck/index.jsx

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/new' into dev/new

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

            Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/components/MainSuit/index.jsx

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

    commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 13:13:11 2019 +0800

        单选和多选编辑失焦时调用推送接口

commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 17:35:01 2019 +0800

    底部几个按钮换行设置最小宽度

commit 7400613a1eb642e1d01004c7818883fd73c2350c
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 17:28:45 2019 +0800

    历史病例时间和按钮不能共存

commit c000d83fb6ac5f265951c0e1377b627d24d2da10
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 17:27:30 2019 +0800

    修改治疗方案边框

commit eda3f4b08a3460360541cd2af1c2ca071681c595
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 17:12:47 2019 +0800

    bug修改

commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 15:54:49 2019 +0800

    还是符号处理...

commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 15:58:28 2019 +0800

    导入化验结果，第一次添加诊断为主诉时不往主诉添加字符串

commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 15:56:03 2019 +0800

    治疗方案标题添加疾病名称

commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
Author: liucf <liucf@zjlantone.com>
Date:   Tue Jan 29 15:51:09 2019 +0800

    Squashed commit of the following:

    commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 14:17:40 2019 +0800

        顿号去重

    commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
    Merge: 4095b3f b09559b
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 13:59:54 2019 +0800

        Merge branch 'dev/new1' into dev/byll

    commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 29 13:55:47 2019 +0800

        样式宽度更改和逗号处理

    commit 79e0195a9b13069db729afe732bc5b466d43a37f
    Author: Luolei <16657115156@163.com>
    Date:   Fri Jan 25 14:06:09 2019 +0800

        date修改

commit fea9a721ccb5afb9f1873c2111e3722d7330d394
Author: liucf <liucf@zjlantone.com>
Date:   Tue Jan 29 15:50:07 2019 +0800

    Squashed commit of the following:

    commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 15:22:37 2019 +0800

        修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串

    commit 799eef5c34a21f9d90bc82a40240838cf10ba601
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:41:20 2019 +0800

        ie8治疗方案遮罩

    commit fee35d5473b69aafb5335759006a93fea8d14145
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:05:16 2019 +0800

        治疗方案遮罩IE8

    commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 14:04:58 2019 +0800

        修改右侧推送字体大小

    commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 29 13:26:56 2019 +0800

        修改化验项开单逗号问题

    commit 29b2499b796085a682a936d82c97decc35edf891
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Jan 25 13:50:07 2019 +0800

        修改版本信息和免责声明位置

    # Conflicts:
    #	src/components/PushItems/index.jsx

commit 2c70e41e7a5254838436b499b1ad787f523585f8
Author: liucf <liucf@zjlantone.com>
Date:   Tue Jan 29 15:42:54 2019 +0800

    Squashed commit of the following:

    commit 519f23c91954f87e836cbd400b158f774c498ba6
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jan 29 15:35:59 2019 +0800

        文本删除又出现的问题
        Squashed commit of the following:

        commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jan 29 11:44:56 2019 +0800

            NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

        commit eec53100dcee36be4a80af88e65a5b9772f71f4d
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:41:03 2019 +0800

            Squashed commit of the following:

            commit 79e0195a9b13069db729afe732bc5b466d43a37f
            Author: Luolei <16657115156@163.com>
            Date:   Fri Jan 25 14:06:09 2019 +0800

                date修改

        commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:38:40 2019 +0800

            Squashed commit of the following:

            commit 29b2499b796085a682a936d82c97decc35edf891
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Jan 25 13:50:07 2019 +0800

                修改版本信息和免责声明位置

        commit e36f2f1b811d6978117161f50b16dd5bae298547
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jan 28 10:33:30 2019 +0800

            Squashed commit of the following:

            commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 15:59:14 2019 +0800

                单选、多选、时间单位组件双击编辑删除完内容时删除该标签

            commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 14:21:41 2019 +0800

                Squashed commit of the following:

                commit d3e160a516240b77576567b993223816a68231a6
                Merge: 79e63ed c7e9e73
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:48 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:46:16 2019 +0800

                    化验辅捡ie8搜索卡死修改

                commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 13:12:43 2019 +0800

                    默认host地址删除

                commit e01035349f92405572238a0a97d80bb557dda802
                Merge: 8a8015d caad36f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 11:45:20 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 10:59:52 2019 +0800

                    修改样式

                commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:46:01 2019 +0800

                    合并报错修改

                commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
                Merge: bbe85ff 58e0fdd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Fri Jan 25 09:42:51 2019 +0800

                    Merge remote-tracking branch 'origin/IE_test' into dev/new1

                commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
                Merge: b86268a 3bfa819
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:30:05 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/containers/SpreadDrop.js

                commit b86268a57afae26c7972b4b2362ae656a6784a8d
                Merge: 79c59d3 105488f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:25:44 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

                    # Conflicts:
                    #	src/store/async-actions/treat.js

                commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
                Merge: db90e04 de190a5
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 20:24:40 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 20:18:42 2019 +0800

                    中英文逗号

                commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 18:31:55 2019 +0800

                    去掉英文逗号

                commit 105488feef9e89309ecc23f2c9bce944da3490fb
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 17:22:34 2019 +0800

                    修改治疗方案

                commit db90e04f23baf95466e34498ca06101f49a7ac7e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 16:49:10 2019 +0800

                    下拉项间距调整，ie8事件兼容

                commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:09:49 2019 +0800

                    药品说明书样式

                commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:08:17 2019 +0800

                    修改药品说明书

                commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:06:17 2019 +0800

                    修改开单样式

                commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 14:02:30 2019 +0800

                    修改获取患者信息路径

                commit 6f95c909024a0c09f7ae316f9809ff96373365e2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:43:38 2019 +0800

                    添加诊断判断有没有治疗方案

                commit f617e5c267246786e7a6801cc87811f0d2527235
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 13:39:13 2019 +0800

                    merge from 'dev/zxc'

                commit 87e941c29ed951540497c18c0a493c55b222ce00
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 10:33:44 2019 +0800

                    提示语

                commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
                Merge: d3ade00 95e9a94
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:09:57 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/components/DiagnosticList/index.jsx
                    #	src/components/Operation/index.jsx
                    #	src/containers/SpreadDrop.js
                    #	src/store/actions/otherHistory.js
                    #	src/store/async-actions/treat.js
                    #	src/store/types/checkBody.js

                commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
                Merge: 2fd497e 2458ea1
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:05:17 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 10:03:28 2019 +0800

                    提示语消失默认时间改为2秒

                commit 95e9a941766b9d5454f3c92fc614aa3321bce664
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 10:02:00 2019 +0800

                    治疗方案置灰

                commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:59:16 2019 +0800

                    治疗方案

                commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
                Merge: 62bd7fb 38f9720
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:47:47 2019 +0800

                    Merge branch 'dev/new' into dev/zhangxc

                commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:46:32 2019 +0800

                    Revert "Revert "修改药品说明样式""

                    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

                commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
                Merge: 28c364a c37d1cc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Thu Jan 24 09:46:00 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit 1cba16137b012f54873b193ab6b16968022d0c96
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Thu Jan 24 09:45:29 2019 +0800

                    Revert "修改药品说明样式"

                    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

                commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:25:58 2019 +0800

                    搜索列表显示样式更改

                commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
                Author: Luolei <16657115156@163.com>
                Date:   Thu Jan 24 09:15:40 2019 +0800

                    样式调整

                commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:22:29 2019 +0800

                    修改导入host

                commit f75c649c857013b890959fa7e1d3992912ddd1ca
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:15:44 2019 +0800

                    临时修改版本弹窗高度

                commit e0376902fb956ee58c40b86ae97b924ce5955e75
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 21:10:27 2019 +0800

                    化验导入删除填值推送

                commit 38d5d80ae62a8c393f4623f1774b756f078d6954
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:43:48 2019 +0800

                    添加删除辅捡右侧推送

                commit d54073a78ccc7697f333c3d8ecc98922f14dc669
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 20:30:50 2019 +0800

                    修改杂音选中项bug

                commit a7804f15d955022f912efa89cd3f0722bd5f02a3
                Merge: b489e52 6a1a3df
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:58:07 2019 +0800

                    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

                commit b489e5280cb7a214cf124116aea673ca2d4cefc3
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:57:50 2019 +0800

                    既往史无殊选中bug

                commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 18:57:03 2019 +0800

                    css

                commit 96efc7b8118a99db629f898960621b98786bd42e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 18:26:40 2019 +0800

                    合罗磊分支

                commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:49:02 2019 +0800

                    回退

                commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
                Merge: 6732dbb 1dd6c92
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:44:02 2019 +0800

                    Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

                    # Conflicts:
                    #	src/common/components/TailInlineTag/index.less
                    #	src/common/components/Textarea/index.jsx
                    #	src/components/AddAssistCheck/index.jsx
                    #	src/containers/OtherHistory.js
                    #	src/store/actions/otherHistory.js

                commit 6732dbb61763a7717a2055d932da17c54d2aa65a
                Merge: bc168f8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:36:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

                    # Conflicts:
                    #	src/common/components/EditableSpan/index.jsx
                    #	src/components/AddAssistCheck/index.jsx

                commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
                Merge: 3559798 6d55c59
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:34:30 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

                commit 3559798c04e69583c1f05fc9125c812a9933892f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:31:13 2019 +0800

                    既往史下拉滚动条添加

                commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 17:22:01 2019 +0800

                    修改请求地址

                commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 17:16:22 2019 +0800

                    辅检横向滚动

                commit 461e1db27e39068ca7126b0ad04e756c31f74d74
                Merge: adc853a 45b1158
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 16:53:11 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

                    # Conflicts:
                    #	src/utils/config.js

                commit cf97be2f425bdef386a137e92929969c321ab047
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:08:25 2019 +0800

                    去掉一个字

                commit 1a8521d3c3019063a3124a142e3241f84b43c409
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 16:01:26 2019 +0800

                    bug

                commit 45b1158b6f5a13eb0b02560087f3b936f6449089
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 15:58:40 2019 +0800

                    其他史高血压选中bug修改

                commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 15:16:32 2019 +0800

                    删除项有问题

                commit ac64b868290f94c0a30e3242110a38cda67249eb
                Merge: d2eca9d 1a6bf74
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:59:26 2019 +0800

                    Merge branch 'dev/liucf' into dev/luolei

                commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 14:51:07 2019 +0800

                    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

                commit d2eca9d801e445d624c6a5465319e6e1335dbd15
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 14:43:46 2019 +0800

                    日期bug

                commit 38f972082b4a6b58e73f17d4d15302045cd48981
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:46:29 2019 +0800

                    请求地址修改-刚才反了

                commit 70e9420d59b745c59f3abe04c33100777184d024
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:44:13 2019 +0800

                    请求地址修改

                commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 13:39:05 2019 +0800

                    打印图标

                commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:31:48 2019 +0800

                    其他史高血压数据展开

                commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 11:00:06 2019 +0800

                    查体type修改

                commit f163535cc31ed9efbccc673325ee32d043c9c5bf
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:58:27 2019 +0800

                    查体type修改

                commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
                Merge: 4b8aa34 540b6a8
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:51:52 2019 +0800

                    Merge branch 'dev/new' into dev/luolei

                commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
                Author: Luolei <16657115156@163.com>
                Date:   Wed Jan 23 10:47:15 2019 +0800

                    搜索弹窗被遮挡问题解决

                commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:23:04 2019 +0800

                    地址临时修改

                commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:20:05 2019 +0800

                    版本信息弹窗高度限制

                commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 10:13:40 2019 +0800

                    推送接口主诉现病史合并，治疗方案容错

                commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
                Merge: 4a897b4 5a39d90
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/new' into dev/new

                commit 4a897b473cda81f614a8fd820a6d480b98f9872d
                Merge: 7f1c7c8 abd1267
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:57:43 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/common/components/ItemBox/index.jsx
                    #	src/components/AddInspect/index.jsx
                    #	src/components/Diagnosis/index.jsx
                    #	src/components/Diagnosis/index.less

                commit 5a39d90dd616740bce7e833646a455b713f5e579
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:52:01 2019 +0800

                    层级问题

                commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
                Merge: e5d0122 7f1c7c8
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:34 2019 +0800

                    Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

                commit e5d0122382957b2f9157a83b72adfb651b355f96
                Author: liucf <liucf@zjlantone.com>
                Date:   Wed Jan 23 09:43:21 2019 +0800

                    11

                commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:39:50 2019 +0800

                    修改请求地址

                commit f14d699d86b98edde58a5739d5c81f538dd8bb18
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:38:05 2019 +0800

                    修改请求地址

                commit b14968d42d5ed583714b5941365dc97fe24ea61b
                Merge: df67559 a82d18c
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:50 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                commit df67559cc42c79c6ed6b27254ce12178918e32b0
                Merge: ff817bf 6805811
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Wed Jan 23 09:26:39 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit 68058110e041e72b8c95979a4fd23e690912746b
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:43:26 2019 +0800

                    遮罩统一0.6透明度

                commit 625ca181024a268f16f32eb2773ea337cf62db43
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 20:34:59 2019 +0800

                    透明度ie8

                commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:24:39 2019 +0800

                    修改治疗方案无内容按钮置灰

                commit c54c73fe39e5746c1e1f2b16924e259cc122620a
                Merge: 9c0e078 84ec971
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 20:09:22 2019 +0800

                    merge from 'lcf'

                commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 19:01:31 2019 +0800

                    修改药品说明样式

                commit ff817bf6d6d928b98557371362374859bec3aabd
                Merge: d50ffe0 b2e679a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:52:34 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                commit b2e679a35e0ff4831f689758eb14521541f967e2
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:50:45 2019 +0800

                    导入ie8暂时先灰掉

                commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
                Merge: 573f0b5 b286d0a
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:25:09 2019 +0800

                    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

                    # Conflicts:
                    #	src/utils/config.js

                commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 16:23:57 2019 +0800

                    文本模式ie8onInput存值，搜索下拉项样式

                commit a82d18cfa4a27bb855651ef9f6965844d891fab2
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 15:30:07 2019 +0800

                    修改开单项到医嘱逗号

                commit 573f0b59ff517de16f94296240572544e31c9f46
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:23:46 2019 +0800

                    合并后报错处理

                commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
                Merge: 55d15d6 fbab9de
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:18:22 2019 +0800

                    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

                    # Conflicts:
                    #	src/components/CurrentIll/index.jsx
                    #	src/containers/EditableSpan.js
                    #	src/store/actions/currentIll.js
                    #	src/store/reducers/checkBody.js
                    #	src/utils/ajax.js
                    #	src/utils/config.js

                commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
                Merge: 2d40e6e ad68815
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:10:38 2019 +0800

                    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

                    # Conflicts:
                    #	src/components/MainSuit/index.jsx

                commit 5e7834e1ff17257abdf408037031c0d926d22bfc
                Author: zhouna <zhouna@zjlantone.com>
                Date:   Tue Jan 22 15:02:18 2019 +0800

                    ie8的onInput代替函数

                commit ad688156064254d6b615284642882ba5486ff764
                Author: zhangxc <zhangxc@zjlantone.com>
                Date:   Tue Jan 22 10:29:36 2019 +0800

                    init

                commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:13:57 2019 +0800

                    updata pro

                commit 26649f42178c7177ee34dae46038ce2370bf5b26
                Author: Luolei <16657115156@163.com>
                Date:   Tue Jan 22 10:12:21 2019 +0800

                    test

            commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
            Author: liucf <liucf@zjlantone.com>
            Date:   Fri Jan 25 13:13:11 2019 +0800

                单选和多选编辑失焦时调用推送接口

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/containers/SpreadDrop.js

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            # Conflicts:
            #	src/store/async-actions/treat.js

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

            Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/AddAssistCheck/index.jsx

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/new' into dev/new

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

            Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/components/MainSuit/index.jsx

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

        # Conflicts:
        #	src/components/AddInspect/index.jsx
        #	src/components/Inspect/index.jsx
        #	src/components/PushItems/index.less
        #	src/store/actions/checkBody.js
        #	src/store/actions/currentIll.js
        #	src/store/actions/mainSuit.js
        #	src/store/actions/otherHistory.js

    commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 15:59:14 2019 +0800

        单选、多选、时间单位组件双击编辑删除完内容时删除该标签

    commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 14:21:41 2019 +0800

        Squashed commit of the following:

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/containers/SpreadDrop.js

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            # Conflicts:
            #	src/store/async-actions/treat.js

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

            Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/AddAssistCheck/index.jsx

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/new' into dev/new

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

            Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/components/MainSuit/index.jsx

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

    commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 13:13:11 2019 +0800

        单选和多选编辑失焦时调用推送接口

    # Conflicts:
    #	src/common/components/EditableSpan/index.jsx
    #	src/components/NumberDrop/index.jsx
    #	src/components/NumberUnitDrop/index.jsx
    #	src/store/actions/mainSuit.js

commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 15:22:37 2019 +0800

    修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串

commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 14:41:20 2019 +0800

    ie8治疗方案遮罩

commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 14:17:40 2019 +0800

    顿号去重

commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 14:05:16 2019 +0800

    治疗方案遮罩IE8

commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 14:04:58 2019 +0800

    修改右侧推送字体大小

commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 13:59:54 2019 +0800

    Merge branch 'dev/new1' into dev/byll

commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 29 13:55:47 2019 +0800

    样式宽度更改和逗号处理

commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 29 13:26:56 2019 +0800

    修改化验项开单逗号问题

commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date:   Tue Jan 29 11:44:56 2019 +0800

    NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date:   Mon Jan 28 10:41:03 2019 +0800

    Squashed commit of the following:

    commit 79e0195a9b13069db729afe732bc5b466d43a37f
    Author: Luolei <16657115156@163.com>
    Date:   Fri Jan 25 14:06:09 2019 +0800

        date修改

commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date:   Mon Jan 28 10:38:40 2019 +0800

    Squashed commit of the following:

    commit 29b2499b796085a682a936d82c97decc35edf891
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Jan 25 13:50:07 2019 +0800

        修改版本信息和免责声明位置

commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date:   Mon Jan 28 10:33:30 2019 +0800

    Squashed commit of the following:

    commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 15:59:14 2019 +0800

        单选、多选、时间单位组件双击编辑删除完内容时删除该标签

    commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 14:21:41 2019 +0800

        Squashed commit of the following:

        commit d3e160a516240b77576567b993223816a68231a6
        Merge: 79e63ed c7e9e73
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:48 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:46:16 2019 +0800

            化验辅捡ie8搜索卡死修改

        commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 13:12:43 2019 +0800

            默认host地址删除

        commit e01035349f92405572238a0a97d80bb557dda802
        Merge: 8a8015d caad36f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 11:45:20 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 10:59:52 2019 +0800

            修改样式

        commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:46:01 2019 +0800

            合并报错修改

        commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
        Merge: bbe85ff 58e0fdd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Fri Jan 25 09:42:51 2019 +0800

            Merge remote-tracking branch 'origin/IE_test' into dev/new1

        commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
        Merge: b86268a 3bfa819
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:30:05 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/containers/SpreadDrop.js

        commit b86268a57afae26c7972b4b2362ae656a6784a8d
        Merge: 79c59d3 105488f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:25:44 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

            # Conflicts:
            #	src/store/async-actions/treat.js

        commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
        Merge: db90e04 de190a5
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 20:24:40 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 20:18:42 2019 +0800

            中英文逗号

        commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 18:31:55 2019 +0800

            去掉英文逗号

        commit 105488feef9e89309ecc23f2c9bce944da3490fb
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 17:22:34 2019 +0800

            修改治疗方案

        commit db90e04f23baf95466e34498ca06101f49a7ac7e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 16:49:10 2019 +0800

            下拉项间距调整，ie8事件兼容

        commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:09:49 2019 +0800

            药品说明书样式

        commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:08:17 2019 +0800

            修改药品说明书

        commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:06:17 2019 +0800

            修改开单样式

        commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 14:02:30 2019 +0800

            修改获取患者信息路径

        commit 6f95c909024a0c09f7ae316f9809ff96373365e2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:43:38 2019 +0800

            添加诊断判断有没有治疗方案

        commit f617e5c267246786e7a6801cc87811f0d2527235
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 13:39:13 2019 +0800

            merge from 'dev/zxc'

        commit 87e941c29ed951540497c18c0a493c55b222ce00
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 10:33:44 2019 +0800

            提示语

        commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
        Merge: d3ade00 95e9a94
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:09:57 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/components/DiagnosticList/index.jsx
            #	src/components/Operation/index.jsx
            #	src/containers/SpreadDrop.js
            #	src/store/actions/otherHistory.js
            #	src/store/async-actions/treat.js
            #	src/store/types/checkBody.js

        commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
        Merge: 2fd497e 2458ea1
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:05:17 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 10:03:28 2019 +0800

            提示语消失默认时间改为2秒

        commit 95e9a941766b9d5454f3c92fc614aa3321bce664
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 10:02:00 2019 +0800

            治疗方案置灰

        commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:59:16 2019 +0800

            治疗方案

        commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
        Merge: 62bd7fb 38f9720
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:47:47 2019 +0800

            Merge branch 'dev/new' into dev/zhangxc

        commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:46:32 2019 +0800

            Revert "Revert "修改药品说明样式""

            This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

        commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
        Merge: 28c364a c37d1cc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Thu Jan 24 09:46:00 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit 1cba16137b012f54873b193ab6b16968022d0c96
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Thu Jan 24 09:45:29 2019 +0800

            Revert "修改药品说明样式"

            This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

        commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:25:58 2019 +0800

            搜索列表显示样式更改

        commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
        Author: Luolei <16657115156@163.com>
        Date:   Thu Jan 24 09:15:40 2019 +0800

            样式调整

        commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:22:29 2019 +0800

            修改导入host

        commit f75c649c857013b890959fa7e1d3992912ddd1ca
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:15:44 2019 +0800

            临时修改版本弹窗高度

        commit e0376902fb956ee58c40b86ae97b924ce5955e75
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 21:10:27 2019 +0800

            化验导入删除填值推送

        commit 38d5d80ae62a8c393f4623f1774b756f078d6954
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:43:48 2019 +0800

            添加删除辅捡右侧推送

        commit d54073a78ccc7697f333c3d8ecc98922f14dc669
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 20:30:50 2019 +0800

            修改杂音选中项bug

        commit a7804f15d955022f912efa89cd3f0722bd5f02a3
        Merge: b489e52 6a1a3df
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:58:07 2019 +0800

            Merge remote-tracking branch 'origin/dev/byll' into dev/new1

        commit b489e5280cb7a214cf124116aea673ca2d4cefc3
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:57:50 2019 +0800

            既往史无殊选中bug

        commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 18:57:03 2019 +0800

            css

        commit 96efc7b8118a99db629f898960621b98786bd42e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 18:26:40 2019 +0800

            合罗磊分支

        commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:49:02 2019 +0800

            回退

        commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
        Merge: 6732dbb 1dd6c92
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:44:02 2019 +0800

            Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

            # Conflicts:
            #	src/common/components/TailInlineTag/index.less
            #	src/common/components/Textarea/index.jsx
            #	src/components/AddAssistCheck/index.jsx
            #	src/containers/OtherHistory.js
            #	src/store/actions/otherHistory.js

        commit 6732dbb61763a7717a2055d932da17c54d2aa65a
        Merge: bc168f8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:36:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

            # Conflicts:
            #	src/common/components/EditableSpan/index.jsx
            #	src/components/AddAssistCheck/index.jsx

        commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
        Merge: 3559798 6d55c59
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:34:30 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        commit 3559798c04e69583c1f05fc9125c812a9933892f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:31:13 2019 +0800

            既往史下拉滚动条添加

        commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 17:22:01 2019 +0800

            修改请求地址

        commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 17:16:22 2019 +0800

            辅检横向滚动

        commit 461e1db27e39068ca7126b0ad04e756c31f74d74
        Merge: adc853a 45b1158
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 16:53:11 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

            # Conflicts:
            #	src/utils/config.js

        commit cf97be2f425bdef386a137e92929969c321ab047
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:08:25 2019 +0800

            去掉一个字

        commit 1a8521d3c3019063a3124a142e3241f84b43c409
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 16:01:26 2019 +0800

            bug

        commit 45b1158b6f5a13eb0b02560087f3b936f6449089
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 15:58:40 2019 +0800

            其他史高血压选中bug修改

        commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 15:16:32 2019 +0800

            删除项有问题

        commit ac64b868290f94c0a30e3242110a38cda67249eb
        Merge: d2eca9d 1a6bf74
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:59:26 2019 +0800

            Merge branch 'dev/liucf' into dev/luolei

        commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 14:51:07 2019 +0800

            文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

        commit d2eca9d801e445d624c6a5465319e6e1335dbd15
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 14:43:46 2019 +0800

            日期bug

        commit 38f972082b4a6b58e73f17d4d15302045cd48981
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:46:29 2019 +0800

            请求地址修改-刚才反了

        commit 70e9420d59b745c59f3abe04c33100777184d024
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:44:13 2019 +0800

            请求地址修改

        commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 13:39:05 2019 +0800

            打印图标

        commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:31:48 2019 +0800

            其他史高血压数据展开

        commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 11:00:06 2019 +0800

            查体type修改

        commit f163535cc31ed9efbccc673325ee32d043c9c5bf
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:58:27 2019 +0800

            查体type修改

        commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
        Merge: 4b8aa34 540b6a8
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:51:52 2019 +0800

            Merge branch 'dev/new' into dev/luolei

        commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
        Author: Luolei <16657115156@163.com>
        Date:   Wed Jan 23 10:47:15 2019 +0800

            搜索弹窗被遮挡问题解决

        commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:23:04 2019 +0800

            地址临时修改

        commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:20:05 2019 +0800

            版本信息弹窗高度限制

        commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 10:13:40 2019 +0800

            推送接口主诉现病史合并，治疗方案容错

        commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
        Merge: 4a897b4 5a39d90
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/new' into dev/new

        commit 4a897b473cda81f614a8fd820a6d480b98f9872d
        Merge: 7f1c7c8 abd1267
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:57:43 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/common/components/ItemBox/index.jsx
            #	src/components/AddInspect/index.jsx
            #	src/components/Diagnosis/index.jsx
            #	src/components/Diagnosis/index.less

        commit 5a39d90dd616740bce7e833646a455b713f5e579
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:52:01 2019 +0800

            层级问题

        commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
        Merge: e5d0122 7f1c7c8
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:34 2019 +0800

            Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

        commit e5d0122382957b2f9157a83b72adfb651b355f96
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Jan 23 09:43:21 2019 +0800

            11

        commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:39:50 2019 +0800

            修改请求地址

        commit f14d699d86b98edde58a5739d5c81f538dd8bb18
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:38:05 2019 +0800

            修改请求地址

        commit b14968d42d5ed583714b5941365dc97fe24ea61b
        Merge: df67559 a82d18c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:50 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        commit df67559cc42c79c6ed6b27254ce12178918e32b0
        Merge: ff817bf 6805811
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Wed Jan 23 09:26:39 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit 68058110e041e72b8c95979a4fd23e690912746b
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:43:26 2019 +0800

            遮罩统一0.6透明度

        commit 625ca181024a268f16f32eb2773ea337cf62db43
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 20:34:59 2019 +0800

            透明度ie8

        commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:24:39 2019 +0800

            修改治疗方案无内容按钮置灰

        commit c54c73fe39e5746c1e1f2b16924e259cc122620a
        Merge: 9c0e078 84ec971
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 20:09:22 2019 +0800

            merge from 'lcf'

        commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 19:01:31 2019 +0800

            修改药品说明样式

        commit ff817bf6d6d928b98557371362374859bec3aabd
        Merge: d50ffe0 b2e679a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:52:34 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        commit b2e679a35e0ff4831f689758eb14521541f967e2
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:50:45 2019 +0800

            导入ie8暂时先灰掉

        commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
        Merge: 573f0b5 b286d0a
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:25:09 2019 +0800

            Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

            # Conflicts:
            #	src/utils/config.js

        commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 16:23:57 2019 +0800

            文本模式ie8onInput存值，搜索下拉项样式

        commit a82d18cfa4a27bb855651ef9f6965844d891fab2
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 15:30:07 2019 +0800

            修改开单项到医嘱逗号

        commit 573f0b59ff517de16f94296240572544e31c9f46
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:23:46 2019 +0800

            合并后报错处理

        commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
        Merge: 55d15d6 fbab9de
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:18:22 2019 +0800

            Merge remote-tracking branch 'origin/dev/liucf' into dev/new

            # Conflicts:
            #	src/components/CurrentIll/index.jsx
            #	src/containers/EditableSpan.js
            #	src/store/actions/currentIll.js
            #	src/store/reducers/checkBody.js
            #	src/utils/ajax.js
            #	src/utils/config.js

        commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
        Merge: 2d40e6e ad68815
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:10:38 2019 +0800

            Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

            # Conflicts:
            #	src/components/MainSuit/index.jsx

        commit 5e7834e1ff17257abdf408037031c0d926d22bfc
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Jan 22 15:02:18 2019 +0800

            ie8的onInput代替函数

        commit ad688156064254d6b615284642882ba5486ff764
        Author: zhangxc <zhangxc@zjlantone.com>
        Date:   Tue Jan 22 10:29:36 2019 +0800

            init

        commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:13:57 2019 +0800

            updata pro

        commit 26649f42178c7177ee34dae46038ce2370bf5b26
        Author: Luolei <16657115156@163.com>
        Date:   Tue Jan 22 10:12:21 2019 +0800

            test

    commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 13:13:11 2019 +0800

        单选和多选编辑失焦时调用推送接口

commit d6751d916bd9aff60373a28ce2240bc078809e9a
Author: liucf <liucf@zjlantone.com>
Date:   Mon Jan 28 09:51:31 2019 +0800

    合并new1分支
    Squashed commit of the following:

    commit d3e160a516240b77576567b993223816a68231a6
    Merge: 79e63ed c7e9e73
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 13:46:48 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 13:46:16 2019 +0800

        化验辅捡ie8搜索卡死修改

    commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 13:12:43 2019 +0800

        默认host地址删除

    commit e01035349f92405572238a0a97d80bb557dda802
    Merge: 8a8015d caad36f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 11:45:20 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

    commit caad36f002904aa859a0d780eefdf5b9cdc9011e
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 11:24:02 2019 +0800

        时间单位组件IE兼容

    commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 10:59:52 2019 +0800

        修改样式

    commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 09:46:01 2019 +0800

        合并报错修改

    commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
    Merge: bbe85ff 58e0fdd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Jan 25 09:42:51 2019 +0800

        Merge remote-tracking branch 'origin/IE_test' into dev/new1

    commit 58e0fdd1ab99664163923ff7ae455efff5850195
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri Jan 25 09:20:30 2019 +0800

        主诉IE兼容性处理

    commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
    Merge: b86268a 3bfa819
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 20:30:05 2019 +0800

        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx
        #	src/containers/SpreadDrop.js

    commit b86268a57afae26c7972b4b2362ae656a6784a8d
    Merge: 79c59d3 105488f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 20:25:44 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

        # Conflicts:
        #	src/store/async-actions/treat.js

    commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
    Merge: db90e04 de190a5
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 20:24:40 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 20:18:42 2019 +0800

        中英文逗号

    commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 18:31:55 2019 +0800

        去掉英文逗号

    commit 105488feef9e89309ecc23f2c9bce944da3490fb
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 17:22:34 2019 +0800

        修改治疗方案

    commit db90e04f23baf95466e34498ca06101f49a7ac7e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 16:49:10 2019 +0800

        下拉项间距调整，ie8事件兼容

    commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:09:49 2019 +0800

        药品说明书样式

    commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:08:17 2019 +0800

        修改药品说明书

    commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:06:17 2019 +0800

        修改开单样式

    commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 14:02:30 2019 +0800

        修改获取患者信息路径

    commit 6f95c909024a0c09f7ae316f9809ff96373365e2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 13:43:38 2019 +0800

        添加诊断判断有没有治疗方案

    commit f617e5c267246786e7a6801cc87811f0d2527235
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 13:39:13 2019 +0800

        merge from 'dev/zxc'

    commit 87e941c29ed951540497c18c0a493c55b222ce00
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 10:33:44 2019 +0800

        提示语

    commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
    Merge: d3ade00 95e9a94
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 10:09:57 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

        # Conflicts:
        #	src/components/DiagnosticList/index.jsx
        #	src/components/Operation/index.jsx
        #	src/containers/SpreadDrop.js
        #	src/store/actions/otherHistory.js
        #	src/store/async-actions/treat.js
        #	src/store/types/checkBody.js

    commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
    Merge: 2fd497e 2458ea1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 10:05:17 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 10:03:28 2019 +0800

        提示语消失默认时间改为2秒

    commit 95e9a941766b9d5454f3c92fc614aa3321bce664
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 10:02:00 2019 +0800

        治疗方案置灰

    commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:59:16 2019 +0800

        治疗方案

    commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
    Merge: 62bd7fb 38f9720
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:47:47 2019 +0800

        Merge branch 'dev/new' into dev/zhangxc

    commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:46:32 2019 +0800

        Revert "Revert "修改药品说明样式""

        This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

    commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
    Merge: 28c364a c37d1cc
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Jan 24 09:46:00 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit 1cba16137b012f54873b193ab6b16968022d0c96
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 24 09:45:29 2019 +0800

        Revert "修改药品说明样式"

        This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

    commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 09:25:58 2019 +0800

        搜索列表显示样式更改

    commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 24 09:15:40 2019 +0800

        样式调整

    commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 21:22:29 2019 +0800

        修改导入host

    commit f75c649c857013b890959fa7e1d3992912ddd1ca
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 21:15:44 2019 +0800

        临时修改版本弹窗高度

    commit e0376902fb956ee58c40b86ae97b924ce5955e75
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 21:10:27 2019 +0800

        化验导入删除填值推送

    commit 38d5d80ae62a8c393f4623f1774b756f078d6954
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 20:43:48 2019 +0800

        添加删除辅捡右侧推送

    commit d54073a78ccc7697f333c3d8ecc98922f14dc669
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 20:30:50 2019 +0800

        修改杂音选中项bug

    commit a7804f15d955022f912efa89cd3f0722bd5f02a3
    Merge: b489e52 6a1a3df
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 18:58:07 2019 +0800

        Merge remote-tracking branch 'origin/dev/byll' into dev/new1

    commit b489e5280cb7a214cf124116aea673ca2d4cefc3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 18:57:50 2019 +0800

        既往史无殊选中bug

    commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 18:57:03 2019 +0800

        css

    commit 96efc7b8118a99db629f898960621b98786bd42e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 18:26:40 2019 +0800

        合罗磊分支

    commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:49:02 2019 +0800

        回退

    commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
    Merge: 6732dbb 1dd6c92
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:44:02 2019 +0800

        Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

        # Conflicts:
        #	src/common/components/TailInlineTag/index.less
        #	src/common/components/Textarea/index.jsx
        #	src/components/AddAssistCheck/index.jsx
        #	src/containers/OtherHistory.js
        #	src/store/actions/otherHistory.js

    commit 6732dbb61763a7717a2055d932da17c54d2aa65a
    Merge: bc168f8 abd1267
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:36:50 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

        # Conflicts:
        #	src/common/components/EditableSpan/index.jsx
        #	src/components/AddAssistCheck/index.jsx

    commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
    Merge: 3559798 6d55c59
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:34:30 2019 +0800

        Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

    commit 3559798c04e69583c1f05fc9125c812a9933892f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:31:13 2019 +0800

        既往史下拉滚动条添加

    commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 17:22:01 2019 +0800

        修改请求地址

    commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 17:16:22 2019 +0800

        辅检横向滚动

    commit 461e1db27e39068ca7126b0ad04e756c31f74d74
    Merge: adc853a 45b1158
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 16:53:11 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

        # Conflicts:
        #	src/utils/config.js

    commit cf97be2f425bdef386a137e92929969c321ab047
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 16:08:25 2019 +0800

        去掉一个字

    commit 1a8521d3c3019063a3124a142e3241f84b43c409
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 16:01:26 2019 +0800

        bug

    commit 45b1158b6f5a13eb0b02560087f3b936f6449089
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 15:58:40 2019 +0800

        其他史高血压选中bug修改

    commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 15:16:32 2019 +0800

        删除项有问题

    commit ac64b868290f94c0a30e3242110a38cda67249eb
    Merge: d2eca9d 1a6bf74
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 14:59:26 2019 +0800

        Merge branch 'dev/liucf' into dev/luolei

    commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 14:51:07 2019 +0800

        文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

    commit d2eca9d801e445d624c6a5465319e6e1335dbd15
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 14:43:46 2019 +0800

        日期bug

    commit 38f972082b4a6b58e73f17d4d15302045cd48981
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 13:46:29 2019 +0800

        请求地址修改-刚才反了

    commit 70e9420d59b745c59f3abe04c33100777184d024
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 13:44:13 2019 +0800

        请求地址修改

    commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 13:39:05 2019 +0800

        打印图标

    commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 11:31:48 2019 +0800

        其他史高血压数据展开

    commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 11:00:06 2019 +0800

        查体type修改

    commit f163535cc31ed9efbccc673325ee32d043c9c5bf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:58:27 2019 +0800

        查体type修改

    commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
    Merge: 4b8aa34 540b6a8
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 10:51:52 2019 +0800

        Merge branch 'dev/new' into dev/luolei

    commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jan 23 10:47:15 2019 +0800

        搜索弹窗被遮挡问题解决

    commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:23:04 2019 +0800

        地址临时修改

    commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:20:05 2019 +0800

        版本信息弹窗高度限制

    commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 10:13:40 2019 +0800

        推送接口主诉现病史合并，治疗方案容错

    commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
    Merge: 4a897b4 5a39d90
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:57:50 2019 +0800

        Merge remote-tracking branch 'origin/dev/new' into dev/new

    commit 4a897b473cda81f614a8fd820a6d480b98f9872d
    Merge: 7f1c7c8 abd1267
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:57:43 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        # Conflicts:
        #	src/common/components/ItemBox/index.jsx
        #	src/components/AddInspect/index.jsx
        #	src/components/Diagnosis/index.jsx
        #	src/components/Diagnosis/index.less

    commit 5a39d90dd616740bce7e833646a455b713f5e579
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 23 09:52:01 2019 +0800

        层级问题

    commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
    Merge: e5d0122 7f1c7c8
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 23 09:43:34 2019 +0800

        Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

    commit e5d0122382957b2f9157a83b72adfb651b355f96
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Jan 23 09:43:21 2019 +0800

        11

    commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:39:50 2019 +0800

        修改请求地址

    commit f14d699d86b98edde58a5739d5c81f538dd8bb18
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:38:05 2019 +0800

        修改请求地址

    commit b14968d42d5ed583714b5941365dc97fe24ea61b
    Merge: df67559 a82d18c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:26:50 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

    commit df67559cc42c79c6ed6b27254ce12178918e32b0
    Merge: ff817bf 6805811
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Jan 23 09:26:39 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

    commit 68058110e041e72b8c95979a4fd23e690912746b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 20:43:26 2019 +0800

        遮罩统一0.6透明度

    commit 625ca181024a268f16f32eb2773ea337cf62db43
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 20:34:59 2019 +0800

        透明度ie8

    commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 20:24:39 2019 +0800

        修改治疗方案无内容按钮置灰

    commit c54c73fe39e5746c1e1f2b16924e259cc122620a
    Merge: 9c0e078 84ec971
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 20:09:22 2019 +0800

        merge from 'lcf'

    commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 19:01:31 2019 +0800

        修改药品说明样式

    commit ff817bf6d6d928b98557371362374859bec3aabd
    Merge: d50ffe0 b2e679a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:52:34 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

    commit b2e679a35e0ff4831f689758eb14521541f967e2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:50:45 2019 +0800

        导入ie8暂时先灰掉

    commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
    Merge: 573f0b5 b286d0a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:25:09 2019 +0800

        Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

        # Conflicts:
        #	src/utils/config.js

    commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 16:23:57 2019 +0800

        文本模式ie8onInput存值，搜索下拉项样式

    commit a82d18cfa4a27bb855651ef9f6965844d891fab2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 15:30:07 2019 +0800

        修改开单项到医嘱逗号

    commit 573f0b59ff517de16f94296240572544e31c9f46
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:23:46 2019 +0800

        合并后报错处理

    commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
    Merge: 55d15d6 fbab9de
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:18:22 2019 +0800

        Merge remote-tracking branch 'origin/dev/liucf' into dev/new

        # Conflicts:
        #	src/components/CurrentIll/index.jsx
        #	src/containers/EditableSpan.js
        #	src/store/actions/currentIll.js
        #	src/store/reducers/checkBody.js
        #	src/utils/ajax.js
        #	src/utils/config.js

    commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
    Merge: 2d40e6e ad68815
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:10:38 2019 +0800

        Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

        # Conflicts:
        #	src/components/MainSuit/index.jsx

    commit 5e7834e1ff17257abdf408037031c0d926d22bfc
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Jan 22 15:02:18 2019 +0800

        ie8的onInput代替函数

    commit ad688156064254d6b615284642882ba5486ff764
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Jan 22 10:29:36 2019 +0800

        init

    commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 22 10:13:57 2019 +0800

        updata pro

    commit 26649f42178c7177ee34dae46038ce2370bf5b26
    Author: Luolei <16657115156@163.com>
    Date:   Tue Jan 22 10:12:21 2019 +0800

        test

commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date:   Fri Jan 25 14:06:09 2019 +0800

    date修改

commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri Jan 25 13:50:07 2019 +0800

    修改版本信息和免责声明位置

commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 13:46:48 2019 +0800

    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 13:46:16 2019 +0800

    化验辅捡ie8搜索卡死修改

commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 13:12:43 2019 +0800

    默认host地址删除

commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 11:45:20 2019 +0800

    Merge remote-tracking branch 'origin/IE_test' into dev/new1

commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 10:59:52 2019 +0800

    修改样式

commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 09:46:01 2019 +0800

    合并报错修改

commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri Jan 25 09:42:51 2019 +0800

    Merge remote-tracking branch 'origin/IE_test' into dev/new1

commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 20:30:05 2019 +0800

    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

    # Conflicts:
    #	src/common/components/EditableSpan/index.jsx
    #	src/containers/SpreadDrop.js

commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 20:25:44 2019 +0800

    Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1

    # Conflicts:
    #	src/store/async-actions/treat.js

commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 20:24:40 2019 +0800

    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 24 20:18:42 2019 +0800

    中英文逗号

commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 24 18:31:55 2019 +0800

    去掉英文逗号

commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 17:22:34 2019 +0800

    修改治疗方案

commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 16:49:10 2019 +0800

    下拉项间距调整，ie8事件兼容

commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 14:09:49 2019 +0800

    药品说明书样式

commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 14:08:17 2019 +0800

    修改药品说明书

commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 14:06:17 2019 +0800

    修改开单样式

commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 14:02:30 2019 +0800

    修改获取患者信息路径

commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 13:43:38 2019 +0800

    添加诊断判断有没有治疗方案

commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 13:39:13 2019 +0800

    merge from 'dev/zxc'

commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 24 10:33:44 2019 +0800

    提示语

commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 10:09:57 2019 +0800

    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

    # Conflicts:
    #	src/components/DiagnosticList/index.jsx
    #	src/components/Operation/index.jsx
    #	src/containers/SpreadDrop.js
    #	src/store/actions/otherHistory.js
    #	src/store/async-actions/treat.js
    #	src/store/types/checkBody.js

commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 10:05:17 2019 +0800

    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 10:03:28 2019 +0800

    提示语消失默认时间改为2秒

commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 10:02:00 2019 +0800

    治疗方案置灰

commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 09:59:16 2019 +0800

    治疗方案

commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 09:47:47 2019 +0800

    Merge branch 'dev/new' into dev/zhangxc

commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 09:46:32 2019 +0800

    Revert "Revert "修改药品说明样式""

    This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.

commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu Jan 24 09:46:00 2019 +0800

    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Jan 24 09:45:29 2019 +0800

    Revert "修改药品说明样式"

    This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.

commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 24 09:25:58 2019 +0800

    搜索列表显示样式更改

commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date:   Thu Jan 24 09:15:40 2019 +0800

    样式调整

commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 21:22:29 2019 +0800

    修改导入host

commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 21:15:44 2019 +0800

    临时修改版本弹窗高度

commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 21:10:27 2019 +0800

    化验导入删除填值推送

commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 20:43:48 2019 +0800

    添加删除辅捡右侧推送

commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 20:30:50 2019 +0800

    修改杂音选中项bug

commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 18:58:07 2019 +0800

    Merge remote-tracking branch 'origin/dev/byll' into dev/new1

commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 18:57:50 2019 +0800

    既往史无殊选中bug

commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 18:57:03 2019 +0800

    css

commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 18:26:40 2019 +0800

    合罗磊分支

commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:49:02 2019 +0800

    回退

commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:44:02 2019 +0800

    Merge remote-tracking branch 'origin/dev/luolei' into dev/new1

    # Conflicts:
    #	src/common/components/TailInlineTag/index.less
    #	src/common/components/Textarea/index.jsx
    #	src/components/AddAssistCheck/index.jsx
    #	src/containers/OtherHistory.js
    #	src/store/actions/otherHistory.js

commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:36:50 2019 +0800

    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1

    # Conflicts:
    #	src/common/components/EditableSpan/index.jsx
    #	src/components/AddAssistCheck/index.jsx

commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:34:30 2019 +0800

    Merge remote-tracking branch 'origin/dev/liucf' into dev/new1

commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:31:13 2019 +0800

    既往史下拉滚动条添加

commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 17:22:01 2019 +0800

    修改请求地址

commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 17:16:22 2019 +0800

    辅检横向滚动

commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 16:53:11 2019 +0800

    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

    # Conflicts:
    #	src/utils/config.js

commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 16:08:25 2019 +0800

    去掉一个字

commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 16:01:26 2019 +0800

    bug

commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 15:58:40 2019 +0800

    其他史高血压选中bug修改

commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 15:16:32 2019 +0800

    删除项有问题

commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 14:59:26 2019 +0800

    Merge branch 'dev/liucf' into dev/luolei

commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 14:51:07 2019 +0800

    文本模式其他史不受主诉为空限制，切换模式后其他史重新获取

commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 14:43:46 2019 +0800

    日期bug

commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 13:46:29 2019 +0800

    请求地址修改-刚才反了

commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 13:44:13 2019 +0800

    请求地址修改

commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 13:39:05 2019 +0800

    打印图标

commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 11:31:48 2019 +0800

    其他史高血压数据展开

commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 11:00:06 2019 +0800

    查体type修改

commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 10:58:27 2019 +0800

    查体type修改

commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 10:51:52 2019 +0800

    Merge branch 'dev/new' into dev/luolei

commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date:   Wed Jan 23 10:47:15 2019 +0800

    搜索弹窗被遮挡问题解决

commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 10:23:04 2019 +0800

    地址临时修改

commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 10:20:05 2019 +0800

    版本信息弹窗高度限制

commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 10:13:40 2019 +0800

    推送接口主诉现病史合并，治疗方案容错

commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:57:50 2019 +0800

    Merge remote-tracking branch 'origin/dev/new' into dev/new

commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:57:43 2019 +0800

    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

    # Conflicts:
    #	src/common/components/ItemBox/index.jsx
    #	src/components/AddInspect/index.jsx
    #	src/components/Diagnosis/index.jsx
    #	src/components/Diagnosis/index.less

commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jan 23 09:52:01 2019 +0800

    层级问题

commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jan 23 09:43:34 2019 +0800

    Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new

commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jan 23 09:43:21 2019 +0800

    11

commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:39:50 2019 +0800

    修改请求地址

commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:38:05 2019 +0800

    修改请求地址

commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:26:50 2019 +0800

    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jan 23 09:26:39 2019 +0800

    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 20:43:26 2019 +0800

    遮罩统一0.6透明度

commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 20:34:59 2019 +0800

    透明度ie8

commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 22 20:24:39 2019 +0800

    修改治疗方案无内容按钮置灰

commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 22 20:09:22 2019 +0800

    merge from 'lcf'

commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 22 19:01:31 2019 +0800

    修改药品说明样式

commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 16:52:34 2019 +0800

    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 16:50:45 2019 +0800

    导入ie8暂时先灰掉

commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 16:25:09 2019 +0800

    Merge remote-tracking branch 'origin/dev/otherHis' into dev/new

    # Conflicts:
    #	src/utils/config.js

commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 16:23:57 2019 +0800

    文本模式ie8onInput存值，搜索下拉项样式

commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 22 15:30:07 2019 +0800

    修改开单项到医嘱逗号

commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 15:23:46 2019 +0800

    合并后报错处理

commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 15:18:22 2019 +0800

    Merge remote-tracking branch 'origin/dev/liucf' into dev/new

    # Conflicts:
    #	src/components/CurrentIll/index.jsx
    #	src/containers/EditableSpan.js
    #	src/store/actions/currentIll.js
    #	src/store/reducers/checkBody.js
    #	src/utils/ajax.js
    #	src/utils/config.js

commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 15:10:38 2019 +0800

    Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new

    # Conflicts:
    #	src/components/MainSuit/index.jsx

commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue Jan 22 15:02:18 2019 +0800

    ie8的onInput代替函数

commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue Jan 22 10:29:36 2019 +0800

    init

commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 22 10:13:57 2019 +0800

    updata pro

commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date:   Tue Jan 22 10:12:21 2019 +0800

    test

# Conflicts:
#	src/common/components/EditableSpan/index.jsx
#	src/components/SpreadDrop/index.jsx

src/common/components/DropList/index.jsx

@@ -1,5 +1,6 @@
 import React,{Component} from 'react';
 import classNames from 'classnames';
+import ReactDom from "react-dom";
 
 import style from "./index.less";
 /****
@@ -23,6 +24,14 @@ class DropList extends Component{
     let isHide = this.props.show?'':style['hide'];
     return classNames(style['list'],name,isHide);
   }
+  
+  getStyle(){
+    const {left,top} = this.props;
+    return {
+      left:left?left+'px':'',
+      top:top?top+'px':''
+    }
+  }
   handleSelect(e,item){
     e.stopPropagation();
     const {onSelect} = this.props;
@@ -35,15 +44,18 @@ class DropList extends Component{
   }
   render(){
     const {data} = this.props;
-    return <div className={this.getClass()} contentEditable='false'>
-      <ul>
-        {data&&data.map((it)=>{
-          /*return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.questionDetailList&&it.questionDetailList.length>0?it.questionDetailList[0].name:it.name}{it.labelSuffix}</li>*/
-          return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>
-        })}
-        <li onClick={(e)=>this.handleClear(e)} className='red'>清空选项</li>
-      </ul>
-    </div>
+    const domNode = document.getElementById('root');
+    return ReactDom.createPortal(
+      <div className={this.getClass()} style={this.getStyle()} contentEditable='false'>
+        <ul>
+          {data&&data.map((it)=>{
+            /*return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.questionDetailList&&it.questionDetailList.length>0?it.questionDetailList[0].name:it.name}{it.labelSuffix}</li>*/
+            return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>
+          })}
+          <li onClick={(e)=>this.handleClear(e)} className='red'>清空选项</li>
+        </ul>
+      </div>
+    ,domNode)
   }
 }
 

src/common/components/EditableSpan/index.jsx

@@ -1,7 +1,7 @@
 import React,{Component} from 'react';
 import style from './index.less';
 import config from "@config/index";
-import {filterArr,isIE,filterDataArr} from '@utils/tools.js';
+import {filterArr,isIE,getPageCoordinate,filterDataArr} from '@utils/tools.js';
 import Notify from '../Notify/index.js';
 import classNames from 'classnames';
 

src/common/components/NumberPan/index.jsx

@@ -1,5 +1,6 @@
 import React,{Component} from 'react';
 import style from './index.less';
+import ReactDom from "react-dom";
 
 class NumberPan extends Component{
   constructor(props){
@@ -46,39 +47,50 @@ class NumberPan extends Component{
     });
     onSelect&&onSelect(text);
   }
-  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'}}
+  getStyle(){
+    const {left,top,show} = this.props;
+    return {
+      left:left?left+'px':'0',
+      top:top?top+'px':'0',
+      display:show?'table':'none'        //table onBlur阻止冒泡是为了修复multSpread中数字键盘点击触发最外层数字组件onBlur事件
+    }
+  }
+  render(){  
+    const select = this.handleSelect.bind(this); 
+    const domNode = document.getElementById('root');
+    return ReactDom.createPortal(
+       <div className={style['panBox']} 
+                style={this.getStyle()}
+                onBlur={(e)=>e.stopPropagation()} 
                 onDoubleClick={(e)=>e.stopPropagation()}>
-    <table className={style['pan']} >
-      <tr>
-        <td><button onClick={select}>1</button></td>
-        <td><button onClick={select}>2</button></td>
-        <td><button onClick={select}>3</button></td>
-        <td><button onClick={select}>/</button></td>
-      </tr>
-      <tr>
-        <td><button onClick={select}>4</button></td>
-        <td><button onClick={select}>5</button></td>
-        <td><button onClick={select}>6</button></td>
-        <td><button onClick={this.handleBack.bind(this)}>回退</button></td>
-      </tr>
-      <tr>
-        <td><button onClick={select}>7</button></td>
-        <td><button onClick={select}>8</button></td>
-        <td><button onClick={select}>9</button></td>
-        <td><button onClick={this.handleClear.bind(this)}>清空</button></td>
-      </tr>
-      <tr>
-        <td><button onClick={select}>.</button></td>
-        <td><button onClick={select}>0</button></td>
-        <td><button onClick={select}>～</button></td>
-        <td><button onClick={this.handleClose.bind(this)}>确定</button></td>
-      </tr>
-    </table>
-    </div>
+      <table className={style['pan']} >
+        <tr>
+          <td><button onClick={select}>1</button></td>
+          <td><button onClick={select}>2</button></td>
+          <td><button onClick={select}>3</button></td>
+          <td><button onClick={select}>/</button></td>
+        </tr>
+        <tr>
+          <td><button onClick={select}>4</button></td>
+          <td><button onClick={select}>5</button></td>
+          <td><button onClick={select}>6</button></td>
+          <td><button onClick={this.handleBack.bind(this)}>回退</button></td>
+        </tr>
+        <tr>
+          <td><button onClick={select}>7</button></td>
+          <td><button onClick={select}>8</button></td>
+          <td><button onClick={select}>9</button></td>
+          <td><button onClick={this.handleClear.bind(this)}>清空</button></td>
+        </tr>
+        <tr>
+          <td><button onClick={select}>.</button></td>
+          <td><button onClick={select}>0</button></td>
+          <td><button onClick={select}>～</button></td>
+          <td><button onClick={this.handleClose.bind(this)}>确定</button></td>
+        </tr>
+      </table>
+      </div>
+    ,domNode)
   }
 }
 

src/common/components/NumberPan/index.less

@@ -1,6 +1,7 @@
 @import "~@less/variables.less";
 .panBox{
   .pop;
+  display: table;
 }
 .pan{
   width: 280px;

src/common/components/SearchOption/index.jsx

@@ -57,7 +57,8 @@ class SearchOption extends React.Component {
               show:true
           })
       }else{
-          this.handleClearVal('')            //这个要放开，输入为空清除列表
+          // this.handleClearVal('')            //这个要放开，输入为空清除列表ie8会有问题
+          handleChangeValue('');
           this.setState({
               show:false
           })

src/common/js/func.js

@@ -172,6 +172,10 @@ export const getWindowInnerHeight = ()=>{
     return Math.min(by.clientHeight,ele.clientHeight);
   }
 };
+export const getWindowInnerWidth = ()=>{
+  let width = window.innerWidth || document.body.clientWidth || document.documentElement.clientWidth 
+  return width
+};
 
 export const getIds = (data)=>{
   let ids = [];

src/common/less/variables.less

@@ -54,7 +54,7 @@
 .pop{
   position: absolute;
   // top:40px;
-  top:30px;
+  // top:30px;
   background: #fff;
   box-shadow: 0 10px 20px 0 #989DA3;
   // filter:progid:DXImageTransform.Microsoft.Shadow(color='#989DA3',Direction=125,Strength=6);

src/components/BodyContainer/index.jsx

@@ -15,8 +15,8 @@ class BodyContainer extends Component {
         const { saveDateAll } = this.props;
         //console.log(saveDateAll)
         return <div className={style['container'] + ' clearfix'}>
-            <PushContainer></PushContainer>
             <SaveDataAll saveDateAll={saveDateAll}></SaveDataAll>
+            <PushContainer></PushContainer>
         </div>;
     }
 }

src/components/CheckBody/index.jsx

@@ -3,14 +3,18 @@ import style from './index.less';
 import {Button,InlineTag,ItemBox,EditableSpan,Notify} from '@commonComp';
 import chooseType from '@containers/eleType.js';
 import SearchDrop from '@components/SearchDrop';
+import {getPageCoordinate,windowEventHandler} from '@utils/tools';
+import $ from "jquery";
 
 class CheckBody extends Component{
   constructor(props){
     super(props);
     this.state={
       boxMark:'4',
-      boxLeft:'0px',
-      boxTop:'0px'
+      boxLeft:0,
+      boxTop:0,
+      tmpScroll:0,
+      tmpTop:0,
     };
     this.handleClick = this.handleClick.bind(this);
     this.handleSearchSelect = this.handleSearchSelect.bind(this);
@@ -27,11 +31,10 @@ class CheckBody extends Component{
         return chooseType({item:it,boxMark,i,showArr,saveText,selecteds});
       });
     }
-
     return arr;
   }
   handleClick(e){//让搜索框跟随鼠标点击移动
-    //e.stopPropagation();
+    e.stopPropagation();
     const {fetchPushInfos,totalHide} = this.props;
     //fetchPushInfos&&fetchPushInfos();
     this.getData();
@@ -40,13 +43,23 @@ class CheckBody extends Component{
     }
     //若使用e.target，因为是onClick事件中，值可能是itembox的而不是span因此会有bug
     const ele = document.activeElement;
-    const height = ele.offsetHeight;
-    let boxTop = (+(ele.offsetTop)+height)+'px';
-    let boxLeft = ele.offsetLeft + 'px';
+    if(ele.toString().indexOf('HTMLSpanElement') == -1){     //点击的不是span无法聚焦就不再设置位置
+      return;
+    }
+    const leftL = ele.offsetLeft;      //用焦点元素的左边距替换鼠标点击的左边距，高度还是鼠标点击的位置
     this.setState({
-      boxLeft:boxLeft,
-      boxTop:boxTop
+      // boxLeft:getPageCoordinate(e).boxLeft,
+      boxLeft:leftL+90,
+      boxTop:getPageCoordinate(e).boxTop,
+      tmpScroll: $("#addScrollEvent")[0].scrollTop,
+      tmpTop:getPageCoordinate(e).boxTop
     });
+    windowEventHandler('scroll',()=>{      //弹窗跟随滚动条滚动或者关闭弹窗
+      let scrollYs = $("#addScrollEvent")[0].scrollTop;
+      this.setState({
+        boxTop:this.state.tmpTop - scrollYs + this.state.tmpScroll
+      })
+    },$("#addScrollEvent")[0])
   }
   handleSearchSelect(obj){
    const {questionId,name} = obj;

src/components/CurrentIll/index.jsx

@@ -4,7 +4,8 @@ import {Button,InlineTag,ItemBox,Notify,Textarea} from '@commonComp';
 import TailInlineTag from '@commonComp/TailInlineTag';
 import chooseType from '@containers/eleType.js';
 import SearchDrop from '@components/SearchDrop';
-import {filterDataArr} from '@utils/tools'
+import {filterDataArr,getPageCoordinate,windowEventHandler} from '@utils/tools'
+import $ from 'jquery';
 
 class CurrentIll extends Component{
   constructor(props){
@@ -16,9 +17,11 @@ class CurrentIll extends Component{
       mainFlag:true,
       mainData:[],
       boxMark:"2",
-      boxLeft:null,
-      boxTop:null,
-      show:true
+      boxLeft:0,
+      boxTop:0,
+      show:true,
+      tmpScroll:0,
+      tmpTop:0,
     }
     this.toggleEditable = this.toggleEditable.bind(this);
     this.handleFocus = this.handleFocus.bind(this);
@@ -56,7 +59,7 @@ class CurrentIll extends Component{
           showMoudle:true,
           forbidInput:false,
           boxEditable:false,
-        })
+      })
       changeEditIll(false)
       /*const showTimer = setTimeout(function(){
         that.setState({
@@ -80,13 +83,23 @@ class CurrentIll extends Component{
     // e.stopPropagation(); //冒泡到最顶层关闭其他下拉
     //若使用e.target，因为是onClick事件中，值可能是itembox的而不是span因此会有bug
     const ele = document.activeElement;
-    const height = ele.offsetHeight;
-    let boxTop = (+(ele.offsetTop)+height)+'px';
-    let boxLeft = +ele.offsetLeft+90 + 'px';
+    if(ele.toString().indexOf('HTMLSpanElement') == -1){     //点击的不是span无法聚焦就不再设置位置
+      return;
+    }
+    const leftL = ele.offsetLeft;      //用焦点元素的左边距替换鼠标点击的左边距，高度还是鼠标点击的位置
     this.setState({
-      boxLeft:boxLeft,
-      boxTop:boxTop
-    })
+      // boxLeft:getPageCoordinate(e).boxLeft,
+      boxLeft:leftL+90,
+      boxTop:getPageCoordinate(e).boxTop,
+      tmpScroll: $("#addScrollEvent")[0].scrollTop,
+      tmpTop:getPageCoordinate(e).boxTop
+    });
+    windowEventHandler('scroll',()=>{      //弹窗跟随滚动条滚动或者关闭弹窗
+      let scrollYs = $("#addScrollEvent")[0].scrollTop;
+      this.setState({
+        boxTop:this.state.tmpTop - scrollYs + this.state.tmpScroll
+      })
+    },$("#addScrollEvent")[0])
   }
 
   handleSearchSelect(obj){
@@ -112,7 +125,8 @@ class CurrentIll extends Component{
   render(){
     const {fuzhen,type,fetchPushInfos,handleInput,isRead,saveText,searchData,totalHide,showArr,focusIndex,editClear,data} = this.props;
     const {showMoudle,forbidInput,boxMark,boxLeft,boxTop,show} = this.state;
-    const searchFlag = searchData.length>0 ? true : false;
+    const searchFlag = searchData.length > 0 ? true : false;
+
     if(+type===1){      //文本模式
       return <Textarea  title='现病史' boxMark='2'
                         isRead={isRead}

src/components/EMRContainer/index.jsx

@@ -11,7 +11,8 @@ import OperationContainer from '../../containers/OperationContainer'
 import style from './index.less';
 import AdviceContainer from '../../containers/AdviceContainer';
 import InfoTitle from '@components/InfoTitle'
-import {getWindowInnerHeight} from '@common/js/func';
+import {windowEventHandler} from '@utils/tools'
+import {getWindowInnerHeight,getWindowInnerWidth} from '@common/js/func';
 
 class EMRContainer extends Component {
     constructor(props){
@@ -21,22 +22,21 @@ class EMRContainer extends Component {
     componentDidMount(){
         // const {initHospital} = this.props;
         // initHospital()
-        // const height = getWindowInnerHeight()-115;
-        // this.$cont.current.style.height = height+"px";
-        // const {initHistoryLastest} = this.props;
-        // let timer = setInterval(()=>{
-        //     let baseDate = store.getState().patInfo.message;
-        //     if(JSON.stringify(baseDate) != '{}') {
-        //         initHistoryLastest();
-        //         clearInterval(timer)
-        //     }
-        // },500)
-
+        const height = getWindowInnerHeight() - 115;
+        const width = getWindowInnerWidth() - 480;
+        this.$cont.current.style.height = height+"px";
+        this.$cont.current.style.width = width + "px";
+        windowEventHandler('resize', ()=>{
+          const height = getWindowInnerHeight() - 115;
+          const width = getWindowInnerWidth() - 480;
+          this.$cont.current.style.height = height + "px";
+          this.$cont.current.style.width = width + "px";
+        });
     }
     render() {
-        return <div className={style['EMR-container']}>
-            <div className={style['inner']} ref={this.$cont}>
-                <InfoTitle></InfoTitle>
+        return <div className={style['EMR-container']} ref={this.$cont} id="addScrollEvent">
+            <InfoTitle></InfoTitle>
+            <div className={style['inner']}>
                 <MainSuit></MainSuit>
                 <CurrentIll></CurrentIll>
                 <OtherHistory></OtherHistory>

src/components/EMRContainer/index.less

@@ -2,14 +2,16 @@
 .EMR-container{
   background: #fff;
 //   margin-top: 10px;
-  margin-right:@push-width + 10px;
+  // margin-right:@push-width + 10px;
   padding: 0px 0 10px 0 ;
   box-sizing: border-box;
-  position: relative;
+  position: absolute;
   min-width: 700px;
+  float: left;
+  overflow-y:auto;
+  overflow-x: hidden;
 }
 .inner{
-//   overflow-y: auto;
   padding-top:80px;
   padding-bottom: 80px;
 }

src/components/InfoTitle/index.less

@@ -8,7 +8,7 @@
   position: fixed;
   left: 10px;
   top: 50px;
-  right: 480px;
+  right: 470px;
   z-index: 204;
 }
 .operations, .health{

src/components/MainSuit/index.jsx

@@ -6,7 +6,8 @@ import SearchDrop from '@components/SearchDrop';
 import CommonSymptom from '@components/CommonSymptom';
 import chooseType from '@containers/eleType.js';
 import config from "@config/index";
-import {isIE} from "@utils/tools.js"
+import {isIE,getPageCoordinate,windowEventHandler} from "@utils/tools.js"
+import $ from 'jquery';
 
 class MainSuit extends Component{
   constructor(props){
@@ -25,7 +26,9 @@ class MainSuit extends Component{
       blurTimer:null,
       inpText:'',
       clearTimer:null,
-      overFlag:false
+      overFlag:false,
+      tmpScroll:0,
+      tmpTop:0,
     };
     this.toggleEditable = this.toggleEditable.bind(this);
     this.handleFocus = this.handleFocus.bind(this);
@@ -132,14 +135,26 @@ class MainSuit extends Component{
 
   handleClick(e){//让搜索框跟随鼠标点击移动
     // e.stopPropagation(); //冒泡到最顶层关闭其他下拉
-    let boxLeft = e.pageX -32 + 'px';
-    // let boxTop = e.pageY - 112 + 'px';
-    let offsetTop = e.target.offsetTop;
-    let boxTop = offsetTop + 28 + 'px';
+    //若使用e.target，因为是onClick事件中，值可能是itembox的而不是span因此会有bug
+    const ele = document.activeElement;
+    console.log(ele.toString())
+    if(ele.toString().indexOf('HTMLSpanElement') == -1){     //点击的不是span无法聚焦就不再设置位置
+      return;
+    }
+    const leftL = ele.offsetLeft;      //用焦点元素的左边距替换鼠标点击的左边距，高度还是鼠标点击的位置
     this.setState({
-      boxLeft:boxLeft,
-      boxTop:boxTop
-    })
+      // boxLeft:getPageCoordinate(e).boxLeft,
+      boxLeft:leftL+90,
+      boxTop:getPageCoordinate(e).boxTop,
+      tmpScroll: $("#addScrollEvent")[0].scrollTop,
+      tmpTop:getPageCoordinate(e).boxTop
+    });
+    windowEventHandler('scroll',()=>{      //弹窗跟随滚动条滚动或者关闭弹窗
+      let scrollYs = $("#addScrollEvent")[0].scrollTop;
+      this.setState({
+        boxTop:this.state.tmpTop - scrollYs + this.state.tmpScroll
+      })
+    },$("#addScrollEvent")[0])
   }
 
   handleChange(e){
@@ -227,7 +242,6 @@ class MainSuit extends Component{
     const {showModule,boxLeft,boxTop,show,symptom,search} = this.state;
     const symptomFlag = CommonSymptoms.length>0 ? true : false;
     const searchFlag = searchData.length>0 ? true : false;
-    
     if(+type===1){      //文本模式
       return <Textarea title='主诉' boxMark='1' isRead={isRead} value={saveText[0]} handlePush={fetchPushInfos} handleInput={handleInput} />;
     }

src/components/NumberDrop/index.jsx

@@ -2,7 +2,8 @@ import React,{Component} from 'react';
 import className from 'classnames';
 import {NumberPan} from '@commonComp';
 import style from './index.less';
-import {handleEnter} from '@utils/tools.js';
+import $ from "jquery";
+import {handleEnter,getPageCoordinate} from '@utils/tools.js';
 /***
  * author:zn@2018-11-19
  * 接收参数：
@@ -20,7 +21,11 @@ class NumberDrop extends Component{
       numEditable:true,      //数字框是否可输入
       timer:null,
       hasSelect:false,       //是否点过下拉键盘
-      isClosed:false
+      isClosed:false,
+      boxLeft:0,
+      boxTop:0,
+      tmpTop:0,
+      tmpScroll:0
     };
     this.$span = React.createRef();
     this.$pre = React.createRef();
@@ -61,6 +66,18 @@ class NumberDrop extends Component{
     });
   }
   handleNumClick(e){      //数字框不可编辑的状态时点击事件，点击将数字框变为可输入且下拉不再显示直到失焦后再次聚集
+    this.setState({
+      boxLeft:getPageCoordinate(e).boxLeft,
+      boxTop:getPageCoordinate(e).boxTop,
+      tmpScroll: $("#addScrollEvent")[0].scrollTop,
+      tmpTop:getPageCoordinate(e).boxTop
+    });
+    $("#addScrollEvent").scroll(()=>{
+      let scrollYs = $("#addScrollEvent")[0].scrollTop;
+      this.setState({
+        boxTop:this.state.tmpTop - scrollYs + this.state.tmpScroll
+      })
+    })
     e.stopPropagation();
     const {show,handleShow,ikey,id,patId,handleHide,value} = this.props;
     const {hasSelect} = this.state;
@@ -132,7 +149,7 @@ class NumberDrop extends Component{
   }
   render(){
     const {placeholder,prefix,suffix,show,value,handleHide} = this.props;
-    const {numEditable,editable,hasSelect} = this.state;
+    const {numEditable,editable,hasSelect,boxTop,boxLeft} = this.state;
     return <div className={this.getClasses()}
                 onDoubleClick={this.changeToEdit}
                 contentEditable={editable}
@@ -151,7 +168,10 @@ class NumberDrop extends Component{
       <span ref = {this.$suf}>&nbsp;{suffix}</span>
       <NumberPan handleSelect={(text)=>this.select(text)}
                  onClose={handleHide}
-                 show={show} toClear={!hasSelect}/>
+                 show={show} 
+                 toClear={!hasSelect}
+                 left={boxLeft}
+                 top={boxTop}/>
     </div>
   }
 }

src/components/Operation/index.jsx

@@ -6,7 +6,7 @@ import saveHistory from '@common/images/saveHistory.png';
 import PrintPreviewContainer from '@containers/PrintPreviewContainer';
 import PreviewContainer from '@containers/PreviewContainer';
 import { ConfirmModal, Notify } from '@commonComp';
-import {getAllDataList,getAllDataStringList,isAllClear} from '@utils/tools';
+import {getAllDataList,getAllDataStringList,isAllClear,filterArr} from '@utils/tools';
 import store from '@store';
 
 
@@ -80,10 +80,7 @@ class Operation extends Component {
   keepHistory(){
     let baseList = store.getState();
     let jsonStr = getAllDataStringList(baseList);
-    if(JSON.parse(jsonStr.chief).length == 1 && JSON.parse(jsonStr.chief)[0].trim() ==''){
-        Notify.info('主诉不能为空');
-        return false;
-    }else if(jsonStr.chief && JSON.parse(jsonStr.chief).length < 1){
+    if(filterArr(JSON.parse(jsonStr.chief)) == ''){
         Notify.info('主诉不能为空');
         return false;
     }else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){

src/components/OtherHistory/index.jsx

@@ -2,7 +2,8 @@ import React,{Component} from 'react';
 import {Button,InlineTag,ItemBox,Textarea,Notify} from '@commonComp';
 import chooseType from '@containers/eleType.js';
 import SearchDrop from '@components/SearchDrop';
-import {filterDataArr} from '@utils/tools'
+import {filterDataArr,getPageCoordinate,windowEventHandler} from '@utils/tools'
+import $ from 'jquery';
 import style from './index.less';
 
 class OtherHistory extends Component{
@@ -11,8 +12,10 @@ class OtherHistory extends Component{
     this.state = {
       boxMark:'3',
       editable:true,
-      boxLeft:'0px',
-      boxTop:'0px'
+      boxLeft:0,
+      boxTop:0,
+      tmpScroll:0,
+      tmpTop:0
     };
     this.handleClick = this.handleClick.bind(this);
     this.handleSearchSelect = this.handleSearchSelect.bind(this);
@@ -64,13 +67,24 @@ class OtherHistory extends Component{
     //fetchPushInfos&&fetchPushInfos();
     //若使用e.target，因为是onClick事件中，值可能是itembox的而不是span因此会有bug
     const ele = document.activeElement;
-    const height = ele.offsetHeight;
-    let boxTop = (+(ele.offsetTop)+height)+'px';
-    let boxLeft = ele.offsetLeft + 'px';
+
+    if(ele.toString().indexOf('HTMLSpanElement') == -1){     //点击的不是span无法聚焦就不再设置位置
+      return;
+    }
+    const leftL = ele.offsetLeft;      //用焦点元素的左边距替换鼠标点击的左边距，高度还是鼠标点击的位置
     this.setState({
-      boxLeft:boxLeft,
-      boxTop:boxTop
+      // boxLeft:getPageCoordinate(e).boxLeft,
+      boxLeft:leftL+90,
+      boxTop:getPageCoordinate(e).boxTop,
+      tmpScroll: $("#addScrollEvent")[0].scrollTop,
+      tmpTop:getPageCoordinate(e).boxTop
     });
+    windowEventHandler('scroll',()=>{      //弹窗跟随滚动条滚动或者关闭弹窗
+      let scrollYs = $("#addScrollEvent")[0].scrollTop;
+      this.setState({
+        boxTop:this.state.tmpTop - scrollYs + this.state.tmpScroll
+      })
+    },$("#addScrollEvent")[0])
   }
   /*componentWillReceiveProps(next){
     const isRead = this.props;
@@ -87,7 +101,6 @@ class OtherHistory extends Component{
     const {boxTop,boxLeft,boxMark} = this.state;
     const hasData = saveText.join("")||data.length>0;
     const show = showArr&&showArr[boxMark+focusTextIndex+'0'];
-
     if(+type===1){      //文本模式
       return <Textarea title='其他史' boxMark='3'
                        isRead={isRead}

src/components/PrintPreview/index.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { getAllDataList, getAllDataStringList } from '@utils/tools';
+import { getAllDataList, getAllDataStringList,filterArr } from '@utils/tools';
 import style from "./index.less";
 import PreviewBody from "../PreviewBody";
 import store from '@store';
@@ -12,12 +12,9 @@ class PrintPreview extends Component {
         super(props)
     }
     surePrint(jsonStr){
-        if(JSON.parse(jsonStr.chief).length == 1 && JSON.parse(jsonStr.chief)[0].trim() ==''){
+        if(filterArr(JSON.parse(jsonStr.chief)) == ''){
           Notify.info('主诉不能为空');
             return false;
-        }else if(jsonStr.chief && JSON.parse(jsonStr.chief).length < 1){
-            Notify.info('主诉不能为空');
-            return false;
         }else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){
             Notify.info('诊断不能为空');
             return false;

src/components/PushContainer/index.less

@@ -5,14 +5,12 @@
   width: @push-width;
   float: right;
   padding-top: 20px;
-  position: absolute;
-  right: 10px;
   z-index: 200;
 
-  position: fixed;
-  top: 50px;
-  bottom: 10px;
-  right: 10px;
+  // position: fixed;     
+  // top: 50px;
+  // bottom: 10px;
+  // right: 10px;
   padding-bottom:50px;
 }
 .title{

src/components/RadioDrop/index.jsx

@@ -1,5 +1,5 @@
 import React,{Component} from 'react';
-import {handleEnter} from '@utils/tools.js';
+import {handleEnter,getPageCoordinate,windowEventHandler} from '@utils/tools.js';
 import {DropList} from '@commonComp';
 import style from "./index.less";
 import $ from "jquery";
@@ -22,7 +22,11 @@ class RadioDrop extends Component{
     super(props);
     this.state={
       editable:false,
-      timer:null
+      timer:null,
+      boxLeft:0,
+      boxTop:0,
+      tmpScroll:0,
+      tmpTop:0,
     };
     this.$cont = React.createRef();
     this.handleSelect = this.handleSelect.bind(this);
@@ -77,9 +81,20 @@ class RadioDrop extends Component{
         handleShow && handleShow({ikey,id:patId||id});
       }
     },300);
+    
     this.setState({
-      timer
+      timer,
+      boxLeft:getPageCoordinate(e).boxLeft,
+      boxTop:getPageCoordinate(e).boxTop,
+      tmpScroll: $("#addScrollEvent")[0].scrollTop,
+      tmpTop:getPageCoordinate(e).boxTop
     });
+    windowEventHandler('scroll',()=>{      //弹窗跟随滚动条滚动或者关闭弹窗
+      let scrollYs = $("#addScrollEvent")[0].scrollTop;
+      this.setState({
+        boxTop:this.state.tmpTop - scrollYs + this.state.tmpScroll
+      })
+    },$("#addScrollEvent")[0])
   }
   componentDidMount(){    //默认值选中
     const {data,ikey,handleSelect} = this.props;
@@ -120,6 +135,7 @@ class RadioDrop extends Component{
   }
   render(){
     const {data,prefix,suffix,placeholder,show,value} = this.props;
+    const {boxLeft,boxTop} = this.state;
     return <div className={style['container']} ref = {this.$cont}>
       {prefix}
       <div className={this.getClass()}
@@ -131,8 +147,7 @@ class RadioDrop extends Component{
         {value||placeholder}
       </div>
       {suffix}
-      <DropList onSelect={this.handleSelect} data={data}
-                show={show}/>
+      <DropList onSelect={this.handleSelect} data={data} left={boxLeft} top={boxTop} show={show}/>
     </div>
   }
 }

src/components/SearchDrop/index.jsx

@@ -1,5 +1,6 @@
 import React,{Component} from 'react';
 import classNames from 'classnames';
+import ReactDom from "react-dom";
 
 import style from "./index.less";
 /****
@@ -40,8 +41,8 @@ class SearchDrop extends Component{
   getStyle(){
     const {left,top} = this.props;
     return {
-      left:left?left:'',
-      top:top?top:''
+      left:left?left+'px':'',
+      top:top?top+'px':''
     }
   }
 
@@ -53,14 +54,17 @@ class SearchDrop extends Component{
   }
   render(){
     let litext = '';
-    return <div className={this.getClass()} contenteditable="false" id="searchBox" style={this.getStyle()}>
-      <ul>
-        {this.props.data&&this.props.data.map((it)=>{
-          litext = it.showType==1?it.name:it.name+'（'+it.retrievalName+'）';
-          return <li onClick={(e)=>this.handleSelect(e,it)} title={litext}>{litext}</li>
-        })}
-      </ul>
-    </div>
+    const domNode = document.getElementById('root');
+    return ReactDom.createPortal(
+      <div className={this.getClass()} contenteditable="false" id="searchBox" style={this.getStyle()}>
+        <ul>
+          {this.props.data&&this.props.data.map((it)=>{
+            litext = it.showType==1?it.name:it.name+'（'+it.retrievalName+'）';
+            return <li onClick={(e)=>this.handleSelect(e,it)} title={litext}>{litext}</li>
+          })}
+        </ul>
+      </div>
+    ,domNode)
   }
 }
 

src/components/SpreadDrop/index.jsx

@@ -2,8 +2,9 @@ import React,{Component} from 'react';
 import classNames from 'classnames';
 import config from '@config/index.js';
 import style from './index.less';
-import {deepClone,filterArr,handleEnter,isIE,filterDataArr} from '@utils/tools.js';
+import {deepClone,filterArr,handleEnter,isIE,getPageCoordinate,windowEventHandler,filterDataArr} from '@utils/tools.js';
 import {Notify} from '@commonComp';
+import ReactDom from "react-dom";
 import {getIds} from '@common/js/func.js';
 import $ from 'jquery';
 /****
@@ -35,8 +36,10 @@ class SpreadDrop extends Component{
       ban:{},  //放'伴'字段
       editable:false,      //双击编辑
       labelVal:'',  //存放标签原有的值--主诉字数限制用
-      boxLeft:null,
-      boxTop:null
+      boxLeft:0,
+      boxTop:0,
+      tmpScroll:0,
+      tmpTop:0,
     };
     this.$div = React.createRef();
     this.handleSelect = this.handleSelect.bind(this);
@@ -53,14 +56,26 @@ class SpreadDrop extends Component{
   }
   handleShow(e){//单击
     e&&e.stopPropagation();
-    let boxLeft = e.pageX -175 + 'px';
-    let offsetTop = e.target.offsetTop;
-    const ht = e.target.offsetHeight;   //如杂音选中文字有多行时，写死会遮挡
-    let boxTop = offsetTop + ht +2 + 'px';
+    // let boxLeft = e.pageX -175 + 'px';
+    // let offsetTop = e.target.offsetTop;
+    // const ht = e.target.offsetHeight;   //如杂音选中文字有多行时，写死会遮挡
+    // let boxTop = offsetTop + ht +2 + 'px';
+    // this.setState({
+    //   boxLeft:boxLeft,
+    //   boxTop:boxTop
+    // })
     this.setState({
-      boxLeft:boxLeft,
-      boxTop:boxTop
-    })
+      boxLeft:getPageCoordinate(e).boxLeft,
+      boxTop:getPageCoordinate(e).boxTop,
+      tmpScroll: $("#addScrollEvent")[0].scrollTop,
+      tmpTop:getPageCoordinate(e).boxTop
+    });
+    windowEventHandler('scroll',()=>{      //弹窗跟随滚动条滚动或者关闭弹窗
+      let scrollYs = $("#addScrollEvent")[0].scrollTop;
+      this.setState({
+        boxTop:this.state.tmpTop - scrollYs + this.state.tmpScroll
+      })
+    },$("#addScrollEvent")[0])
     // window.event? window.event.cancelBubble = true : e.stopPropagation();
      this.setStateInit();      //恢复初始选中状态
     const {ikey,handleShow,placeholder,flag,id,value,tagType,type} = this.props;
@@ -295,8 +310,44 @@ class SpreadDrop extends Component{
     }
     return style['tag'];
   }
+  
+  componentDidMount(){
+    if(isIE()){
+      $(this.$div.current).onIe8Input(function(e){
+        this.onChange(e)
+      },this);
+    }
+  }
+
+  render(){
+    const {placeholder,value,show,data} = this.props;
+    const {editable,boxLeft,boxTop} = this.state;
+    return  <div className={style['container']}
+              onFocus={(e)=>e.stopPropagation()}
+              onBlur={(e)=>e.stopPropagation()}
+              onInput={(e)=>e.stopPropagation()}>
+        <div
+        ref={this.$div}
+        onClick={this.handleShow}
+        className={this.getClass()}
+        contentEditable={editable}
+        onDoubleClick={this.changeToEdit}
+        onBlur={this.handleBlur}
+        onInput={this.onChange}
+        onkeydown={handleEnter}
+        >{value||placeholder}</div>
+          <ListItems data={data} left={boxLeft} 
+            top={boxTop} show={show} handleSelect={this.handleSelect} handleConfirm={this.handleConfirm} handleClear={this.handleClear} {...this.state}></ListItems>
+      </div>
+  }
+}
+
+class ListItems extends Component{
+  constructor(props){
+    super(props);
+  }
   getLabels(){
-    const {data} = this.props;
+    const {data,handleSelect} = this.props;
     let detail = [];
     let isSpecialPos = false;       //是否特殊位置（单行在上面，如无殊）
     let isExclu = false;      //是否与其他互斥
@@ -310,53 +361,39 @@ class SpreadDrop extends Component{
       }else{
         detail = it.questionDetailList;
       }
-      return <ListItem data={detail}
+      return <ListItem datas={detail}
                        isRadio={isRadio}
                        joint={it.joint}
                        listIndex={i}
                        isSpecialPos={isSpecialPos}
                        isExclu={isExclu}
-                       handleClick={this.handleSelect}
-                       {...this.state}></ListItem>;
+                       handleClick={handleSelect}
+                       {...this.props}></ListItem>;
     });
     return list;
   }
-  componentDidMount(){
-    if(isIE()){
-      $(this.$div.current).onIe8Input(function(e){
-        this.onChange(e)
-      },this);
+  getStyle(){
+    const {left,top,show} = this.props;
+    return {
+      left:left?left+'px':'',
+      top:top?top+'px':'',
+      display:show?'block':'none'
     }
   }
-
-  render(){
-    const {placeholder,value,show} = this.props;
-    const {editable,boxLeft,boxTop} = this.state;
-    return <div className={style['container']}
-            onFocus={(e)=>e.stopPropagation()}
-            onBlur={(e)=>e.stopPropagation()}
-            onInput={(e)=>e.stopPropagation()}>
-      <div
-      ref={this.$div}
-      onClick={this.handleShow}
-      className={this.getClass()}
-      contentEditable={editable}
-      onDoubleClick={this.changeToEdit}
-      onBlur={this.handleBlur}
-      onInput={this.onChange}
-      onkeydown={handleEnter}
-      >{value||placeholder}</div>
-      <div className={style["drop-list"]} style={{display:show?'block':'none',top:boxTop,left:boxLeft}} contentEditable="false" onClick={(e)=>{e.stopPropagation();}}>
+  render (){   
+    const {handleClear,handleConfirm} = this.props;
+    const domNode = document.getElementById('root');
+    return ReactDom.createPortal(
+      <div className={style["drop-list"]} style={this.getStyle()} contentEditable="false" onClick={(e)=>{e.stopPropagation();}}>
         {this.getLabels()}
         <div className="oper">
-          <span className={style['clear']} onClick={this.handleClear}>清空选项</span>
-          <span className={style['confirm']} onClick={this.handleConfirm}>确定</span>
+          <span className={style['clear']} onClick={handleClear}>清空选项</span>
+          <span className={style['confirm']} onClick={handleConfirm}>确定</span>
         </div>
       </div>
-    </div>
+    ,domNode)
   }
 }
-
 class ListItem extends Component{
   constructor(props){
     super(props);
@@ -365,6 +402,7 @@ class ListItem extends Component{
     e.stopPropagation();
     // window.event? window.event.cancelBubble = true : e.stopPropagation();
     const {handleClick,isExclu,isRadio,data,exists,noneIds,withs,joint,listIndex} = this.props;
+
     const index=listIndex+''+i;
     //列单选处理
     if(isRadio){
@@ -406,16 +444,14 @@ class ListItem extends Component{
     }
   }
   render(){
-    const {data,isSpecialPos} = this.props;
+    const {datas,isSpecialPos} = this.props;
     const pos = isSpecialPos?style['independent']:'';
     return <ul className={classNames(style['row'],pos)} onBlur={(e)=>e.stopPropagation()}>
-      {data&&data.map((it,i)=>{
-        /*return <li onClick={(e)=>this.handleClick(e,it,i)}
-                   className={this.getClass(it.id)}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>*/
-          return <li onClick={(e)=>this.handleClick(e,it,i)} className={this.getClass(it.id)} title={it.name.length>8?it.name:''}>{it.name&&it.name.length>8?it.name.slice(0,8)+'...':it.name}</li>
+      {datas&&datas.map((it,i)=>{
+        return <li onClick={(e)=>this.handleClick(e,it,i)}
+                   className={this.getClass(it.id)}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>
       })}
     </ul>;
   }
-
 }
 export default SpreadDrop;

src/components/Treat/DrugTreat/index.jsx

@@ -76,7 +76,7 @@ class DrugTreat extends Component {
                 {treatment.map((item, index) => {
                     return(<div className={style['drug-content']}>
                         <div  className={style['drug-name-box']}>
-                            {index + 1 + '. ' }{item.drugsName}:&nbsp;
+                            <span>{index + 1 + '. ' }{item.bigdrugsName}<span>({item.subdrugsName})</span>:&nbsp;</span>
                             {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 ? '' : ', '}

src/containers/eleType.js

@@ -19,7 +19,7 @@ import Multiple from '@containers/Multiple';
 //单选类型
 export function singleRadio(params){
   const data = params.item;//console.log(111,data);
-  const {i,hideTag,boxMark,showArr,selecteds} = params;
+  const {i,hideTag,boxMark,showArr,selecteds,boxTop,boxLeft} = params;
   const showInx = boxMark+i+'0';    //单括号多标签的情况下需要识别同一个标签内多个下拉组件的显示状态
   switch (+data.controlType){
     case 0:
@@ -34,6 +34,8 @@ export function singleRadio(params){
                         boxMark={boxMark}
                         id={data.id}
                         ikey={showInx}
+                        boxTop={boxTop}
+                        boxLeft={boxLeft}
                         hideTag={hideTag}></RadioDrop>;
     case 2:
       const dataList = data.questionDetailList&&data.questionDetailList.length>0?data.questionDetailList:data.questionMapping;

src/store/reducers/checkBody.js

@@ -13,7 +13,8 @@ const initState = {
                 searchData:[],
                 selecteds:[],
                 focusIndex:'',
-                isEmpty:true      //是否为空白，需要请求数据
+                isEmpty:true,      //是否为空白，需要请求数据
+                showSearchBox:false
           };
 export default function(state=initState,action){
   let res = Object.assign({},state);

src/utils/tools.js

@@ -520,11 +520,20 @@ function preventDefault(event) {
 }
 
 //ie8添加解除事件兼容
-function windowEventHandler(type,func){
-    if(window.addEventListener){
-      window.addEventListener(type, func);
+function windowEventHandler(type,func,dom){
+    let win = dom?dom:window;
+    if(win.addEventListener){
+      win.addEventListener(type, func);
     }else{
-      window.attachEvent('on'+type,func);
+      win.attachEvent('on'+type,func);
+    }
+}
+function windowRemoveEventHandler(type,func,dom){
+    let win = dom?dom:window;
+    if(win.addEventListener){
+      win.removeEventListener(type, func);
+    }else{
+      win.detachEvent('on'+type,func);
     }
 }
 
@@ -615,6 +624,18 @@ function normalVal(min,max){
       return null;
   }
 }
+function getPageCoordinate(event){
+    let e = event || window.event;
+    var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+    var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+    var x = e.pageX || (e.clientX + scrollX);
+    var y = (e.pageY+25) || (e.clientY + scrollY + 25);
+    let obj = {
+      boxLeft : x ,
+      boxTop : y
+    }
+    return obj;
+}
 module.exports = {
     checkType: Type.checkType,
     regexp,
@@ -638,5 +659,7 @@ module.exports = {
     getEMRParams,
     windowEventHandler,
     isAllClear,
-    normalVal
+    normalVal,
+    getPageCoordinate,
+    windowRemoveEventHandler
 };