Squashed commit of the following:

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

src/common/components/ConfirmModal/index.jsx

@@ -134,20 +134,20 @@ class ConfirmModal extends Component {
                         <div className={styles['modal-content']}>{children}</div>
                         {noFooter ? '' : <div className={styles['modal-operator']+' clearfix'}>
                             <div className={styles['modal-btn-box']}>
-                                <button 
+                                <div 
                                     onClick={this.confirm} 
                                     className={styles['modal-operator-confirm']}
                                     style={{borderColor: okBorderColor, background: oKBg, color: okColor}}>
                                     { okText}
-                                </button>
+                                </div>
                             </div>
                             <div className={styles['modal-btn-box']}>
-                                <button 
+                                <div 
                                 onClick={this.cancel} 
                                 className={styles['modal-operator-close']}
                                 style={{borderColor: cancelBorderColor, background: cancelBg, color: cancelColor}}>
                                 { cancelText}
-                            </button>
+                            </div>
                             </div>
                         </div>}
                     </div>

src/common/components/ConfirmModal/index.less

@@ -46,7 +46,7 @@
     outline: none;
     margin: auto;
     height: 34px;
-    line-height: 24px;
+    line-height: 32px;
     opacity: 1;
     color: #fff;
     cursor: pointer;

src/common/components/InspectCommon/index.less

@@ -8,9 +8,8 @@
     min-width: 300px;
     max-width: 600px;
     box-sizing: border-box;
-    box-shadow: 0 6px 20px 0 #989DA3;
     margin-bottom: 80px;
-    // border: 1px solid #989DA3;
+    .llStyle;
 }
 .btnWrap{
     span {

src/common/components/SearchOption/index.jsx

@@ -18,6 +18,8 @@ class SearchOption extends React.Component {
         }
         this.textInput = React.createRef();
         this.handleClearVal = this.handleClearVal.bind(this);
+        this.handleFocus = this.handleFocus.bind(this);
+        this.handleBlur = this.handleBlur.bind(this);
     }
     
     /*componentWillReceiveProps(nextProps){
@@ -46,9 +48,34 @@ class SearchOption extends React.Component {
         });
         handleChangeValue('');
     }
-
+    handleInput(e){
+      const { handleChangeValue } = this.props;
+      if((e.target.value).trim() != ''){
+          handleChangeValue(e.target.value);
+          this.setState({
+              val:e.target.value,
+              show:true
+          })
+      }else{
+          // this.handleClearVal()
+          this.setState({
+              show:false
+          })
+          return;
+      }
+    }
+    handleFocus(){
+      if(this.state.val.trim() != ''){
+        return;
+      }else{
+          this.setState({border:true})
+      }
+    }
+    handleBlur(){
+      this.setState({border:false,val:''})
+    }
     render() {
-        const { handleChangeValue,children,visible } = this.props;
+        const { children,visible } = this.props;
         const { show } = this.state;
         return (
             <div id="searchOption" className={visible?`${styles.search} ${styles.show} searchOption`:`${styles.search} ${styles.hide} searchOption`}>
@@ -59,26 +86,13 @@ class SearchOption extends React.Component {
                     type="text"
                     maxLength="30"
                     ref={this.textInput}
-                    onFocus={()=>{
-                        if(this.state.val.trim() != ''){
-                            
-                        }else{
-                            this.setState({border:true})
-                        }
+                    onFocus={this.handleFocus}
+                    onBlur={this.handleBlur}
+                    onInput={(e) => { 
+                        this.handleInput(e)
                     }}
-                    onBlur={()=>{this.setState({border:false,val:''})}}
-                    onKeyUp={(e) => { 
-                        if((e.target.value).trim() != ''){
-                            handleChangeValue(e.target.value);
-                            this.setState({
-                                val:e.target.value,
-                                show:true
-                            })
-                        }else{
-                            this.setState({
-                                show:false
-                            })
-                        }
+                    onPropertyChange={(e) => {  // 兼容ie
+                        this.handleInput(e)
                     }}
                     placeholder="搜索"
                 />

src/common/components/SearchOption/index.less

@@ -8,8 +8,8 @@
     top: 40px;
     z-index: 99;
     background-color: #fff;
-    box-shadow: 0 6px 20px 0 #989DA3;
     margin-bottom: 80px;
+    .llStyle;
     .autoList {
         max-height: 225px;
         min-height: 80px;
@@ -47,4 +47,4 @@
 }
 .hide {
     display: none;
-}
+}

src/common/js/func.js

@@ -65,9 +65,12 @@ export const strTrim = (str) =>{
   return str.replace(/&nbsp;|<div>|<\/div>|<br>|\s/g,'');
 };
 
-//获取已填文字填入saveText
-function getSaveText(arr){
-
+//获取组合组件已填文字填入saveText
+function getSaveText(data){console.log(data)
+  const arr = data.questionMapping.map((it)=>{
+    return it.value?(it.labelPrefix||'')+(it.value||'')+(it.labelSuffix||''):'';
+  });
+  return arr.join('');
 }
 
 //添加自由文本标签
@@ -102,8 +105,12 @@ export const fullfillText = (arr,noPre=false,noEnd=false,ifEmpty=true)=>{
         saveText.push('');
       }
       newArr.push(it);
-      tempText = value?it.labelPrefix+value+it.labelSuffix:'';
-      tempText = notText?tempText:it.value||it.name;
+      if(it.tagType != 3){
+        tempText = value?it.labelPrefix+value+it.labelSuffix:'';
+        tempText = notText?tempText:it.value||it.name;
+      }else{
+        tempText = getSaveText(it);
+      }
       saveText.push(tempText);
     }else{
       pre = arr[i-1];
@@ -111,7 +118,11 @@ export const fullfillText = (arr,noPre=false,noEnd=false,ifEmpty=true)=>{
       if(notTextLabel(pre)&&notText){
           // newArr.push(textLabel,it);
           ifEmpty?newArr.push(textLabel,it):newArr.push(_textLabel,it);
-          tempText = value?it.labelPrefix+value+it.labelSuffix:'';
+          if(it.tagType != 3) {
+            tempText = value ? it.labelPrefix + value + it.labelSuffix : '';
+          }else{
+            tempText = getSaveText(it);
+          }
           saveText.push("",tempText); 
         //最后一个非文本标签，后面添加一个文本标签
         /*if(!noEnd&&i===arr.length-1){
@@ -120,9 +131,13 @@ export const fullfillText = (arr,noPre=false,noEnd=false,ifEmpty=true)=>{
         }*/
       }else{    //本身是或者前面是文本标签时，前面不添加文本标签
         newArr.push(it);
-        tempText = value?it.labelPrefix+value+it.labelSuffix:'';
-        // tempText = notText?tempText:it.value||it.name;
-        tempText = notText?tempText:(it.value||it.value==""?it.value:it.name);
+        if(it.tagType != 3) {
+          tempText = value ? it.labelPrefix + value + it.labelSuffix : '';
+          // tempText = notText?tempText:it.value||it.name;
+          tempText = notText ? tempText : (it.value || it.value == "" ? it.value : it.name);
+        }else{
+          tempText = getSaveText(it);
+        }
         saveText.push(tempText);
       }
       if(notText&&!noEnd&&i===arr.length-1){//最后一个非文本标签，后面添加一个文本标签

src/common/less/variables.less

@@ -77,15 +77,15 @@
   text-align: left;
   border: none;
   color:#000000;
-  padding-left: 40px;
+  /*padding-left: 40px;*/
   cursor: pointer;
   background: rgba(59,158,208,0.1);
   background-image: url(../images/first.png);
   background-repeat: no-repeat;
-  background-position: 20px 10px;
+  background-position: 0px 10px;
 }
 .clear{
-  width: 88px;
+  width: 60px;
   height: 44px;
   line-height: 44px;
   font-size: 12px;
@@ -96,6 +96,7 @@
   outline: none;
   text-align: center;
   cursor: pointer;
+  margin-left: 22px;
 }
 .confirm{
   width: 120px;
@@ -147,11 +148,21 @@
   color: unset!important;
   border:none!important;
   &:before,&:after{
-  content: unset!important;
+  content: ''!important;
 }
   /*color: @placeholder-color;*/
 }
 
 .hide{
   display: none!important;
-}
+}
+
+.llStyle{
+  box-shadow: 0 10px 20px 0 #989DA3;
+  filter:progid:DXImageTransform.Microsoft.Shadow(color='#989DA3',Direction=125,Strength=6);
+  border: 1px solid #f3f0f0;
+}
+
+.borderd{
+   border:1px #3B9ED0 solid;
+ }

src/components/AddAssistCheck/Textarea/index.jsx

@@ -15,6 +15,7 @@ class Textarea extends Component {
     const {handleChangeAssistValue,idx,handlePush} = this.props;
     const text = e.target.innerText;
     const stimer = this.state.timer;
+    console.log(text)
     handleChangeAssistValue&&handleChangeAssistValue(text,idx);
     //右侧推送--延时推送
     clearTimeout(stimer);
@@ -50,7 +51,8 @@ class Textarea extends Component {
       <div className={style.divTextarea}
           contenteditable={true}
           ref={this.$dom}
-          onChange={this.handleInput}
+          onInput={this.handleInput}
+          onPropertyChange={this.handleInput}
       ></div>
     );
   }

src/components/AddAssistCheck/Textarea/index.less

@@ -4,8 +4,8 @@
   max-height: 100px;
   border-bottom: 1px dashed #333;
   box-sizing: border-box;
-  min-height: 20px;
-  width: 100%;
+  // min-height: 20px;
+  // width: 100%;
   outline: none;
   line-height: 20px;
   resize: none;

src/components/AddAssistCheck/index.jsx

