Squashed commit of the following:

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 50769d9e8a9845954a58145e5b7041b131729b67
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Feb 20 15:59:38 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 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/common/components/EditableSpan/index.jsx

@@ -3,6 +3,7 @@ import style from './index.less';
 import config from "@config/index";
 import {filterArr,isIE} from '@utils/tools.js';
 import Notify from '../Notify/index.js';
+import classNames from 'classnames';
 
 import $ from 'jquery';
 /*****
@@ -88,7 +89,9 @@ class EditableSpan extends Component{
       isEnd = !(newText.indexOf(searchPre)>0);
       search = temp.replace(/[(^\s*)|(\s*$)|(^\,*)|(\,*$)]/g,'');
       //console.log(labelVal,'旧：',searchPre,'新：',newText,'搜索：',search);
-      handleSearch&&handleSearch({text:search,isEnd,boxMark,mainIds});
+      if(config.punctuationReg.test(search)){     //只有标点符号时不搜索
+        handleSearch&&handleSearch({text:search,isEnd,boxMark,mainIds});
+      }
       //搜索后保持现在的值，继续输入时要用于对比
       that.setState({
         searchPre:newText
@@ -155,7 +158,7 @@ class EditableSpan extends Component{
       // 主诉现病史去重：删除最后一个字的时候移除该数据（将name、id和value替换成空）并移除id
       // 前面是标签，内容为空时再删一次才移除标签；前面是文本，则直接移除；
       let preObj = $(this.$span.current).prev();
-      if(index!==0 && preVal.trim().length==1){
+      if(index!==0&&preVal.trim().length==1){
           removeId && removeId({boxMark,i:index,text:""});
           if(preObj[0].nodeName !=="DIV"){
             this.moveEnd(preObj[0]);
@@ -177,12 +180,6 @@ class EditableSpan extends Component{
       }
     }
   }
-  /*shouldComponentUpdate(next){
-    if(JSON.stringify(next) == JSON.stringify(this.props)){
-      return false;
-    }
-    return true;
-  }*/
   componentWillReceiveProps(next){
     const isRead = this.props.isRead;
     if(next.isRead != isRead){
@@ -201,8 +198,17 @@ class EditableSpan extends Component{
     }
   }
 
+  getClass(){
+    const {full,value,saveText,i} = this.props;
+    const preSelected = saveText[i-1];
+    const isFull = full?' '+style['full']:'';       //是否宽度设为整行宽度
+    //有标点符号之外的字符或者前一个标签有选中值时，显示为黑色，否则灰显
+    const unselect = value.match(config.punctuationReg)||preSelected?'':style['unselect'];
+    return classNames(style['editable-span'],isFull,unselect);
+  }
+
   render() {
-    return <span className={style['editable-span']+(this.props.full?' '+style['full']:'')}
+    return <span className={this.getClass()}
                       contentEditable='true'
                       ref={this.$span}
                       onInput={this.onChange}

src/common/components/EditableSpan/index.less

@@ -1,3 +1,4 @@
+@import "~@less/variables.less";
 .editable-span{
   display: inline-block;
   outline: none;
@@ -11,4 +12,7 @@
 }
 .full{
   width: 100%;
+}
+.unselect{
+  color: @placeholder-color;
 }

src/common/js/func.js

@@ -66,7 +66,7 @@ export const strTrim = (str) =>{
 };
 
 //获取组合组件已填文字填入saveText
-function getSaveText(data){console.log(data)
+function getSaveText(data){//console.log(data)
   const arr = data.questionMapping.map((it)=>{
     return it.value?(it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||''):'';
   });

src/common/less/variables.less

@@ -164,5 +164,5 @@
 }
 
 .borderd{
-   border:1px #3B9ED0 solid;
+   border:1px #000 solid;
  }

src/components/CheckBody/index.jsx

@@ -63,7 +63,7 @@ class CheckBody extends Component{
       return ;
     }
     //有主诉时且本身无数据，第一次点击获取数据，(不论获取成功与否)再点击不获取（直到刷新成空白页或清空）
-    if(hasMain&&isEmpty!=false){
+    if(hasMain&&isEmpty!=false&&!hasData){
       this.props.getInit();
     }
   }

src/components/CopyRight/index.less

@@ -21,6 +21,7 @@
       }
       a{
         text-decoration: none;
+        font-size: 12px;
       }
       b{
         font-size: 12px;

src/components/OtherHistory/index.jsx

@@ -57,14 +57,6 @@ class OtherHistory extends Component{
     }
     //智能模式有主诉或者文本模式获取最近历史
     setInitData();
-
-    //回读后容器框要不可编辑，否则自由文本标签onInput,onFocus事件失效（原因未知）
-    /*if(data.length>0){
-       this.setState({
-         editable:false
-       });
-      changeEditClear(false)
-    }*/
   }
   handleClick(e){//让搜索框跟随鼠标点击移动
     //e.stopPropagation();

src/components/PreviewBody/index.jsx

@@ -107,60 +107,61 @@ class PreviewBody extends Component {
     }
     render() {
         const { show, preInfo, dataJson, dataStr,baseObj } = this.props;
-
+        const infoNull = JSON.stringify(preInfo) == '{}';
+        console.log(dataStr,baseObj)
         return <div className={style['content']}>
             <div className={style['contents']} id="content" style={{margin:"0 auto"}}>
-                <div ref={this.$content} style={{ clear: 'both', fontSize: '24px', margin: '0px 0px 30px 0px',textAlign:'center' }}>{preInfo.hospitalName}</div>
-                <table className={style['patInfo']} style={{ margin: '0px 0px 30px 0px', borderCollapse: 'collapse', width: "100%" }}>
+                <div ref={this.$content} className={style['hisName']}>{preInfo.hospitalName}</div>
+                <table className={style['patInfo']}>
                     <tr>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>卡号：{baseObj?baseObj.patientIdNo:JSON.stringify(preInfo) == '{}'?'':preInfo.patientIdNo}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>姓名：{baseObj?baseObj.patientName:JSON.stringify(preInfo) == '{}'?'':preInfo.patientName}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>年龄：{baseObj?baseObj.patientAge:JSON.stringify(preInfo) == '{}'?'':preInfo.patientAge}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>性别：{baseObj?baseObj.patientSex:JSON.stringify(preInfo) == '{}'?'':preInfo.patientSex}</td>
+                        <td>卡号：{baseObj?baseObj.patientIdNo:infoNull?'':preInfo.patientIdNo}</td>
+                        <td >姓名：{baseObj?baseObj.patientName:infoNull?'':preInfo.patientName}</td>
+                        <td >年龄：{baseObj?baseObj.patientAge:infoNull?'':preInfo.patientAge}</td>
+                        <td >性别：{baseObj?baseObj.patientSex:infoNull?'':preInfo.patientSex}</td>
                     </tr>
                     <tr>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>就诊时间：{baseObj?baseObj.inquiryDate:(JSON.stringify(preInfo) == '{}'?'':preInfo.systemTime.split(' ')[0])}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>科室：{baseObj?baseObj.hospitalDeptName:(JSON.stringify(preInfo) == '{}'?'':preInfo.hospitalDeptName)}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>医生：{baseObj?baseObj.doctorName:(JSON.stringify(preInfo) == '{}'?'':preInfo.doctorName)}</td>
-                        <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>门诊号：{baseObj?baseObj.inquiryCode:(JSON.stringify(preInfo) == '{}'?'':preInfo.recordId)}</td>
+                        <td>就诊时间：{baseObj?baseObj.inquiryDate:(infoNull?'':preInfo.systemTime.split(' ')[0])}</td>
+                        <td>科室：{baseObj?baseObj.hospitalDeptName:(infoNull?'':preInfo.hospitalDeptName)}</td>
+                        <td>医生：{baseObj?baseObj.doctorName:(infoNull?'':preInfo.doctorName)}</td>
+                        <td>门诊号：{baseObj?baseObj.inquiryCode:(infoNull?'':preInfo.recordId)}</td>
                     </tr>
                 </table>
-                <table style={{width:"100%"}}>
+                <table>
                     <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>主诉：</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px' }}>
+                        <td className={style['title']}>主诉：</td>
+                        <td className={style['text']}>
                             {
                                 filterDataArr(JSON.parse(dataStr.chief))
                             }
                         </td>
                     </tr>
                     <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>现病史：</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px'  }}>
+                        <td className={style['title']}>现病史：</td>
+                        <td className={style['text']}>
                             {
                                 filterDataArr(JSON.parse(dataStr.present))
                             }
                         </td>
                     </tr>
                     <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>其他史：</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px'  }}>
+                        <td className={style['title']}>其他史：</td>
+                        <td className={style['text']}>
                             {
                                 filterDataArr(JSON.parse(dataStr.other))
                             }
                         </td>
                     </tr>
                     <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>查体：</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px'  }}>
+                        <td className={style['title']}>查体：</td>
+                        <td className={style['text']}>
                             {
                                 filterDataArr(JSON.parse(dataStr.vital))
                             }
                         </td>
                     </tr>
                     <tr style={{ verticalAlign: 'top',width:'100%',overflow:"hidden" }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>化验：</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',maxWidth:'650px'}}>
+                        <td className={style['title']}>化验：</td>
+                        <td className={style['text']}>
                             {/* <table style={{ width: '100%' }}> */}
                                 {
                                     dataJson.lis.getExcelDataList && dataJson.lis.getExcelDataList.map((items)=>{
@@ -211,8 +212,8 @@ class PreviewBody extends Component {
                         </td>
                     </tr>
                     <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>辅检：</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px' }}>
+                        <td className={style['title']}>辅检：</td>
+                        <td className={style['text']}>
                             {
                                 dataStr.pacs && dataStr.pacs != '' && dataStr.pacs.split(';').map((item)=>{
                                     return <div style={{ fontSize: '14px' }}>{item}</div>
@@ -221,8 +222,8 @@ class PreviewBody extends Component {
                         </td>
                     </tr>
                     <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>诊断：</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px',lineHeight:'18px' }}>
+                        <td className={style['title']}>诊断：</td>
+                        <td className={style['text']}>
                             {
                                 dataStr.diag && dataStr.diag != '' && dataStr.diag.split(';').map((item)=>{
                                     return <div style={{ fontSize: '14px'}}>{item}</div>
@@ -231,8 +232,8 @@ class PreviewBody extends Component {
                         </td>
                     </tr>
                     <tr style={{ verticalAlign: 'top' }}>
-                        <td style={{ width: 70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px' }}>医嘱：</td>
-                        <td style={{ fontSize: '14px', padding: '0px 0px 16px 0px' }}>
+                        <td className={style['title']}>医嘱：</td>
+                        <td className={style['text']}>
                             {
                                 dataJson.advice.assay && dataJson.advice.assay.length > 0 || dataJson.advice.check && dataJson.advice.check.length > 0 ? <p style={{fontSize:'14px',marginBottom:"8px"}}>开单项目</p> : ''
                             }

src/components/PreviewBody/index.less

@@ -6,14 +6,39 @@
       top:120px;
       width: 820px;
       padding: 0 40px 60px 40px;
+      .hisName{
+        clear: both;
+        font-size: 24px;
+        margin: 0px 0px 30px 0px;
+        text-align:center;
+      }
       .contents {
         position: relative;
         padding-bottom: 26px;
+        table{
+          width: 100%;
+          .title{
+            width: 70px;
+            text-align: right;
+            padding: 0px 5px 16px 0px;
+            font-size: 14px;
+          }
+          .text{
+            font-size: 14px;
+            padding: 0px 0px 16px 0px;
+            line-height:18px;
+            max-width: 650px;
+          }
+        }
       }
     }
     .patInfo {
+      margin: 0px 0px 30px 0px;
+      border-collapse: collapse;
       td {
         border: 1px solid #aaa;
+        padding: 8px 10px;
+        width: 25%;
       }
     }
   

src/components/PushItems/DetailsModal/index.jsx

@@ -2,33 +2,82 @@ import React, { Component } from "react";
 import styles from "./index.less";
 import NewPortal from './NewPortal'
 import close from "./../img/close.png";
+import $ from "jquery";
 class DetailsModal extends Component {
     constructor(props) {
         super(props);
+        this.state = {
+            currentIndex: 0
+        }
         this.hideTips = this.hideTips.bind(this)
     }
     hideTips() {
         const { hideTips } = this.props;
         hideTips && hideTips();
     }
+    handleClickMenu(index, item, tipsDetails) {
+        const that = this
+        setTimeout(function(){
+            that.setState({
+                currentIndex: index
+            })
+        },0)
+        
+        let scrollTop = 0
+        tipsDetails.introduceDetailList.map((it, ii) => {
+            if( ii < index) {
+                scrollTop = scrollTop + parseInt($('#' + it.title).css('height'))
+            }
+        })
+        $('#detailsContent').scrollTop(scrollTop)
+    }
+    handleScrollModal(tipsDetails) {
+        const scrollTop = $('#detailsContent').scrollTop()
+        let divHeight = 0;
+        for (let i = 0; i < tipsDetails.introduceDetailList.length; i++) {
+            divHeight = divHeight + parseInt($('#' + tipsDetails.introduceDetailList[i].title).css('height'))
+            if(divHeight > scrollTop) {
+                this.setState({
+                    currentIndex: i
+                })
+                return
+            }
+        }
+    }
+    
+    
 
     render() {
         const {showTipsDetails, tipsDetails} = this.props;
+        const { currentIndex } = this.state
         const imageUrlPrefix = 'http://192.168.2.241:82'; //图片服务器地址
         return (<NewPortal visible={showTipsDetails}>
         <div className={styles['details-wrapper']}>
            <div className={styles['details-content-wrapper']}>
                 <h1 className={styles['details-content-name']} >{tipsDetails && tipsDetails.name} <img className={styles['details-close']} onClick={this.hideTips} src={close} /></h1>
-                <div className={styles['details-content']}>
+                <div className={styles['details-content']} id= 'detailsContent' onScroll={this.handleScrollModal.bind(this, tipsDetails)}>
                     {tipsDetails && tipsDetails.introduceDetailList && tipsDetails.introduceDetailList.map((item, index) => {
-                        return (<div>
-                            <div className={styles['details-content-title-box']}>
+                        return (<div id={item.title}>
+                            <div className={styles['details-content-title-box']} >
                                 <span className={styles['details-content-title-name']}>{item.title}</span>
                                 <div className={styles['details-content-title-line']}></div>
                             </div>
                             <div dangerouslySetInnerHTML ={{__html: item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix)}}></div>
                         </div>)
                     })}
+                    
+                </div>
+                <div className={styles['content-menu']}>
+                    {tipsDetails && tipsDetails.introduceDetailList && tipsDetails.introduceDetailList.map((item, index) => {
+                            return (<div>
+                                <div className={styles['details-menu-title-box']}>
+                                    {index === 0 ? '' : <div className={styles['details-content-menu-line']}></div>}
+                                    <span onClick={this.handleClickMenu.bind(this, index, item, tipsDetails)} className={styles['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
+                                        <span className={styles['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
+                                    </span>
+                                </div>
+                            </div>)
+                        })}
                 </div>
            </div>
            <div className={styles['details-mask']}>

src/components/PushItems/DetailsModal/index.less

@@ -15,6 +15,7 @@
     left: 10%;
     top: 10%;
     background: #fff;
+    overflow: hidden;
     z-index: 10;
 }
 
@@ -55,10 +56,41 @@
     right: 0;
 }
 .details-content {
+    position: relative;
     height: 100%;
-    padding: 0 40px;
+    padding: 0 180px 0 40px;
     overflow-y: auto;
 }
+.content-menu {
+    position: absolute;
+    top: 50px;
+    right: 20px;
+    background: #eee;
+    border: 1px solid #eee;
+    width: 160px;
+    padding: 15px 18px;
+}
+.details-content-menu-line {
+    height: 15px;
+    width: 0;
+    border: 1px solid #ccc;
+    background-color: #ccc;
+    margin-left: 4px
+}
+.details-content-menu-name {
+    color: #33475f;
+    font-size: 13px;
+}
+.details-content-menu-circle {
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    margin-top: 5px;
+    background-color: #eee;
+    margin-right: 10px;
+}
 .details-mask {
     position: fixed;
     width: 100%;

src/components/RadioDrop/index.jsx

@@ -104,6 +104,7 @@ class RadioDrop extends Component{
    // 更改标签的value值
     const ev = e || window.event;
     let changeVal = ev.target.innerText;
+    ev.target.innerText = '';
     handleLabelEdit && handleLabelEdit({ikey,changeVal,type:boxMark});
   }
   handledbClick(e){

src/components/Treat/DrugTreat/index.jsx

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import style from './index.less';
 import info from './../img/info.png';
+import info1 from './../img/info1.png';
 import drugIcon from './../img/drug.png';
 import more from '@common/images/addItem1.png';
 import $ from "jquery";
@@ -8,16 +9,31 @@ import $ from "jquery";
 class DrugTreat extends Component {
     constructor(props) {
         super(props);
+        this.state = {
+            currentImg: -1
+        }
         this.handleSelect = this.handleSelect.bind(this);
         this.setOtherRecommend = this.setOtherRecommend.bind(this);
         this.setDrugInfo = this.setDrugInfo.bind(this);
         this.showTreatDesc = this.showTreatDesc.bind(this);
+        this.handleMouseLeaveImg = this.handleMouseLeaveImg.bind(this)
     }
 
     handleSelect(index,ii) {
         const { selectDrug } = this.props;
         selectDrug && selectDrug(index,ii);
     }
+    handleMouseEnterImg(ii, index) {
+        this.setState({
+            currentIndex: index,
+            currentImg: ii
+        })
+    }
+    handleMouseLeaveImg() {
+        this.setState({
+            currentIndex: -1,
+        })
+    }
     setOtherRecommend(item, index) {
         this.showTreatDesc();
         const { setOtherRecommend } = this.props;
@@ -38,6 +54,7 @@ class DrugTreat extends Component {
 
     render(){
         const { treatment,showDrugInfo } = this.props
+        const { currentImg, currentIndex } = this.state
         return(
             treatment && treatment.length > 0 && <div className={style['drug-box']}>
                 <h3 className={style['drug-title']}><img className={style['drug-icon']} src={drugIcon}/> 常用药物治疗</h3>
@@ -53,7 +70,11 @@ class DrugTreat extends Component {
                                             onClick={()=>{it.forbidden === '2' ? '' : this.handleSelect(index,ii)}} style={it.selected ? {color: '#3B9ED0', borderBottom: '1px solid #3B9ED0'}:''}>
                                             {it.medicitionName}
                                         </span>
-                                        {<img className={style['info-img']} src={info} onClick={() =>{this.setDrugInfo(it);showDrugInfo();}}/>}
+                                        {<img className={style['info-img']}    
+                                              src={currentIndex === index ? (ii === currentImg ? info1 : info) : info} 
+                                              onMouseEnter={this.handleMouseEnterImg.bind(this, ii, index)}
+                                              onMouseLeave = {this.handleMouseLeaveImg}
+                                              onClick={() =>{this.setDrugInfo(it);showDrugInfo();}}/>}
                                         {it.forbidden === '1' ? <span className={style['info-flag']} style={{border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: it.forbidden === '2' ? <span className={style['info-flag']} style={{border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''}, 使用率{it.rate}
                                         
                                     </span>)

src/components/Treat/DrugTreat/index.less

@@ -23,6 +23,7 @@
 .info-img {
     width: 12px;
     margin: 0 3px -1px;
+    cursor: pointer;
 }
 .info-flag {
     display: inline-block;

src/components/TreatDesc/index.jsx

@@ -3,15 +3,30 @@ import style from './index.less';
 import $ from "jquery";
 import close from './img/close.png';
 import info from './img/info.png';
+import info1 from './img/info1.png';
 
 
 class TreatDesc extends Component {
     constructor(props){
         super(props);
+        this.state = {
+            currentIndex: -1
+        }
         this.hideTreatDesc = this.hideTreatDesc.bind(this);
         this.handleSelect= this.handleSelect.bind(this);
+        this.handleMouseLeaveImg = this.handleMouseLeaveImg.bind(this)
     }
 
+    handleMouseEnterImg(index) {
+        this.setState({
+            currentIndex: index,
+        })
+    }
+    handleMouseLeaveImg() {
+        this.setState({
+            currentIndex: -1,
+        })
+    }
     handleSelect(index,ii) {
         const { selectDrug } = this.props;
         selectDrug && selectDrug(index,ii);
@@ -25,6 +40,7 @@ class TreatDesc extends Component {
     render(){
         const  { treatment, treatDesc, setDrugInfo, showDrugInfo} = this.props
         const { title, basic, otherDrugIndex, drugDesc} = treatDesc
+        const { currentIndex } = this.state
         return (treatment && treatment.length >0 && <div  className={style['treat-desc-box']}>
             
             {title && title === '药品推荐' ? <div className={style['similar-drug-box']} id='treatDescBox'>
@@ -50,7 +66,11 @@ class TreatDesc extends Component {
                             </span>
                         </span>              
                         
-                        {<img  onClick={() =>{setDrugInfo(item);showDrugInfo();}}  className={style['info-img']} src={info} />}
+                        {<img className={style['info-img']}    
+                            src={currentIndex === index ? info1 : info} 
+                            onMouseEnter={this.handleMouseEnterImg.bind(this, index)}
+                            onMouseLeave = {this.handleMouseLeaveImg}
+                            onClick={() =>{setDrugInfo(item);showDrugInfo();}}/>}
                         {item.forbidden === '1' ? <span className={style['info-flag']} style={{border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: item.forbidden === '2' ? <span className={style['info-flag']} style={{border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''}, 使用率{item.rate}
                         
                     </span>)

src/components/TreatDesc/index.less

@@ -59,6 +59,7 @@
 .info-img {
     width: 12px;
     margin: 0 3px -1px;
+    cursor: pointer;
 }
 .info-flag {
     display: inline-block;

src/config/index.js

@@ -30,6 +30,7 @@ export default {
     delayTime:500,      //延迟搜索的时间
     delayPushTime:1000,    //延迟推送时间
     pushDelay:1000,
+    punctuationReg:/[^,，.。；;、]/g,       //正则表达式，全局查找不是括号内标点的字符
     currentText:"患者XX因XX诊断为(**)，经XX治疗后，目前XX症状已缓解，仍有XX，各项指标情况：XX，辅助检查：XX。今来复诊，进一步治疗",
     timeUnit:{
       minute:"分",

src/containers/CurrentIll.js

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

src/containers/eleType.js

@@ -139,7 +139,7 @@ export default function(params){
     case 8:
       // return <EditableSpan {...params} value={data.value||data.name} update={Math.random()}/>;
       // 删除后value为空，应展示空而不是name
-      return <EditableSpan {...params} value={data.value||data.value==''?data.value:data.name} full={data.full} update={Math.random()}/>;
+      return <EditableSpan {...params} value={data.value||data.value==''?data.value:data.name} full={data.full}/>;
     case 11://推送类型
       return multCheckLabels(params,data.tagType);
     default:

src/store/async-actions/diagnosticSearch.js

@@ -8,9 +8,9 @@ export const getSearchResult = (value) =>{
         const url = '/api/icss/retrieval/getTagInfos'
         const param={
             type: 7,
-            age: 44,
+            age: state.patInfo.message.patientAge,
             inputStr: value,
-            sexType: 1
+            sexType: state.patInfo.message.sex
         }
         if(value === state.diagnosticSearch.searchValue) {
             return
@@ -19,6 +19,14 @@ export const getSearchResult = (value) =>{
                 type: SET_SEARCH_VALUE,
                 searchValue: value
             })
+            //如果搜索值为空，则直接将搜索结果设为空
+            if(value === '') {
+                dispatch({
+                    type: GET_SEARCH_RESULT,
+                    searchResult: []
+                })
+                return
+            }
             json(url, param).then((data)=>{
                 const searchRes = data.data.data;
                 const diagList = state.diagnosticList.diagnosticList;

src/store/async-actions/fetchModules.js

@@ -71,6 +71,7 @@ export const getOtherHisRecord = ()=>{
         const objStr = JSON.parse(data.otherStr||'[]');
         let arr = [];
         if((!obj||!obj.other||obj.other.length==0)&&!objStr[0]){        //无其他史历史记录用默认模板
+          //console.log('其他史最近数据无')
           //arr = state.homePage.initData.otherHis;
         }else{
           arr = obj.other;

src/store/async-actions/homePage.js

@@ -56,7 +56,7 @@ export const getInitModules= (dispatch,getStore)=>{
           emptyData:initData.currentEmpty,//现病史空模板
           saveEmpty:initSaveText.currentEmpty,
         });
-        dispatch(getOtherHisRecord());        //获取其他史最近记录
+        dispatch(getOtherHisRecord());          //获取其他史最近记录
         initHis(dispatch)
       }else{
         initHis(dispatch)

src/utils/tools.js

@@ -480,6 +480,9 @@ function filterDataArr(arrTmp){   //数据处理
     let tmpArr = [];
     let arr = arrTmp.join('').split('');
     for(let i = 0;i < arr.length;i++){
+        if(!(arr[i].match(config.punctuationReg)||arr[i-1])){        //只有标点符号或者前一个标签无值是（说明本标点灰显，不显示在预览中）
+            arr.splice(i,1,'');
+        }
         if(arr[i] && arr[i].indexOf('undefined') == -1){
             if(tmpArr[tmpArr.length-1] != '，' && tmpArr[tmpArr.length-1] != ',' ){
                 tmpArr.push(arr[i])