@@ -108,27 +108,11 @@ class AddAssistCheck extends React.Component {
         return <ul className={styles.labelWrap} id="datePick">
             {
                 assistLabel.map((item,idx) => {
-                    return (<li key={item.id}> 
-                        <span style={{float:"left"}}>{item.name}:</span>
-                        <p style={{float:"none",overflow:"hidden",marginRight:"215px",paddingLeft:'8px'}}>
-                        {/* <p className={styles.textareaWrap}> */}
-                            {/* <textarea
-                                className={styles.divTextarea}
-                                onChange={(e)=>{
-                                    handleChangeAssistValue(e.target.value,idx,e)
-                                    if(e.target.value.trim() == '') {
-                                        e.target.style.height = '18px';
-                                        return;
-                                    }
-                                    e.target.style.height = e.targetv.scrollHeight+'px';
-                                }}
-                                value={item.value}
-                                // onFocus={(e)=>{e.target.style.height = e.target.scrollHeight+'px';}}
-                                onKeyUp={(e)=>{handleChangeAssistValue(e.target.value,idx,e)}} 
-                                placeholder="报告描述或意见"
-                            ></textarea> */}
+                    return (<li key={item.id} className={styles.assistLists}>
+                        <span className={styles.assistName}>{item.name}：</span>
+                        <div className={styles.textareaWrap}>
                             <Textarea value={item.value} handlePush={handlePush} isRead={isRead} handleChangeAssistValue={handleChangeAssistValue} idx={idx}></Textarea>
-                        </p>
+                        </div>
                         <div className={styles.pointerFinger}>
                             <p onClick={()=>this.handleShowDate(idx)}>报告日期：<span>{item.time || this.state.dateTime}</span></p>
                             <i onClick={()=>this.handleShowDate(idx)}></i>
@@ -137,14 +121,10 @@ class AddAssistCheck extends React.Component {
                                 <Calendar isShow={true} handleChange={(info)=>{handleChangeDate(info,idx);this.setState({date:false})}}></Calendar>
                             </div>
                         </div>
-                        {/* <p className={styles.iptWrap}> */}
-                            {/* <input type="text" onChange={(e)=>{handleChangeAssistValue(e.target.value,idx)}} placeholder={"报告描述或意见"}/> */}
-                        {/* </p> */}
                     </li>)
                 })
             }
         </ul>
-        
     }
     render() {
         const { handleChangeValue, list } = this.props;
@@ -160,7 +140,7 @@ class AddAssistCheck extends React.Component {
                 </div>
                 <ConfirmModal 
                     visible={visible}
-                    confirm={()=>{this.delConfirm()}}
+                    confirm={this.delConfirm}
                     close={this.handleCancel}
                     cancel={this.handleCancel}
                     okText="删除"

src/components/AddInspect/index.jsx

@@ -155,7 +155,6 @@ class Inspect extends React.Component {
                 if(tempNumPlus == tempArr.details.length){
                     tempArr.show = false;
                 }
-                   
             }
         }
         tempArr.time = this.state.dateTime;
@@ -386,7 +385,7 @@ class Inspect extends React.Component {
                 </div>
                 <ConfirmModal 
                     visible={visible}
-                    confirm={()=>{this.delConfirm()}}
+                    confirm={this.delConfirm}
                     close={this.handleCancel}
                     cancel={this.handleCancel}
                     okText="删除"

src/components/AddInspect/index.less

@@ -1,6 +1,6 @@
 @import "~@less/variables.less";
 .labelWrap>li {
-    cursor: pointer;
+    // cursor: pointer;
     color: #767676;
     position: relative;
     padding-top: 10px;

src/components/Banner/index.jsx

@@ -11,7 +11,7 @@ class Banner extends Component {
     super(props)
     this.state = {
       mode: props.typeConfig,
-      zIndex:40
+      zIndex:204
     };
     this.showConfigModal = this.showConfigModal.bind(this);
     this.closeConfigModal = this.closeConfigModal.bind(this);
@@ -22,7 +22,7 @@ class Banner extends Component {
   showConfigModal(){
     this.setState({
       mode:this.props.typeConfig,
-      zIndex:202
+      zIndex:206
     });
     this.props.showConfigModal()
   }
@@ -30,7 +30,7 @@ class Banner extends Component {
   closeConfigModal(){
     this.props.closeConfigModal();
     this.setState({
-      zIndex:40
+      zIndex:204
     })
   }
 
@@ -50,7 +50,7 @@ class Banner extends Component {
     confirmType&&confirmType(mode);
     this.closeConfigModal()
     this.setState({
-      zIndex:40
+      zIndex:204
     })
   }
   /*componentDidUpdate(){
@@ -61,12 +61,12 @@ class Banner extends Component {
     }
   }*/
   render() {
-    const {visible} = this.props;
+    const {visible,disVisible,copyVisible} = this.props;
     const {mode,zIndex} = this.state;
     const {showConfigModal, closeConfigModal, changeType, confirmType} = this;
 
     return (
-      <div className={style["logo"]} style={{zIndex:zIndex}}>
+      <div className={style["logo"]} style={{zIndex:disVisible||copyVisible?40:zIndex}}>
         <img src={logo} />
         <span>|&nbsp;&nbsp;智能辅助临床决策系统</span>
         <div className={style["buon"]} onClick={showConfigModal}>

src/components/CheckBody/index.jsx

@@ -38,9 +38,11 @@ class CheckBody extends Component{
     if(totalHide){
       return ;
     }
-
-    let boxLeft = e.pageX -102 + 'px';
-    let boxTop =  (+e.target.offsetTop+22)+'px';
+    //若使用e.target，因为是onClick事件中，值可能是itembox的而不是span因此会有bug
+    const ele = document.activeElement;
+    const height = ele.offsetHeight;
+    let boxTop = (+(ele.offsetTop)+height)+'px';
+    let boxLeft = ele.offsetLeft + 'px';
     this.setState({
       boxLeft:boxLeft,
       boxTop:boxTop

src/components/CurrentIll/index.jsx

@@ -77,10 +77,11 @@ class CurrentIll extends Component{
 
   handleClick(e){//让搜索框跟随鼠标点击移动
     // e.stopPropagation(); //冒泡到最顶层关闭其他下拉
-    let boxLeft = e.pageX -62 + 'px';
-    // let boxTop = e.pageY - 164 + 'px';console.log(124,e.pageY,boxTop);
-    let offsetTop = e.target.offsetTop;
-    let boxTop = offsetTop + 28 + 'px';
+    //若使用e.target，因为是onClick事件中，值可能是itembox的而不是span因此会有bug
+    const ele = document.activeElement;
+    const height = ele.offsetHeight;
+    let boxTop = (+(ele.offsetTop)+height)+'px';
+    let boxLeft = +ele.offsetLeft+90 + 'px';
     this.setState({
       boxLeft:boxLeft,
       boxTop:boxTop

src/components/HistoryCaseContainer/HistoryList/index.less

@@ -65,6 +65,7 @@
             }
             li:hover {
                 border: 1px solid #66afe9;
+                border: 1px solid #66afe9\0;
             }
             .time {
                 float: right;

src/components/HistoryCaseContainer/index.jsx

@@ -12,6 +12,7 @@ import { CONFIRM_TYPE } from "@store/types/typeConfig";
 class HistoryCaseContainer extends React.Component {
     constructor(props){
         super(props);
+        this.close = this.close.bind(this);
     }
     componentDidMount(){
         // store.dispatch(initItemList());
@@ -24,6 +25,9 @@ class HistoryCaseContainer extends React.Component {
         store.dispatch({type: CONFIRM_TYPE, confirmType: baseObj.sign});
         pushAllDataList(baseObj.sign,'push',baseObj,'history')       //引用
     }
+    close(){
+      store.dispatch(visibleHistory(false));
+    }
     render(){
         const { visible,showHistoryCases,showHistoryBox,items,handleCaseClick,handleQuoteClick,handleSortClick,activeHistory,preInfo } = this.props;
         const domNode = document.getElementById('root');
@@ -39,11 +43,11 @@ class HistoryCaseContainer extends React.Component {
                     handleSortClick={handleSortClick}
                     preInfo={preInfo}
                 ></HistoryList>
-                <ConfirmModal 
+                <ConfirmModal
                     visible={visible}
-                    confirm={()=>{this.makeSure()}}
-                    close={()=>{store.dispatch(visibleHistory(false))}}
-                    cancel={()=>{store.dispatch(visibleHistory(false))}}
+                    confirm={this.makeSure}
+                    close={this.close}
+                    cancel={this.close}
                     okText={"引用"}
                     okBorderColor={'#3B9ED0'}
                     okColor={'#fff'}

src/components/InfoTitle/index.jsx

@@ -1,6 +1,7 @@
 import React, { Component } from "react";
 import PatInfoContainer from '@containers/PatInfoContainer.js';
 import style from "./index.less";
+import { connect } from 'react-redux';
 import historyCase from '@common/images/history.png';
 import health from '@common/images/health.png'
 import store from '@store';
@@ -18,7 +19,8 @@ class InfoTitle extends Component {
         store.dispatch(showHistory(true))
     }
     render() {
-        return <div className={style['title-wrapper']} >
+        const {disVisible,copyVisible} = this.props;
+        return <div className={style['title-wrapper']} style={{zIndex:disVisible||copyVisible?40:204}}>
             <PatInfoContainer />
             <div className={style["operations"]} onClick={this.showHistoryBox}>
                 <span><img src={historyCase} />&nbsp;历史病历</span>
@@ -30,5 +32,18 @@ class InfoTitle extends Component {
         </div>;
     }
 }
+function mapStateToProps(state) {
+  return {
+    disVisible: state.copyRight.disVisible,
+    copyVisible:state.copyRight.copyVisible
+  }
+}
+
+const InfoTitleCont = connect(
+  mapStateToProps,
+  null
+)(InfoTitle);
+
+
 
-export default InfoTitle;
+export default InfoTitleCont;

src/components/InfoTitle/index.less

@@ -9,7 +9,7 @@
   left: 10px;
   top: 50px;
   right: 480px;
-  z-index: 200;
+  z-index: 204;
 }
 .operations, .health{
   float: left;

src/components/Inspect/index.jsx

@@ -150,7 +150,7 @@ class Inspect extends React.Component {
                     <span>化验结果数据</span>
                     <div className={this.getStyle()} onClick={ieVersion&&ieVersion<=9?null:this.handleImportExcel}>
                        {/* <button disabled={ieVersion&&ieVersion>9?true:false}>导入化验结果</button>*/}
-                        <button>导入化验结果</button>
+                        <div className={styles.pushButton}>导入化验结果</div>
                         <input type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} />
                     </div>
                 </div>

src/components/Inspect/index.less

@@ -31,14 +31,13 @@
             color:@placeholder-color;
         }
     }
-    button {
-        outline: none;
+    .pushButton {
         font-size: 12px;
         padding: 0 8px;
         background-color: #fff;
         height: 28px;
-        line-height: 30px;
-        border: 0 none;
+        line-height: 28px;
+        border-radius: 5px;
         color: @template-color;
     }
 }
@@ -59,12 +58,11 @@
     width: 100px;
     height: 34px;
     line-height: 34px;
-    margin: 0 auto;
+    margin: 10px auto;
     background-color: #78bddd;
     border-radius: 5px;
     text-align: center;
     color: #fff;
-    margin-bottom: 20px;
     cursor: pointer;
 }
 

src/components/MultSpread/index.jsx

@@ -39,9 +39,12 @@ class MultSpread extends Component{
   }
   getLabels(){
     const {data,ikey,showArr,copyId} = this.props;
+    const {editable}= this.state;
+    let show = false;
     let inx = '';
     const list = data.map((it,i)=>{
       inx=ikey+''+i;
+      show = editable?false:showArr&&showArr[inx];
       switch (+it.controlType){
         case 0:
         case 1:
@@ -50,7 +53,7 @@ class MultSpread extends Component{
                             prefix={it.labelPrefix}
                             suffix={it.labelSuffix}
                             placeholder={it.name}
-                            show={showArr&&showArr[inx]}
+                            show={show}
                             value = {it.value}
                             ikey={inx}
                             id={it.id}
@@ -62,7 +65,7 @@ class MultSpread extends Component{
                                placeholder={it.name}
                                boxMark={ikey.substr(0,1)}
                                id={it.id}
-                               show={showArr&&showArr[inx]}
+                               show={show}
                                ikey={inx}
                                value={it.value}
                                hideTag={true}></NumberUnitDrop>;
@@ -78,7 +81,7 @@ class MultSpread extends Component{
           return <NumberDrop prefix={it.labelPrefix}
                              suffix={it.labelSuffix}
                              placeholder={it.name}
-                             show={showArr&&showArr[inx]}
+                             show={show}
                              ikey={inx}
                              id={it.id}
                              patId = {copyId}

src/components/NumberDrop/index.jsx

@@ -23,6 +23,8 @@ class NumberDrop extends Component{
       isClosed:false
     };
     this.$span = React.createRef();
+    this.$pre = React.createRef();
+    this.$suf = React.createRef();
     this.select = this.select.bind(this);
     this.numInpBlur = this.numInpBlur.bind(this);
     this.handleSpanInp = this.handleSpanInp.bind(this);
@@ -81,8 +83,9 @@ class NumberDrop extends Component{
       numEditable:true,
       hasSelect:false
     });
+    const val = e.target.innerText.replace(/^\s*/,'');
     const {handleSelect,ikey,suffix,prefix,mainSaveText,placeholder} = this.props;
-    const text = e.target.innerText===placeholder?'':e.target.innerText;
+    const text = val===placeholder?'':val;
     e.target.innerText = '';      //避免出现重复输入值
     handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
   }
@@ -110,14 +113,17 @@ class NumberDrop extends Component{
     }
   }
   handleBlur(e){     //双击编辑blur
-    const {handleLabelChange,ikey,boxMark} = this.props;
+    const {handleLabelChange,ikey,boxMark,value} = this.props;
     //if(!this.state.editable) return;
     this.setState({
       editable: false
     });
     let totalVal = e.target.innerText;
-    let changeVal = this.props.value;
-    handleLabelChange && handleLabelChange({ikey,changeVal,type:boxMark,totalVal});
+    let changeVal = this.$span.current.innerText.replace(/^\s*/,'');//数字框值-修改后;去掉前空格避免多空格叠加
+    let prefix = this.$pre.current.innerText.replace(/^\s*/,''); //前缀值-修改后
+    let suffix = this.$suf.current.innerText.replace(/^\s*/,''); //后缀值-修改后
+    //console.log('数字框：'+changeVal,";全部："+totalVal,";前缀："+prefix+";后缀："+suffix);
+    handleLabelChange && handleLabelChange({ikey,changeVal,type:boxMark,totalVal,prefix,suffix});
   }
   getSpanClass(){       //将被替换的文字选中状态显示
     const {hasSelect} = this.state;
@@ -129,9 +135,10 @@ class NumberDrop extends Component{
     const {numEditable,editable,hasSelect} = this.state;
     return <div className={this.getClasses()}
                 onDoubleClick={this.changeToEdit}
-                onBlur={this.handleBlur} contentEditable={editable}
+                contentEditable={editable}
+                onBlur={this.handleBlur}
                 onkeydown={handleEnter}>
-      <span>&nbsp;{prefix}</span>
+      <span ref = {this.$pre}>&nbsp;{prefix}</span>
       <span onFocus={this.handleNumFocus}
             onClick={this.handleNumClick}
             contentEditable={numEditable}
@@ -140,8 +147,8 @@ class NumberDrop extends Component{
             onBlur={this.numInpBlur}
             onInput={this.handleSpanInp}
             className={this.getSpanClass()}
-            onkeydown={handleEnter}>{value||placeholder}</span>
-      <span>&nbsp;{suffix}</span>
+            onkeydown={handleEnter}>&nbsp;{value||placeholder}</span>
+      <span ref = {this.$suf}>&nbsp;{suffix}</span>
       <NumberPan handleSelect={(text)=>this.select(text)}
                  onClose={handleHide}
                  show={show} toClear={!hasSelect}/>

src/components/NumberUnitDrop/index.jsx

@@ -29,6 +29,7 @@ class NumberUnitDrop extends Component{
       labelVal:''
     };
     this.$span = React.createRef();
+    this.$cont = React.createRef();
     this.select = this.select.bind(this);
     this.numInpBlur = this.numInpBlur.bind(this);
     this.handleSpanInp = this.handleSpanInp.bind(this);
@@ -114,10 +115,15 @@ class NumberUnitDrop extends Component{
     }
   }
   getClasses(){         //整个标签是否有值的状态
-    const {value,hideTag} = this.props;
+    const {value,hideTag,show} = this.props;
     const inpValue = this.state.value;
     const isSelected = value||inpValue?style['selected']:style['container'];
     const noTag = hideTag?style['no-tag']:'';
+    if(show){
+      $(this.$cont.current).addClass(style['borderd']);
+    }else{
+      $(this.$cont.current).removeClass(style['borderd']);
+    }
     return className(isSelected,noTag);
   }
   changeToEdit(e){        //整个标签双击编辑状态
@@ -146,7 +152,7 @@ class NumberUnitDrop extends Component{
   render(){
     const {placeholder,prefix,suffix,show,value,handleHide} = this.props;
     const {numEditable,editable,hasSelect,placeholderFlag} = this.state;
-    return <div className={this.getClasses()}>
+    return <div className={this.getClasses()} ref={this.$cont}>
       <span>{prefix}</span>
       <span onClick={this.handleNumClick}
             contentEditable={editable}

src/components/Operation/index.jsx

@@ -143,11 +143,19 @@ class Operation extends Component {
       title: val
     })
   }
+  handleInput(e){
+    let val = e.target.value
+    if(e.target.value.length > 30){
+        e.target.value = val.substring(0,30)
+        this.onchange(val.substring(0,30))
+    }else{
+        this.onchange(e.target.value)
+    }
+  }
   keypress(event) {
     let e = event?event:window.event;
     if (e.keyCode == 13) {
-      // this.makeSure()
-      // store.dispatch(changeVisible(false))
+      this.makeSure()
     }
   }
   saveHis(type) {
@@ -172,14 +180,17 @@ class Operation extends Component {
     let jsonStr = getAllDataStringList(baseList);
     let whichSign = baseList.typeConfig.typeConfig;
     let tmpLis = baseList.tabTemplate.items;
-    if (whichSign == 0) {
-      for(let i = 0;i <tmpLis.length;i++){
-        let dataStr = tmpLis[i].dataJson;
-        if(dataStr == JSON.stringify(jsonData)){
-          Notify.info('该模板已保存');
-          return false;
-        }
+    for(let i = 0;i <tmpLis.length;i++){
+      let dataStr = tmpLis[i].preview;
+      let jsStr = tmpLis[i].dataJson;
+      // console.log(JSON.stringify(JSON.parse(dataStr)))
+      // console.log(JSON.stringify(jsonStr))
+      if(JSON.stringify(JSON.parse(dataStr)) == JSON.stringify(jsonStr) && jsStr == JSON.stringify(jsonData)){
+        Notify.info('该模板已保存');
+        return false;
       }
+    }
+    if (whichSign == 0) {
       if (
         JSON.stringify(jsonData.advice) == '{}' &&
         (jsonData.chief.length < 1 && jsonStr.chief == '[]') &&
@@ -197,15 +208,6 @@ class Operation extends Component {
         return true;
       }
     } else if(whichSign == 1) {
-      for(let i = 0;i <tmpLis.length;i++){
-        let dataStr = tmpLis[i].preview;
-        let jsStr = tmpLis[i].dataJson;
-        console.log(dataStr == JSON.stringify(jsonStr))
-        if(JSON.stringify(JSON.parse(dataStr)) == JSON.stringify(jsonStr) && jsStr == JSON.stringify(jsonData)){
-          Notify.info('该模板已保存');
-          return false;
-        }
-      }
       if (JSON.stringify(jsonData.advice) == '{}' && 
           jsonStr.chief == '[]' && 
           jsonStr.present == '[]' && 
@@ -231,14 +233,11 @@ class Operation extends Component {
         placeholder="请输入模板名称"
         type="text"
         maxLength='30'
-        onChange={(e) => {
-          let val = e.target.value
-          if (e.target.value.length > 30) {
-            e.target.value = val.substring(0, 30)
-            this.onchange(val.substring(0, 30))
-          } else {
-            this.onchange(e.target.value)
-          }
+        onInput={(e) => {
+          this.handleInput(e)
+        }}
+        onPropertyChange={(e) => {  // 兼容ie
+          this.handleInput(e)
         }}
         onKeyPress={e => this.keypress(e)}
       />
@@ -281,11 +280,11 @@ class Operation extends Component {
     const { visible, preVisible,diagShow } = this.props.print;
     const {zIndex} = this.state;
     return <div className={style['container']} style={{zIndex:zIndex}}>
-      <button className={style['button']} onClick={showPrint}><img src={printImg} /> 打印病历</button>
-      <button className={style['preButton']} onClick={showPreview}><img src={preview} /> 预览</button>
-      <button className={style['preButton']} onClick={() => { this.saveHis(3) }}><img src={saveHistory} /> 保存病历模板</button>
-      <button className={style['saveButton']} onClick={() => { this.saveAll(1) }}>保存</button>
-      <button className={`${style['clearButton']} ${style['saveButton']}`} onClick={() => { this.clearAll(2) }}>清除</button>
+      <span className={style['button']} onClick={showPrint}><img src={printImg} /> 打印病历</span>
+      <span className={style['preButton']} onClick={showPreview}><img src={preview} /> 预览</span>
+      <span className={style['preButton']} onClick={() => { this.saveHis(3) }}><img src={saveHistory} /> 保存病历模板</span>
+      <span className={style['saveButton']} onClick={() => { this.saveAll(1) }}>保存</span>
+      <span className={`${style['clearButton']} ${style['saveButton']}`} onClick={() => { this.clearAll(2) }}>清除</span>
       <PrintPreviewContainer visible={visible} onClose={closePrint} />
       <PreviewContainer visible={preVisible} onClose={closePreview} />
       <ConfirmModal

src/components/Operation/index.less

@@ -45,11 +45,14 @@
     .saveButton {
         width: 80px;
         height: 34px;
+        line-height: 32px;
+        text-align: center;
         outline: none;
         border-radius: 4px;
         cursor: pointer;
         color: #000;
         border: 1px solid #3B9ED0;
+        box-sizing: border-box;
         background: #fff;
         margin-left:20px;
         background: #3B9ED0;

src/components/OtherHistory/index.jsx

@@ -51,6 +51,7 @@ class OtherHistory extends Component{
       return;
     }
     if(+type===0&&!hasMain){
+      document.activeElement.blur();        //修改第一次提示后不再提示bug
       Notify.error("无法操作，请先输入主诉");
       return;
     }
@@ -69,8 +70,11 @@ class OtherHistory extends Component{
     //e.stopPropagation();
     const {fetchPushInfos} = this.props;
     //fetchPushInfos&&fetchPushInfos();
-    let boxLeft = e.pageX - 102 + 'px';
-    let boxTop = (+e.target.offsetTop+22)+'px';
+    //若使用e.target，因为是onClick事件中，值可能是itembox的而不是span因此会有bug
+    const ele = document.activeElement;
+    const height = ele.offsetHeight;
+    let boxTop = (+(ele.offsetTop)+height)+'px';
+    let boxLeft = ele.offsetLeft + 'px';
     this.setState({
       boxLeft:boxLeft,
       boxTop:boxTop

src/components/PreviewBody/index.jsx

@@ -1,6 +1,64 @@
 import React, { Component } from "react";
 import style from "./index.less";
 import $ from "jquery";
+
+(function ($) {
+  var opt;
+
+  $.fn.jqprint = function (options) {
+      opt = $.extend({}, $.fn.jqprint.defaults, options);
+
+      var $element = (this instanceof $) ? this : $(this);
+
+      if (opt.operaSupport && $.browser.opera) {
+          var tab = window.open("", "jqPrint-preview");
+          tab.document.open();
+
+          var doc = tab.document;
+      }
+      else {
+          var $iframe = $("<iframe  />");
+
+          if (!opt.debug) { $iframe.css({ position: "absolute", width: "0px", height: "0px", left: "-300px", top: "-300px" }); }
+
+          $iframe.appendTo("body");
+          var doc = $iframe[0].contentWindow.document;
+      }
+
+      if (opt.importCSS) {
+          if ($("link[media=print]").length > 0) {
+              $("link[media=print]").each(function () {
+                  doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' media='print' />");
+              });
+          }
+          else {
+              $("link").each(function () {
+                  doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' />");
+              });
+          }
+      }
+
+      if (opt.printContainer) { doc.write($element.outer()); }
+      else { $element.each(function () { doc.write($(this).html()); }); }
+
+      doc.close();
+
+      (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).focus();
+      setTimeout(function () { (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).print(); if (tab) { tab.close(); } }, 1000);
+  }
+
+  $.fn.jqprint.defaults = {
+      debug: false,
+      importCSS: true,
+      printContainer: true,
+      operaSupport: true
+  };
+
+  $.fn.outer = function () {
+      return $($('<div></div>').html(this.clone())).html();
+  }
+})($);
+
 import {filterDataArr} from '@utils/tools'
 class PreviewBody extends Component {
     constructor(props) {
@@ -11,6 +69,7 @@ class PreviewBody extends Component {
         this.$content = React.createRef();
         this.normalVal = this.normalVal.bind(this);
         this.getCurrentDate = this.getCurrentDate.bind(this);
+        this.onPrint = this.onPrint.bind(this);
     }
     componentDidMount(){
         this.getCurrentDate();
@@ -18,6 +77,15 @@ class PreviewBody extends Component {
     componentWillReceiveProps(){
         $(this.$content.current)[0].scrollIntoView(true);
     }
+    onPrint() {
+      $("#content").jqprint({
+          debug: false,
+          importCSS: true,
+          printContainer: true,
+          operaSupport: false,
+      });
+      this.props.onClose()
+  }
     getCurrentDate(){
         let myDate = new Date();
         let year = myDate.getFullYear();       //获取完整的年份(4位,1970-????)
@@ -45,183 +113,186 @@ class PreviewBody extends Component {
         if(val.questionDetailList.length > 0){
             return val.questionDetailList.map((item)=>{
                 if(val.value == item.name){
-                    return <td style={{width:'23%'}}><span className={item.abnormal != '0' ?"red":'' }>{val.value}</span> { val.labelSuffix}</td>
+                    return <td style={{width:'23%'}}><span style={{color:item.abnormal != '0' ?"red":null}}>{val.value}</span> { val.labelSuffix}</td>
                 }
             })
         }else{
-            return <td style={{width:'23%'}}><span className={val.value > val.maxValue || val.value < val.minValue?"red":''}>{val.value}</span> { val.labelSuffix}</td>
+            return <td style={{width:'23%'}}><span style={{color:val.value > val.maxValue || val.value < val.minValue?"red":null}}>{val.value}</span> { val.labelSuffix}</td>
         }
     }
     render() {
         const { show, preInfo, dataJson, dataStr,baseObj } = this.props;
 
         return <div className={style['content']}>
-            <div ref={this.$content} style={{ clear: 'both', fontSize: '24px', margin: '0px 0px 30px 0px',textAlign:'center' }}>{preInfo.hospitalName}</div>
-            <table className={style['patInfo']} style={{ margin: '0px 15px 30px 0px', borderCollapse: 'collapse', width: "100%",fontSize:'12px' }}>
-                <tr>
-                    <td style={{ border: '1px solid #aaa', padding: '8px 10px', width: '25%' }}>卡号：{baseObj?baseObj.patientIdNo:JSON.stringify(preInfo) == '{}'?'':preInfo.patientIdNo}</td>
-                    <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>
-                </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>
-                </tr>
-            </table>
-            <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' }}>
-                        {
-                            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'  }}>
-                        {
-                            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'  }}>
-                        {
-                            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'  }}>
-                        {
-                            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',width:'650px'}}>
-                        {/* <table style={{ width: '100%' }}> */}
+            <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%" }}>
+                    <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>
+                    </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>
+                    </tr>
+                </table>
+                <table style={{width:"100%"}}>
+                    <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' }}>
                             {
-                                dataJson.lis.getExcelDataList && dataJson.lis.getExcelDataList.map((items)=>{
-                                    return items.lisExcelRes && items.lisExcelRes.map((item)=>{
-                                        return <table style={{margin:'8px 0',width:'100%',fontSize:'12px'}}>
-                                            <tr style={{fontSize:'14px',lineHeight:'1.5'}}>{item.menus}</tr>
-                                            {
-                                                item.lisExcelItem && item.lisExcelItem.map((value)=>{
-                                                    return <tr style={{lineHeight:'1.5',width:'650px'}}>
-                                                        <td style={{width:'25%',fontSize:'12px'}}>{value.itemName}</td>
-                                                        <td style={{width:'23%',fontSize:'12px'}}><span className={value.type == 1?'red':null} style={{fontSize:'12px'}}>{value.value}</span> {value.unit}</td>
-                                                        <td style={{width:'24%',fontSize:'12px'}}>
-                                                            {this.normalVal(value.min,value.max)}
-                                                        </td>
-                                                        <td style={{width:'28%',fontSize:'12px'}}>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+value.time}</td>
-                                                    </tr>
-                                                })
-                                            }
-                                        </table>
-                                    })
-                                })
+                                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'  }}>
+                            {
+                                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'  }}>
                             {
-                                dataJson.lis.labelList && dataJson.lis.labelList.map((item,idx) => {
-                                    if(item.show){
-                                        return <table style={{margin:'8px 0',width:'100%'}}>
-                                            <tr style={{fontSize:'14px',lineHeight:'1.5'}}>{item.name}</tr>
-                                            {
-                                                item.details.map((val)=>{
-                                                    if(val.value && val.value != ''){
-                                                        return <tr style={{lineHeight:'1.5',width:'100%',fontSize:'12px'}}>
-                                                            <td style={{width:'25%'}}>{val.name}</td>
-                                                            {/* <td style={{width:'23%'}} className={item.abnormal != '0' ?"red":'' }>{val.value} { val.labelSuffix}</td> */}
-                                                            {this.showDetails(val)}
-                                                            
-                                                            <td style={{width:'24%'}}>
-                                                                {this.normalVal(val.minValue,val.maxValue)}
+                                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'  }}>
+                            {
+                                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'}}>
+                            {/* <table style={{ width: '100%' }}> */}
+                                {
+                                    dataJson.lis.getExcelDataList && dataJson.lis.getExcelDataList.map((items)=>{
+                                        return items.lisExcelRes && items.lisExcelRes.map((item)=>{
+                                            return <table style={{margin:'8px 0',width:'100%',fontSize:'12px'}}>
+                                                <tr style={{fontSize:'14px',lineHeight:'1.5'}}>{item.menus}</tr>
+                                                {
+                                                    item.lisExcelItem && item.lisExcelItem.map((value)=>{
+                                                        return <tr style={{lineHeight:'1.5',maxWidth:'650px'}}>
+                                                            <td style={{width:'25%',fontSize:'12px'}}>{value.itemName}</td>
+                                                            <td style={{width:'23%',fontSize:'12px'}}><span style={{fontSize:'12px',color:value.type == 1?"red":null}}>{value.value}</span> {value.unit}</td>
+                                                            <td style={{width:'24%',fontSize:'12px'}}>
+                                                                {this.normalVal(value.min,value.max)}
                                                             </td>
-                                                            <td style={{width:'28%'}}>{'化验时间:'+item.time}</td>
+                                                            <td style={{width:'28%',fontSize:'12px'}}>{value.time == ''?('导入时间: '+this.state.dateTime):'化验时间: '+value.time}</td>
                                                         </tr>
-                                                    }
-                                                })
-                                            }
-                                        </table>
-                                    }
+                                                    })
+                                                }
+                                            </table>
+                                        })
+                                    })
+                                }
+                                {
+                                    dataJson.lis.labelList && dataJson.lis.labelList.map((item,idx) => {
+                                        if(item.show){
+                                            return <table style={{margin:'8px 0',width:'100%'}}>
+                                                <tr style={{fontSize:'14px',lineHeight:'1.5'}}>{item.name}</tr>
+                                                {
+                                                    item.details.map((val)=>{
+                                                        if(val.value && val.value != ''){
+                                                            return <tr style={{lineHeight:'1.5',width:'100%',fontSize:'12px'}}>
+                                                                <td style={{width:'25%'}}>{val.name}</td>
+                                                                {this.showDetails(val)}
+                                                                
+                                                                <td style={{width:'24%'}}>
+                                                                    {this.normalVal(val.minValue,val.maxValue)}
+                                                                </td>
+                                                                <td style={{width:'28%'}}>{'化验时间:'+item.time}</td>
+                                                            </tr>
+                                                        }
+                                                    })
+                                                }
+                                            </table>
+                                        }
+                                    })
+                                }
+                            {/* </table> */}
+                        </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' }}>
+                            {
+                                dataStr.pacs && dataStr.pacs != '' && dataStr.pacs.split(';').map((item)=>{
+                                    return <div style={{ fontSize: '14px' }}>{item}</div>
+                                })
+                            }
+                        </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' }}>
+                            {
+                                dataStr.diag && dataStr.diag != '' && dataStr.diag.split(';').map((item)=>{
+                                    return <div style={{ fontSize: '14px'}}>{item}</div>
                                 })
                             }
-                        {/* </table> */}
-                    </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' }}>
-                        {
-                            dataStr.pacs && dataStr.pacs != '' && dataStr.pacs.split(';').map((item)=>{
-                                return <div style={{ fontSize: '14px' }}>{item}</div>
-                            })
-                        }
-                    </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' }}>
-                        {
-                            dataStr.diag && dataStr.diag != '' && dataStr.diag.split(';').map((item)=>{
-                                return <div style={{ fontSize: '14px'}}>{item}</div>
-                            })
-                        }
-                    </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' }}>
-                        {
-                            dataJson.advice.assay && dataJson.advice.assay.length > 0 || dataJson.advice.check && dataJson.advice.check.length > 0 ? <p style={{fontSize:'14px',marginBottom:"8px"}}>开单项目</p> : ''
-                        }
-                        {
-                            dataJson.advice.assay && <div style={{ fontSize: '12px', padding: '0px 0px 5px 0px' }}>{dataJson.advice.assay}</div>
-                        }
-                        {
-                            dataJson.advice.check && <div style={{ fontSize: '12px', padding: '0px 0px 5px 0px' }}>{dataJson.advice.check}</div>
-                        }
-                        {dataJson.advice.scheme && dataJson.advice.scheme.length > 0  && <p style={{fontSize:'14px', marginBottom: '8px',marginTop:'8px'}}>治疗方案</p>}
-                        {
-                            dataJson.advice.scheme && dataJson.advice.scheme.map((item, index) => {
-                                return <p>{item.treatment.map((it,ii) =>{
-                                  return(it.treatmentStr && it.treatmentStr.length > 0 ? 
-                                    <div style={{ fontSize: '12px', padding: '0px 0px 5px 0px' }}>{ it.treatmentStr }</div>: '')
-                                })}</p>
-                              })
-                        }
-                    </td>
-                </tr>
-            </table>
-            <table className={style.partTtable} style={{ marginTop: '10px',marginBottom:'30px',display: show ? 'block' : 'none' }}>
-                <tr className={`${style.verticalT} ${style.siginNature}`}>
-                    <td style={{ width: 80, textAlign: 'right',verticalAlign:'top', padding: '0px 5px 0 0px', fontSize: '14px' }}>医生签名：</td>
-                    {/* <td style={{ 
-                        width: '220px',
-                        height: '60px',
-                        textAlign: 'center',
-                        lineHeight: '60px',
-                        cursor:'default',
-                        color: '#cbc7c7',
-                        border: '1px solid #cbc7c7',
-                        paddingBottom: '0'
-                    }}>此处签名</td> */}
-                    <td style={{
-                      minWidth:'50px',
-                      padding:'0 5px 2px 5px',
-                      borderBottom:'1px solid #333',
-                    }}
-                    >{baseObj?baseObj.doctorName:(JSON.stringify(preInfo) == '{}'?'':preInfo.doctorName)}</td>
-                </tr>
-            </table>
+                        </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' }}>
+                            {
+                                dataJson.advice.assay && dataJson.advice.assay.length > 0 || dataJson.advice.check && dataJson.advice.check.length > 0 ? <p style={{fontSize:'14px',marginBottom:"8px"}}>开单项目</p> : ''
+                            }
+                            {
+                                dataJson.advice.assay && <div style={{ fontSize: '12px', padding: '0px 0px 5px 0px' }}>{dataJson.advice.assay}</div>
+                            }
+                            {
+                                dataJson.advice.check && <div style={{ fontSize: '12px', padding: '0px 0px 5px 0px' }}>{dataJson.advice.check}</div>
+                            }
+                            {dataJson.advice.scheme && dataJson.advice.scheme.length > 0  && <p style={{fontSize:'14px', marginBottom: '8px',marginTop:'8px'}}>治疗方案</p>}
+                            {
+                                dataJson.advice.scheme && dataJson.advice.scheme.map((item, index) => {
+                                    return <p>{item.treatment.map((it,ii) =>{
+                                      return(it.treatmentStr && it.treatmentStr.length > 0 ? 
+                                        <div style={{ fontSize: '12px', padding: '0px 0px 5px 0px' }}>{ it.treatmentStr }</div>: '')
+                                    })}</p>
+                                  })
+                            }
+                        </td>
+                    </tr>
+                </table>
+                <table style={{ marginTop: '10px',marginBottom:'30px',display: show ? 'block' : 'none' }}>
+                    <tr style={{position:'absolute',right:'0px',verticalAlign: 'top'}}>
+                        <td>医生签名：</td>
+                        <td style={{
+                          minWidth:'50px',
+                          padding:'0 5px 2px 5px',
+                          borderBottom:'1px solid #333',
+                        }}>{baseObj?baseObj.doctorName:(JSON.stringify(preInfo) == '{}'?'':preInfo.doctorName)}</td>
+                    </tr>
+                </table>
+            </div>
+            
+            <div onClick={()=>{this.onPrint()}} style={{
+                display: show ? 'inline-block' : 'none',
+                padding: '10px 20px',
+                float:'right',
+                marginTop:'15px',
+                background: '#3B9ED0',
+                color: '#fff',
+                borderRadius: '4px',
+                cursor: 'pointer',
+                position:'absolute',
+                right:'40px'
+            }}>打印</div>
         </div>
     }
 }

src/components/PreviewBody/index.less

@@ -1,3 +1,4 @@
+
     .content {
       position: fixed;
       bottom: 70px;
@@ -5,116 +6,14 @@
       top:120px;
       width: 820px;
       padding: 0 40px 60px 40px;
-    }
-
-    .foot{
-      font-size: 12px;
-      color: #000000;
-      letter-spacing: 0;
-      line-height: 24px;
-      float: left;
-      padding:  12px 0px 15px 20px;
-    }
-
-    .line{
-      opacity: 0.2;
-      filter:alpha(opacity=20);
-      -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=20);";
-      background: #FFFFFF;
-      border: 1px solid #979797;
-      margin:  45px 0px 15px 0px;
-    }
-    .button {
-      text-align: right;
-      padding: 20px 20px 10px 0px;
-      span{
-        display: inline-block;
-        width: 60px;
-        height: 24px;
-        background: #3B9ED0;
-        font-size: 14px;
-        color: #FFFFFF;
-        font-size: 14px;
-        text-align: center;
-        line-height: 24px;
-        border-radius: 4px;
-        cursor: pointer;
+      .contents {
+        position: relative;
+        padding-bottom: 26px;
       }
     }
     .patInfo {
       td {
-        border: 1px solid #aaa
+        border: 1px solid #aaa;
       }
     }
-    .signature {
-      border: 1px solid #000;
-    }
-  .previewInspect {
-      width: 150px;
-      font-size: 10px;
-      line-height: 2;
-  }
-  .previewPerson {
-      clear:both;
-      font-size: 24px;
-      margin: 0 0 30px 0px;
-  }
-  .previewTable {
-      width: 100%;
-      margin: 0 0px 30px 0px;
-      border-collapse: collapse;
-      td {
-          width: 25%;
-          box-sizing: border-box;
-      }
-  }
-  .previewTableTd {
-      border: 1px solid #aaa;
-      padding: 8px 10px;
-  }
-  // width:70, textAlign: 'right', padding: '0px 5px 16px 0px', fontSize: '14px'
-  .partTtable {
-      
-      .verticalT {
-          vertical-align: top;
-      }
-      .siginNature {
-        vertical-align: bottom;
-        float: right;
-      }
-      .partTtableList {
-          width: 70px;
-          text-align: right;
-          padding: 0 5px 16px 0;
-          font-size: 14px;
-      }
-      .partTtableLis {
-          font-size: 14px;
-          padding: 0 0 16px 0;
-      }
-      .partTtableLisS {
-          padding: 0 0 10px 0;
-          font-size: 14px;
-      }
-      .partTtableT {
-          width: 70px;
-          text-align: right;
-          padding: 0 5px 16px 0;
-          font-size: 14px;
-      }
-      .partTtableDes {
-          font-size: 14px;
-          padding: 0px 0px 0px 0px;
-      }
-  }
-  .assignArea {
-      width: 220px;
-      height: 60px;
-      text-align: center;
-      line-height: 60px;
-      color: #979797;
-      border: 1px solid #979797;
-      padding-bottom: 0 !important;
-  }
-  
   

src/components/PrintPreview/index.jsx

@@ -4,105 +4,26 @@ import style from "./index.less";
 import PreviewBody from "../PreviewBody";
 import store from '@store';
 import Notify from '@commonComp/Notify';
-import close from '../../common/images/icon_close.png'
-import $ from 'jquery'
-(function ($) {
-    var opt;
+import close from '../../common/images/icon_close.png';
 
-    $.fn.jqprint = function (options) {
-        opt = $.extend({}, $.fn.jqprint.defaults, options);
-
-        var $element = (this instanceof $) ? this : $(this);
-
-        if (opt.operaSupport && $.browser.opera) {
-            var tab = window.open("", "jqPrint-preview");
-            tab.document.open();
-
-            var doc = tab.document;
-        }
-        else {
-            var $iframe = $("<iframe  />");
-
-            if (!opt.debug) { $iframe.css({ position: "absolute", width: "0px", height: "0px", left: "-300px", top: "-300px" }); }
-
-            $iframe.appendTo("body");
-            var doc = $iframe[0].contentWindow.document;
-        }
-
-        if (opt.importCSS) {
-            if ($("link[media=print]").length > 0) {
-                $("link[media=print]").each(function () {
-                    doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' media='print' />");
-                });
-            }
-            else {
-                $("link").each(function () {
-                    doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' />");
-                });
-            }
-        }
-
-        if (opt.printContainer) { doc.write($element.outer()); }
-        else { $element.each(function () { doc.write($(this).html()); }); }
-
-        doc.close();
-
-        (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).focus();
-        setTimeout(function () { (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).print(); if (tab) { tab.close(); } }, 1000);
-    }
-
-    $.fn.jqprint.defaults = {
-        debug: false,
-        importCSS: true,
-        printContainer: true,
-        operaSupport: true
-    };
-
-    $.fn.outer = function () {
-        return $($('<div></div>').html(this.clone())).html();
-    }
-})($);
 
 class PrintPreview extends Component {
     constructor(props) {
         super(props)
-        this.onPrint = this.onPrint.bind(this);
     }
-    onPrint() {
-        $("#content").jqprint({
-            debug: false,
-            importCSS: true,
-            printContainer: true,
-            operaSupport: false
-        });
-        this.props.onClose()
-    }
-    surePrint(jsonData,jsonStr,whichSign){
-        if(whichSign == 0){
-            if(jsonData.chief.length < 1){
-                Notify.info('主诉不能为空');
-                return;
-            }else if(jsonData.diag.length < 1){
-                Notify.info('诊断不能为空');
-                return;
-            }else{
-                this.onPrint();
-                this.props.save(true)
-            }
+    surePrint(jsonStr){
+        if(JSON.parse(jsonStr.chief).length == 1 && JSON.parse(jsonStr.chief)[0].trim() ==''){
+          Notify.info('主诉不能为空');
+            return false;
+        }else if(jsonStr.chief && JSON.parse(jsonStr.chief).length < 1){
+            Notify.info('主诉不能为空');
+            return false;
+        }else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){
+            Notify.info('诊断不能为空');
+            return false;
         }else{
-            if(JSON.parse(jsonStr.chief).length == 1 && JSON.parse(jsonStr.chief)[0] ==''){
-                Notify.info('主诉不能为空');
-                return;
-            }else if(JSON.parse(jsonStr.chief).length < 1){
-                Notify.info('主诉不能为空');
-                return;
-            }else if(jsonStr.diag.trim().length < 1){
-                Notify.info('诊断不能为空');
-                return;
-            }else{
-                this.onPrint();
-                this.props.save(true)
-            }
+            this.onPrint();
+            this.props.save(true)
         }
     }
     render() {
@@ -110,13 +31,12 @@ class PrintPreview extends Component {
         let baseList = store.getState();
         const dataJson = getAllDataList(baseList);
         const dataStr = getAllDataStringList(baseList);
-        let whichSign = baseList.typeConfig.typeConfig;
 
         return <div className={style['container']} style={visible ? { display: 'block' } : { display: 'none' }}>
             <div className={style['shade']}></div>
             <div className={style['modal']}>
                 <div className={style['close']}>打印<img src={close} onClick={onClose} /></div>
-                <div id="content">
+                {/* <div id="content"> */}
                     <PreviewBody
                         preInfo={preInfo}
                         dataJson={dataJson}
@@ -124,18 +44,7 @@ class PrintPreview extends Component {
                         show={true}
                         onClose={onClose}
                     ></PreviewBody>
-                </div>
-
-                <div onClick={()=>{this.surePrint(dataJson,dataStr,whichSign)}} style={{
-                    padding: '10px 20px',
-                    position: 'absolute',
-                    bottom: '20px',
-                    right: '20px',
-                    background: '#3B9ED0',
-                    color: '#fff',
-                    borderRadius: '4px',
-                    cursor: 'pointer'
-                }}>打印</div>
+                {/* </div> */}
             </div>
         </div>
     }

src/components/PushContainer/index.jsx

@@ -46,6 +46,7 @@ class PushContainer extends Component {
         this.handleAllCheckbox=this.handleAllCheckbox.bind(this)
         this.handleMangerTemplate=this.handleMangerTemplate.bind(this)
         this.handleDelList=this.handleDelList.bind(this)
+        this.handleClose = this.handleClose.bind(this);
     }
     componentDidMount(){
         // const height = getWindowInnerHeight()-160;
@@ -113,10 +114,19 @@ class PushContainer extends Component {
     keypress(event){
         let e = event?event:window.event;
         if(e.keyCode == 13) {
-            // this.makeSure()
+            this.makeSure()
             // store.dispatch(changeVisible(false))
         }
     }
+    handleInput(e){
+      let val = e.target.value
+      if(e.target.value.length > 30){
+          e.target.value = val.substring(0,30)
+          this.onchange(val.substring(0,30))
+      }else{
+          this.onchange(e.target.value)
+      }
+    }
     changeTitle(){
         return <div className={style['box']}>
             <input className={style['ipt']} 
@@ -124,14 +134,11 @@ class PushContainer extends Component {
                 type="text" 
                 value={this.state.title}
                 maxLength='30'
-                onKeyUp={(e) => {
-                    let val = e.target.value
-                    if(e.target.value.length > 30){
-                        e.target.value = val.substring(0,30)
-                        this.onchange(val.substring(0,30))
-                    }else{
-                        this.onchange(e.target.value)
-                    }
+                onInput={(e) => {
+                  this.handleInput(e)
+                }}
+                onPropertyChange={(e) => {  // 兼容ie
+                  this.handleInput(e)
                 }}
                 onKeyPress={e=>this.keypress(e)}
             />
@@ -188,8 +195,10 @@ class PushContainer extends Component {
     makeSure(){
         if(this.state.type == 1) {
             store.dispatch(delItem(this.state.id))
+            store.dispatch(changeVisible(false))
         }else if(this.state.type == 2){
             store.dispatch(delBatchItem(this.props.checkItems))
+            store.dispatch(changeVisible(false))
         }else if(this.state.type == 3){
             if(this.state.title == this.state.obj.text){
                 store.dispatch(changeVisible(false))
@@ -210,8 +219,11 @@ class PushContainer extends Component {
                     pushAllDataList(typeConfig,'push',part,'template')       //引用
                 }
             })
+            store.dispatch(changeVisible(false))
         }
-        store.dispatch(changeVisible(false))
+    }
+    handleClose(){
+      store.dispatch(changeVisible(false));
     }
     render() {
         const {activeId,checkItems,visible,showMsg,items,allCheckShow} = this.props;
@@ -237,9 +249,9 @@ class PushContainer extends Component {
             </Tab>
             <ConfirmModal 
                 visible={visible}
-                confirm={()=>{this.makeSure()}}
-                close={()=>{store.dispatch(changeVisible(false))}}
-                cancel={()=>{store.dispatch(changeVisible(false))}}
+                confirm={this.makeSure}
+                close={this.handleClose}
+                cancel={this.handleClose}
                 okText={this.state.okText}
                 okBorderColor={this.state.okBorderColor}
                 okColor={this.state.okColor}

src/components/PushContainer/index.less

@@ -7,7 +7,7 @@
   padding-top: 20px;
   position: absolute;
   right: 10px;
-  z-index: 201;
+  z-index: 200;
 
   position: fixed;
   top: 50px;

src/components/RadioDrop/index.jsx

@@ -2,6 +2,7 @@ import React,{Component} from 'react';
 import {handleEnter} from '@utils/tools.js';
 import {DropList} from '@commonComp';
 import style from "./index.less";
+import $ from "jquery";
 
 /****
  * 单选下拉
@@ -23,17 +24,23 @@ class RadioDrop extends Component{
       editable:false,
       timer:null
     };
+    this.$cont = React.createRef();
     this.handleSelect = this.handleSelect.bind(this);
     this.handleShow = this.handleShow.bind(this);
     this.handledbClick = this.handledbClick.bind(this);
     this.handleEditLabel = this.handleEditLabel.bind(this);
   }
   getClass(){
-    const {value,hideTag,placeholder} = this.props;
+    const {value,hideTag,placeholder,show} = this.props;
+    if(show){
+      $(this.$cont.current).addClass(style['borderd']);
+    }else{
+      $(this.$cont.current).removeClass(style['borderd']);
+    }
     if(hideTag){
       return style['no-tag'];
     }
-    if(value&&value!=placeholder){
+    if(value){
       return style['selected-tag'];
     }
     return style['tag'];
@@ -114,7 +121,7 @@ class RadioDrop extends Component{
   }
   render(){
     const {data,prefix,suffix,placeholder,show,value} = this.props;
-    return <div className={style['container']}>
+    return <div className={style['container']} ref = {this.$cont}>
       {prefix}
       <div className={this.getClass()}
            onBlur={this.handleEditLabel}

src/components/SearchDrop/index.less

@@ -1,5 +1,7 @@
 @import "~@less/variables.less";
 .list{
+  max-height:300px;
+  overflow-y: auto;
   .pop;
   left: 85px;
   padding: 0 0 10px;

src/components/SpreadDrop/index.jsx

@@ -55,7 +55,8 @@ class SpreadDrop extends Component{
     e&&e.stopPropagation();
     let boxLeft = e.pageX -175 + 'px';
     let offsetTop = e.target.offsetTop;
-    let boxTop = offsetTop + 29 + 'px';
+    const ht = e.target.offsetHeight;   //如杂音选中文字有多行时，写死会遮挡
+    let boxTop = offsetTop + ht +2 + 'px';
     this.setState({
       boxLeft:boxLeft,
       boxTop:boxTop
@@ -124,6 +125,7 @@ class SpreadDrop extends Component{
     if(editable){
       // 更改标签的value值
       let changeVal = e.target.innerText;
+      e.target.innerText = '';      //避免出现重复输入值
       handleLabelChange && handleLabelChange({ikey,changeVal,type});
     }
     this.setState({
@@ -173,7 +175,7 @@ class SpreadDrop extends Component{
     const {handleConfirm,ikey,type,tagType,order,mainSaveText,copyType} = this.props;
     const params = Object.assign({},this.state,{ikey,type,tagType,order,mainSaveText,copyType});
     handleConfirm&&handleConfirm(params);
-	this.btnClickFlag = true;
+	  this.btnClickFlag = true;
     //点确定后隐藏弹窗
     this.props.handleHide();
   }
@@ -280,6 +282,11 @@ class SpreadDrop extends Component{
     });
   }
   getClass(){
+    if(this.props.show){
+      $(this.$div.current).addClass(style['borderd']);
+    }else{
+      $(this.$div.current).removeClass(style['borderd']);
+    }
     if(this.props.value){
       return style['selected-tag'];
     }

src/components/SpreadDrop/index.less

@@ -6,7 +6,7 @@
 }
 .drop-list{
   .pop;
-  padding:20px;
+  padding:20px 20px 20px 0;
   .row{
     display: inline-block;
     // width: 200px;
@@ -21,7 +21,7 @@
     border-bottom: 1px @disable-border-color solid;
   }
   li{
-    padding-left: 40px;
+    padding-left: 20px;
     cursor: pointer;
     .mult-li;
   }
@@ -40,9 +40,6 @@
   cursor: pointer;
   line-height: 20px;
 }
-.tag{
-  .tag;
-}
 
 .selected-tag{
   padding: 0;

src/components/Treat/DrugTreat/index.jsx

@@ -49,11 +49,11 @@ class DrugTreat extends Component {
                                 return ((it.isShow == 1 || it.selected) && <span style={it.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)'} : ''}>
                                         {ii === 0 ? '' : ', '}
                                         <span className={style['drug-name']}  
-                                            onDoubleClick={() =>{this.setDrugInfo(it);showDrugInfo();}} 
+                                            // onDoubleClick={() =>{this.setDrugInfo(it);showDrugInfo();}}  //药品说明双击显示（现在为点击图标显示）
                                             onClick={()=>{it.forbidden === '2' ? '' : this.handleSelect(index,ii)}} style={it.selected ? {color: '#3B9ED0', borderBottom: '1px solid #3B9ED0'}:''}>
                                             {it.medicitionName}
                                         </span>
-                                        {/* {it.showInfo && it.showInfo==='1'&& <img className={style['info-img']} src={info} onClick={() =>{this.setDrugInfo(it);showDrugInfo();}}/>} */}
+                                        {<img className={style['info-img']} src={info} onClick={() =>{this.setDrugInfo(it);showDrugInfo();}}/>}
                                         {it.forbidden === '1' ? <span className={style['info-flag']} style={{border: '1px solid #F4C051', background: '#F4C051',marginLeft: '5px'}}>慎用</span>: it.forbidden === '2' ? <span className={style['info-flag']} style={{border: '1px solid #000',marginLeft: '5px'}}>禁用</span> : ''}, 使用率{it.rate}
                                         
                                     </span>)

src/components/TreatDesc/DrugInfo/index.less

@@ -27,7 +27,7 @@
 .close-drug-desc {
     position: absolute;
     right: 0;
-    width: 30px;
+    width: 40px;
 }
 .drug-desc-item {
     padding: 5px 0;

src/components/TreatDesc/index.jsx

@@ -39,14 +39,17 @@ class TreatDesc extends Component {
                 { otherDrugIndex > -1 && <div  className={style['similar-drug']}>
                     <h3 className={style['drug-desc-title']}>同类药物  <img src={close} onClick={this.hideTreatDesc} className={style['close-drug-desc']} /></h3>
                     {treatment[otherDrugIndex].medicitionsList.map((item, index) =>{
-                        return (<span style={item.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)'} : ''}>
-                        {index === 0 ? '' : ', '}                   
-                        <span className={style['drug-name']} 
-                              onDoubleClick={() =>{setDrugInfo(item);showDrugInfo();}} 
-                              onClick={()=>{item.forbidden === '2' ? '' : this.handleSelect(otherDrugIndex,index)}} 
-                              style={item.selected ? {color: '#3B9ED0'}:''}>
-                            {item.medicitionName}
-                        </span>
+                        return (<span   style={item.forbidden === '2' ? {opacity: '0.3', filter:'alpha(opacity=30)'} : ''}>
+                        {index === 0 ? '' : ', '}     
+                        <span className={style['drug-name-box']}>
+                            <span className={style['drug-name']} 
+                                onDoubleClick={() =>{setDrugInfo(item);showDrugInfo();}} 
+                                onClick={()=>{item.forbidden === '2' ? '' : this.handleSelect(otherDrugIndex,index)}} 
+                                style={item.selected ? {color: '#3B9ED0'}:''}>
+                                {item.medicitionName}
+                            </span>
+                        </span>              
+                        
                         {/* {item.showInfo && item.showInfo==='1'&& <img className={style['info-img']} src={info} />} */}
                         {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}
                         

src/components/TreatDesc/index.less

@@ -46,11 +46,16 @@
     background: #fff;
     padding: 60px 20px 80px;
 }
-
-.drug-name {
+.drug-name-box {
     display: inline-block;
     height: 30px;
 }
+.drug-name {
+    border-bottom: 1px solid #666;
+    display: inline-block;
+    cursor: pointer;
+    
+}
 .info-img {
     width: 12px;
     margin: 0 3px -1px;

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(state)
+function mapStateToProps(state) { 
   const {homePage} = state;
     return {
         data:state.currentIll.data,//主诉模板

src/containers/NumberDrop.js

@@ -79,7 +79,7 @@ function mainSuitLabel(dispatch,params){
   dispatch({
     // type:CHANGE_LABELVAL,
     type:CHANGE_LABELVAL_NUMBER,
-    data:{changeVal:changeVal,ikey:ikey,totalVal}
+    data:Object.assign({},params,{ikey})
   })
 }
 // 现病史
@@ -89,19 +89,19 @@ function currentLabel(dispatch,params){
   dispatch({
     // type:CURRENT_TEXT_LABEL,
     type:CURRENT_TEXT_LABEL_NUMBER,
-    data:{changeVal:params.changeVal,ikey:ikey}
+    data:Object.assign({},params,{ikey})
   })
 }
 
 //其他史
 function otherHisLabelEdit(dispatch,params){
   const index = params.ikey;
-  const {changeVal,totalVal} = params;
+  //const {changeVal,totalVal} = params;
   let ikey = getLabelIndex(index);
   dispatch({
     // type:CHANGEOTHERTEXTLABEL,
     type:CHANGEOTHERTEXTLABEL_NUMBER,
-    data:{changeVal:changeVal,ikey:ikey,totalVal}
+    data:Object.assign({},params,{ikey})
   })
 }
 
@@ -109,11 +109,11 @@ function otherHisLabelEdit(dispatch,params){
 function checkBodyLabelEdit(dispatch,params){
   const index = params.ikey;
   let ikey = getLabelIndex(index);
-  const {changeVal,totalVal} = params;
+  //const {changeVal,totalVal} = params;
   dispatch({
     // type:CHANGECHECKTEXTLABEL,
     type:CHANGECHECKTEXTLABEL_NUMBER,
-    data:{changeVal:changeVal,ikey:ikey,totalVal}
+    data:Object.assign({},params,{ikey})
   })
 }
 function mapDispatchToProps(dispatch,store){

src/containers/TypeConfigContainer.js

@@ -11,6 +11,8 @@ import {Notify} from '@commonComp';
 
 function mapStateToProps(state) {
   return {
+    disVisible:state.copyRight.disVisible,
+    copyVisible:state.copyRight.copyVisible,
     //failed:state.typeConfig.failed,
     typeConfig:state.typeConfig.typeConfig||config.defaultValue.mode,
     visible:state.typeConfig.visible

src/modules/HomePage/index.jsx

@@ -6,7 +6,7 @@ import BodyContainer from "@components/BodyContainer";
 
 import {HIDEDROP} from '@store/types/homePage.js';
 import style from './index.less';
-import {getInitModules} from '@store/async-actions/homePage.js';
+/*import {getInitModules} from '@store/async-actions/homePage.js';*/
 import { getUrlArgObject } from "@utils/tools";
 
 class HomePage extends Component {
@@ -17,7 +17,7 @@ class HomePage extends Component {
         }
     }
     
-    componentDidMount(){
+    /*componentDidMount(){
         clearTimeout(this.state.timer);
         const that = this;
         const timer = setTimeout(function(){//解决患者信息在获取模板之后的问题
@@ -26,7 +26,7 @@ class HomePage extends Component {
         this.setState({
             timer
         })      
-    }
+    }*/
     render() {
         return <div className={style['home-page']} onClick={this.props.hideAllDrop}>
             <BannerContainer />
@@ -48,9 +48,9 @@ const mapDispatchToProps = function (dispatch) {
               type:HIDEDROP
             });
         },
-        getInit(){
+        /*getInit(){
             dispatch(getInitModules);
-        }
+        }*/
     }
 };
 

src/store/actions/checkBody.js

@@ -38,7 +38,7 @@ export function setNumberValue(state,action){
 }
 
 //查体单选下拉选中
-export function setRadioValue(state,action){console.log(221)
+export function setRadioValue(state,action){
   let res = Object.assign({},state);
   const {ikey,id,text} = action;
   let labelInx = getLabelIndex(ikey);
@@ -119,7 +119,6 @@ export function setCheckBoxValue(state,action) {
     showText = showText.substr(0,showText.length-1);
   }
   res.data[labelInx].value = showText;
-  res.saveText[labelInx] = showText;
   res.selecteds[labelInx] = action.data;
   res.saveText = fullfillText(res.data).saveText;
   res.update = Math.random();
@@ -142,20 +141,22 @@ export function insertLabelData(state,action){
   const searchStr = res.searchStr;
   const {index,data,isReplace,span,searchInEnd}=action;
   const showText = res.saveText[index];
-  const spreadLabels = data;
+  const spreadLabels = data.tagType==4?fullfillText(data.questionMapping).newArr:[data];
   let reg = searchInEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
   const newText=showText.replace(reg,'')||'';
   if(!isReplace){
     span.current.innerText = newText;
     const pText = Object.assign({},text,{value:newText});
     if(searchInEnd){
-      res.data.splice(index,1,pText,spreadLabels,text);
-      res.saveText.splice(index,1,newText,'','');
-      res.selecteds.splice(index,1,null,null,null);
+      res.data.splice(index,1,pText,...spreadLabels,text);
+      res.saveText = fullfillText(res.data).saveText;
+      //res.saveText.splice(index,1,newText,'','');
+      res.selecteds.splice(index,1,null,new Array(spreadLabels.length).fill(null),null);
     }else{
-      res.data.splice(index,1,text,spreadLabels,pText);
-      res.saveText.splice(index,1,'','',newText);
-      res.selecteds.splice(index,1,null,null,null);
+      res.data.splice(index,1,text,...spreadLabels,pText);
+      res.saveText = fullfillText(res.data).saveText;
+      //res.saveText.splice(index,1,'','',newText);
+      res.selecteds.splice(index,1,null,new Array(spreadLabels.length).fill(null),null);
     }
 
   }else{
@@ -177,23 +178,24 @@ export function insertLabelData(state,action){
 
 export const changeLabelVal = (state,action)=>{//双击标签输入改变值
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;     //下拉修改的内容
-  const totalVal = action.data.totalVal;    //包含前后缀修改的内容
-  let labText = totalVal?totalVal:newVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;     //下拉修改的内容
+  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
   let item = res.data[index];
   // if(newVal && newVal.trim()){
   if(labText && labText.trim()){
     if(item){
       item.value = newVal;
+      item.labelPrefix = prefix||'';
+      item.labelSuffix = suffix||'';
       // res.saveText[index] = totalVal;
       res.saveText[index] = labText;
     }
   }else{//删除完标签内容则删除该标签
     res.data.splice(index,1);
     res.saveText = fullfillText(res.data).saveText;
-  } 
-  
+  }
   res.update = Math.random();
   return res;
 }
@@ -201,14 +203,17 @@ export const changeLabelVal = (state,action)=>{//双击标签输入改变值
 // 数字键盘较特殊，有直接输入
 export const changeNumLabelVal = (state,action)=>{
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
   let item = res.data[index];
-  if(newVal.trim()){
+  if(totalVal.trim()){
     if(item){
       item.value = newVal;
+      item.labelPrefix = prefix||'';
+      item.labelSuffix = suffix||'';
     }
-    res.saveText[index] = newVal;
+    res.saveText[index] = totalVal;
   }else{//删除完标签内容则删除该标签
     res.data.splice(index,1);
     res.saveText = fullfillText(res.data).saveText;

src/store/actions/currentIll.js

@@ -385,13 +385,17 @@ export function setRadioValue(state,action){
 //双击标签输入改变值
 export const changeLabelVal = (state,action)=>{
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
+  let labText = totalVal?totalVal:newVal;
   let item = res.data[index];
-  if(newVal.trim()){
+  if(labText.trim()){
     if(item){
       item.value = newVal;
-      res.saveText[index] = newVal;
+      item.labelPrefix = prefix||'';
+      item.labelSuffix = suffix||'';
+      res.saveText[index] = labText;
     }
   }else{//删除完标签内容则删除该标签
     res.data.splice(index,1);
@@ -404,13 +408,22 @@ export const changeLabelVal = (state,action)=>{
 // 数字键盘较特殊，有直接输入
 export const changeNumLabelVal = (state,action)=>{
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
   let item = res.data[index];
-  if(item){
-    item.value = newVal;
+  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
+  if(labText.trim()){
+    if(item){
+      item.value = newVal;
+      item.labelPrefix = prefix||'';
+      item.labelSuffix = suffix||'';
+    }
+    res.saveText[index] = labText;
+  }else{//删除完标签内容则删除该标签
+    res.data.splice(index,1);
+    res.saveText = fullfillText(res.data).saveText;
   }
-  res.saveText[index] = newVal;
   res.update = Math.random();
   return res;
 }

src/store/actions/mainSuit.js

@@ -358,7 +358,7 @@ export const insertSearch = (state,action)=>{
       res.saveText.splice(focusIndex+1,0,searchData);
       res.data[focusIndex].value = value;
     }
-    span.current.innerText = value; 
+    span.current.innerText = value;
     res.mainIds.push(id);
   }
   // console.log(456,res,action);
@@ -475,18 +475,22 @@ export const changeLabelVal = (state,action)=>{
 // 数字键盘较特殊，有直接输入
 export const changeNumLabelVal = (state,action)=>{
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
+  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
   let item = res.data[index];
-  if(newVal.trim()){
+  if(labText.trim()){
     if(item){
       item.value = newVal;
-      res.saveText[index] = newVal;
+      item.labelPrefix = prefix||'';
+      item.labelSuffix = suffix||'';
+      res.saveText[index] = labText;
     }
   }else{//删除完标签内容则删除该标签
     res.data.splice(index,1);
     res.saveText = fullfillText(res.data).saveText;
-  }  
+  }
   res.update = Math.random();//console.log(44,action,res);
   return res;
 }

src/store/actions/otherHistory.js

@@ -32,6 +32,7 @@ export const confirm = (state,action) =>{
   if(items.length==0&&nones){
     arr[ikey-1].value = newPreText;
     res.saveText[ikey-1] = newPreText;
+    res.selecteds[ikey] = null;       //无殊选中状态遗留bug修改
     res.update=Math.random();
     return res;
   }
@@ -182,18 +183,19 @@ export function insertLabelData(state,action){
   const searchStr = res.searchStr;
   const {index,data,isReplace,span,searchInEnd}=action;
   const showText = res.saveText[index];
-  const spreadLabels = data;
+  const spreadLabels = data.tagType==4?fullfillText(data.questionMapping).newArr:[data];
   let reg = searchInEnd?new RegExp(searchStr+"$"):new RegExp("^"+searchStr);
   const newText=showText.replace(reg,'')||' ';
   if(!isReplace){
     span.current.innerText = newText;
     const pText = Object.assign({},text,{value:newText});
     if(searchInEnd){
-      res.data.splice(index,1,pText,spreadLabels,text);
-      res.saveText.splice(index,1,newText,'','');
+      res.data.splice(index,1,pText,...spreadLabels,text);
+      res.saveText = fullfillText(res.data).saveText;
+      //res.saveText.splice(index,1,newText,'','');
     }else{
-      res.data.splice(index,1,spreadLabels,pText,text);
-      res.saveText.splice(index,1,'',newText,'');
+      res.data.splice(index,1,...spreadLabels,pText,text);
+      res.saveText = fullfillText(res.data).saveText;//.splice(index,1,'',newText,'');
     }
   }else{
     span.current.innerText = ' ';
@@ -213,13 +215,17 @@ export function insertLabelData(state,action){
 
 export function changeTextLabel(state,action) {
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
   let item = res.data[index];
-  if(newVal.trim()){
+  let labText = totalVal?totalVal:newVal;
+  if(labText.trim()){
     if(item){
       item.value = newVal;
-      res.saveText[index] = newVal;
+      item.labelPrefix = prefix||'';
+      item.labelSuffix = suffix||'';
+      res.saveText[index] = labText;
     }
   }else{//删除完标签内容则删除该标签
     res.data.splice(index,1);
@@ -232,13 +238,22 @@ export function changeTextLabel(state,action) {
 // 数字键盘较特殊，有直接输入
 export const changeNumLabelVal = (state,action)=>{
   const res = Object.assign({},state);
-  const index = action.data.ikey;
-  const newVal = action.data.changeVal;
+  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
+  const index = ikey;
+  const newVal = changeVal;
   let item = res.data[index];
-  if(item){
-    item.value = newVal;
-  }
-  res.saveText[index] = newVal;
+  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
+  if(labText.trim()){
+    if(item){
+      item.value = newVal;
+      item.labelPrefix = prefix||'';
+      item.labelSuffix = suffix||'';
+    }
+    res.saveText[index] = labText;
+  }else{//删除完标签内容则删除该标签
+    res.data.splice(index,1);
+    res.saveText = fullfillText(res.data).saveText;
+  };
   res.update = Math.random();
   return res;
 }

src/store/async-actions/patInfo.js

@@ -21,7 +21,7 @@ export const initPersonInfo = (dispatch, getState) => {
         const data = res.data;
         if (data.code == 0) {
             dispatch(getInfos(data.data));
-            console.log(data.data)
+            //console.log(data.data)
             getPatientMessage(dispatch, getState);
         } else {
             console.log(res)
@@ -94,6 +94,7 @@ export const getPatientMessage = (dispatch, getState) => {
         type: CONFIRM_TYPE,
         confirmType:data1.modeValue
       });
+      dispatch(getInitModules);     //确保病人信息获取以后再获取模板等数据，否则参数为空
       if(state.tabTemplate.items.length == 0){
         dispatch(initItemList(data1.modeValue));        //模板列表没有就获取模板列表用于保存时做数据对比是否保存过
       }

src/store/async-actions/tabTemplate.js

@@ -5,6 +5,7 @@ import {
   batchDelItems,
   changeTitle,
   keepPushData,
+  changeVisible
 } from '@store/actions/tabTemplate';
 import {DIAG_SHOW} from "@store/types/print";
 import Notify from '@commonComp/Notify';
@@ -125,15 +126,16 @@ export const delBatchItem = (ids) => { //批量删除
 export const changeTitleAsync = (obj) => { //改标题
   let baseList = store.getState();
   let whichSign = baseList.typeConfig.typeConfig;
+  let state = baseList.patInfo.message;
   if (obj.title == '') {
     Notify.success('请输入模板名称');
     return;
   }
   return (dispatch) => {
     axios.json('/api/icss/templateInfo/updateByIdUsNames', {
-      "doctorId": 1,
-      "hospitalDeptId": 1,
-      "hospitalId": 1,
+      "doctorId": state.doctorId,
+      "hospitalDeptId": state.hospitalDeptId,
+      "hospitalId": state.hospitalId,
       "id": obj.id,
       "modeName": obj.title,
       "type": whichSign
@@ -142,6 +144,7 @@ export const changeTitleAsync = (obj) => { //改标题
       if (data.code == 0) {
         dispatch(changeTitle(obj));
         Notify.success('标题修改成功');
+        store.dispatch(changeVisible(false))
       } else {
         console.log(data)
         Notify.error(data.msg)

src/store/reducers/assistCheck.js

@@ -20,7 +20,7 @@ function getCurrentDate() {
     let date = year+'-'+(mon<10?'0'+mon:mon)+'-'+(day<10?'0'+day:day);
     return date;
 }
-export default (state = initSearchList, action) => {
+export default (state = initSearchList, action) => { 
     if (action.type == GET_ASSIST_SEARCH_LIST) {
         const newState = Object.assign({}, state);
         newState.list = action.list
@@ -39,7 +39,7 @@ export default (state = initSearchList, action) => {
             }
         }
         for (let j = 0; j < tempArrs.length; j++) {
-            tmpString += (tempArrs[j].name+(tempArrs[j].value?('：'+tempArrs[j].value):'')+(tempArrs[j].time?'，报告日期：'+tempArrs[j].time:'')+';')
+            tmpString += (tempArrs[j].name+(tempArrs[j].value?(':'+tempArrs[j].value):'')+(tempArrs[j].time?'，报告日期:'+tempArrs[j].time:'')+';')
         }
         newState.dataString = tmpString
         return newState;
@@ -54,7 +54,7 @@ export default (state = initSearchList, action) => {
             return
         }
         for (let i = 0; i < tempArr.length; i++) {
-            tmpString += (tempArr[i].name+(tempArr[i].value?('：'+tempArr[i].value):'')+(tempArr[i].time?'，报告日期：'+tempArr[i].time:'')+';')
+            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value):'')+(tempArr[i].time?'，报告日期:'+tempArr[i].time:'')+';')
         }
         newState.assistLabel = [...tempArr]
         newState.dataString = tmpString
@@ -69,7 +69,7 @@ export default (state = initSearchList, action) => {
                 tempArr[i].value = action.val
                 newState.assistLabel = [...tempArr]
             }
-            tmpString += (tempArr[i].name+(tempArr[i].value?('：'+tempArr[i].value):'')+(tempArr[i].time?'，报告日期：'+tempArr[i].time:'')+';')
+            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value):'')+(tempArr[i].time?'，报告日期:'+tempArr[i].time:'')+';')
         }
         newState.dataString = tmpString
         return newState;
@@ -83,7 +83,7 @@ export default (state = initSearchList, action) => {
                 tempArr[i].time = action.date
                 newState.assistLabel = [...tempArr]
             }
-            tmpString += (tempArr[i].name+(tempArr[i].value?('：'+tempArr[i].value):'')+(tempArr[i].time?'，报告日期：'+tempArr[i].time:'')+';')
+            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value):'')+(tempArr[i].time?'，报告日期:'+tempArr[i].time:'')+';')
         }
         newState.dataString = tmpString
         return newState;

src/store/reducers/currentIll.js

@@ -16,7 +16,7 @@ const initState = {
   emptyData:[],
   symptomIds:[] //搜索去重
 };
-export default function(state=initState,action){
+export default function(state=initState,action){    
   const res = Object.assign({},state);
   switch (action.type){
     case SET_CURRENT://需要处理截取的模板

src/utils/tools.js

@@ -218,7 +218,7 @@ const getAllDataStringList =(baseList) =>{           //获取所有模块文本
       'diag' : baseList.diagnosticList.diagnosticStr,
       'advice' : baseList.pushMessage.AdviceStr
     }
-    // console.log(jsonDataString,'文本模式数据获取')
+    console.log(jsonDataString,'文本模式数据获取')
     return jsonDataString;
 }
 /**