Squashed commit of the following:

commit 5cecd2227caba34839470247d67bbcb16beee90c
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 19:12:17 2019 +0800

    量表选中项保存

commit 317b2725f592ced18cc2cfef61528482fa182263
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 17:19:07 2019 +0800

    主诉现病史数字键盘双击编辑action修改

commit fbff2678834c35cfe5a044edd580edbed19b3750
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 15:09:31 2019 +0800

    计算公式结果显示顺序调整

commit c3b9b62875954b0d8a4cf12f712d62abfddc2c9e
Merge: 6bfc279 e29d746
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 14:40:20 2019 +0800

    Merge branch 'dev/new1' into ChronicMag

commit 6bfc2797411920157c8f86628efe00e843d117ba
Merge: 8285d7d 8239b4f
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 14:39:58 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

commit 8285d7d16099db43022145919f065bf60c8837ed
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 14:39:40 2019 +0800

    计算公式结果显示顺序调整

commit e29d7466bf39864fc618173965eeba21ebcf85bb
Merge: daefc2a 950a0a4
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 14:36:36 2019 +0800

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

commit daefc2accca1d3510d84fb13e3ead11cd54a7ba4
Merge: 29a5821 8239b4f
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 14:35:32 2019 +0800

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

    # Conflicts:
    #	src/components/AssessResult/AssessHis/index.jsx
    #	src/containers/AssessResult.js

commit 950a0a4cdb593e3c27d7db5f926612d27cdcd8cb
Merge: 29a5821 8239b4f
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue May 14 14:34:11 2019 +0800

    merge from 'ChronicMag'

commit 8239b4f6869e3591ef74a712eb0930042e219bea
Merge: b66c626 f551eeb
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue May 14 14:30:36 2019 +0800

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

commit b66c6265589160fef529f016fb46d7f1814541bc
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue May 14 14:30:08 2019 +0800

    同类药物药品说明书图标

commit f551eeb2193368ef0511f676357f9d115c490a85
Merge: 632ac8f 199b132
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 14:23:06 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

commit 632ac8fb35e0e54b75b60c66bb452d64f9c27078
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 14:22:42 2019 +0800

    历史病例全部量表中加入的显示bug修改1375

commit 3a8f57ff9da42ed0f6af192d0e312f5c99c0c1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Tue May 14 14:06:58 2019 +0800

    不良反应添加智能推荐

commit 9de8cb7848193263abb5cfc6ccd45965d5d605a8
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 14:00:57 2019 +0800

    null不显示1373

commit f36369462d405065d790b0ded5810b4cd97bdb67
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 13:49:00 2019 +0800

    评估弹窗计算公式跳bug1330

commit 199b13238aa79cd623bfe13c5bb3004293dfb7f7
Author: Luolei <16657115156@163.com>
Date:   Tue May 14 10:48:08 2019 +0800

    辅检bug

commit 43be8fd45965d608d7844ec72dc95e8095dcc99b
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 20:08:07 2019 +0800

    计算公式相关变量整理

commit 29a58217d911655887bd3a9d3b56cdacc3936e97
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 13 17:51:08 2019 +0800

    Squashed commit of the following:

    commit 7ab97d32ae5663dd04118f943557f800fbcf688e
    Merge: d1abfc9 eb3810e
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 13 16:56:39 2019 +0800

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

    commit d1abfc945fb67ce4d4cec28b60f95ed19894fc37
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 13 16:56:28 2019 +0800

        输入框类型onInput事件处理；可能结果下拉框的值与选择结果保持一致

    commit eb3810e976a66fc4dfc2a6b2a7180fdf55e4d1c5
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon May 13 16:48:56 2019 +0800

        图表图标对应

    commit 3291b1f2c1446fbaabef6cd7aca9a182772dc3ea
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon May 13 15:46:31 2019 +0800

        管理评估添加loading

    commit 9ed2c65f42508ae1510b6044512f3f6639af384c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon May 13 15:17:32 2019 +0800

        历史评估图表显示bug修改1359

commit 9611eff953c3b5ccf791628766c151182f634836
Merge: 9c24780 7ab97d3
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 17:01:26 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

commit 9c24780e9277d3e2c5177ca083c1f1637907bd0e
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 17:01:12 2019 +0800

    评估说明不显示bug修改1329

commit 7ab97d32ae5663dd04118f943557f800fbcf688e
Merge: d1abfc9 eb3810e
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 13 16:56:39 2019 +0800

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

commit d1abfc945fb67ce4d4cec28b60f95ed19894fc37
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 13 16:56:28 2019 +0800

    输入框类型onInput事件处理；可能结果下拉框的值与选择结果保持一致

commit eb3810e976a66fc4dfc2a6b2a7180fdf55e4d1c5
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 16:48:56 2019 +0800

    图表图标对应

commit 3291b1f2c1446fbaabef6cd7aca9a182772dc3ea
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 15:46:31 2019 +0800

    管理评估添加loading

commit 9ed2c65f42508ae1510b6044512f3f6639af384c
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 15:17:32 2019 +0800

    历史评估图表显示bug修改1359

commit 299945cb014a2b94b93e128ce247b4ef825dbf11
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 14:53:05 2019 +0800

    容错

commit 3fb9db4c67864771e7ba956a5f6ec8c73d5aac8c
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 14:51:08 2019 +0800

    获取评估疾病外参数不写死

commit 699b6fd0548812418027d9f1d0173cf2326440e9
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 14:03:48 2019 +0800

    全部量表加入病例和删除

commit f1d3e0cf1fff0d71b79c944370ebf92e016abcbe
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 13:14:55 2019 +0800

    有结果才能加入病例

commit 112849b89c883adbe03cb2f79afcf0305c38793a
Merge: 626c805 f261490
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 11:37:21 2019 +0800

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

commit 626c80532067ac11ed5b7b8db09ff730b9bc8275
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 13 11:36:27 2019 +0800

    全部量表加入记录

commit f2614909da1cff9db4fb8a7e943e778ad20956ca
Merge: 12307ba 71df3b0
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon May 13 10:23:30 2019 +0800

    Merge branch 'ChronicMag' into dev/new1

commit 71df3b02bbc58de481f42cab46c053d9807e8e5d
Merge: ebe4e89 c98d00b
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon May 13 10:21:53 2019 +0800

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

commit ebe4e897008507a932d105f053c8505385f93d41
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon May 13 10:21:43 2019 +0800

    治疗方案添加到医嘱当id和大类名称都一样时添加小类名称比较

commit 12307bae90ebd96d7ebdb63a3d3704e6ceb4df74
Author: zhouna <zhouna@zjlantone.com>
Date:   Sat May 11 12:03:16 2019 +0800

    评估中可能结果推荐显示

commit b33aa13447696cce232d9a7c703ec4c5b60fe64f
Merge: 04d0c6f c98d00b
Author: zhouna <zhouna@zjlantone.com>
Date:   Sat May 11 11:53:33 2019 +0800

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

commit c98d00b9e57700c9a87bdde455eab4c4fc5d1db7
Author: zhouna <zhouna@zjlantone.com>
Date:   Sat May 11 11:53:11 2019 +0800

    查体收起bug修改1176

commit 8a6c34003ff3db8ee339d2e459061ebb14581e27
Author: zhouna <zhouna@zjlantone.com>
Date:   Sat May 11 11:41:24 2019 +0800

    计算公式推送不清空bug修改1315

commit 083bf8b605526df141e8a4ecf5b916ff6a8b6979
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 19:26:50 2019 +0800

    图表样式修改

commit b0a69d7e618f971cfaea4b18ec13c48c86c5327a
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 19:20:22 2019 +0800

    图表图例修改

commit 04d0c6ffc6dab00d163687bf46f795a40dc9c580
Merge: b484b89 756c60c
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 18:00:02 2019 +0800

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

commit 756c60c7e92734c4d510001ff8e9f62ff4f23486
Merge: 5b3cab7 735ceb5
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 17:57:51 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

commit 5b3cab7a16403368734b451a0bcfc2f398630c59
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 17:57:37 2019 +0800

    回退计算公式bug

commit 526a1bdc0d6cee5c391efbcc9803a25e9db21b3c
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 17:54:43 2019 +0800

    历史评估量表关闭bug修改

commit b484b89ad764f4df760c7ad624ad1425fc077742
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 10 17:39:15 2019 +0800

    Squashed commit of the following:

    commit 735ceb5b6e41f5d9827d00c1614cc789337c0856
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri May 10 17:34:06 2019 +0800

        时间单位组件调整；互斥项字数限制放开

    commit e324be3ce5df64ecfa5d27ac4f04bba1c22daf09
    Merge: eb0c3bd 4ed0ac1
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri May 10 17:28:13 2019 +0800

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

    commit eb0c3bd779ac70caf4add125c98d129559c33ced
    Merge: ae5da2b c854616
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri May 10 14:52:58 2019 +0800

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

    commit ae5da2b44f4e3fa24aa7d8d3cd727139c00eb6e6
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri May 10 14:52:48 2019 +0800

        引用历史病历时切换相应模式

commit 735ceb5b6e41f5d9827d00c1614cc789337c0856
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 10 17:34:06 2019 +0800

    时间单位组件调整；互斥项字数限制放开

commit e324be3ce5df64ecfa5d27ac4f04bba1c22daf09
Merge: eb0c3bd 4ed0ac1
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 10 17:28:13 2019 +0800

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

commit 88d1eac9f297c0012f538cbbf8c47c4b0f152c66
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 15:29:39 2019 +0800

    计算公式推送不清空1315

commit 17731660083e685f61ded543c2fbd4c11346f711
Merge: 99e0381 4ed0ac1
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri May 10 15:12:00 2019 +0800

    Merge branch 'ChronicMag' into dev/new1

commit 4ed0ac1f433aebae16819962871807e5cfcc1404
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri May 10 15:11:22 2019 +0800

    修改鼠标移入样式

commit 711d39bdbb637b0c1e3e681add0377b3086a078f
Merge: 9e7661f c854616
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri May 10 14:58:22 2019 +0800

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

commit 9e7661f2d415ae1082ecbe235d683380de0845ba
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri May 10 14:58:09 2019 +0800

    修改详情页不能滚动问题

commit 9b73e3aa9c21edec8ce655787e4fc581e0b2a49c
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 14:54:40 2019 +0800

    单选类型改为0

commit eb0c3bd779ac70caf4add125c98d129559c33ced
Merge: ae5da2b c854616
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 10 14:52:58 2019 +0800

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

commit ae5da2b44f4e3fa24aa7d8d3cd727139c00eb6e6
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 10 14:52:48 2019 +0800

    引用历史病历时切换相应模式

commit c854616202d285029b9eab1f953ccbfd0fdb4547
Merge: 50fd238 047114e
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 14:46:41 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

commit 50fd238c27607bab0aa805c197c5d6073c0fb90d
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 14:46:19 2019 +0800

    历史病例量表无数据提示1166，图表无数据提示1331

commit 047114e749ec816b32f3126c13ddcccd3de4aef0
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri May 10 14:15:04 2019 +0800

    修改同类药物收起图标

commit f4b8d4a2ccabb1ca8dad2aaaf70ed02a224ba541
Merge: 100f86f 66ab3ac
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri May 10 14:06:00 2019 +0800

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

commit 100f86f749651600cfebf4ccf0cb9c587ac6c317
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri May 10 14:05:08 2019 +0800

    修改infomation图标居中样式

commit 66ab3acbdf6ab5f3859d088874ae25c7e985863b
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 10 13:52:45 2019 +0800

    慢病字段2取1，全部量表添加“加入病历”按钮

commit 2282c77c8e4208f97015c1bcab1cdec7454fd650
Merge: 455eb66 cfbb117
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri May 10 11:50:56 2019 +0800

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

commit 455eb66fdb069abade0d9d854a947c25a993906a
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Fri May 10 11:50:35 2019 +0800

    清除的时候清除保存的回访时间和不良反应

commit cfbb117bffe11dabd733f97838bedcae591fe71e
Merge: e3570fe d121b63
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 09:51:20 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

commit e3570fe648ea626d073ec2e07bc3c90780f5cd10
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 10 09:51:09 2019 +0800

    重新打开历史评估收起按钮还原，整体评估保存1329

commit 99e03819ff4c932963ffab246a2f7e23457b9d9a
Merge: 9fa60ba d121b63
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 17:45:17 2019 +0800

    merge from 'chronicMag'

commit d121b631937755a84d6c5e183713fadeac867ae8
Merge: 22a9006 afa920d
Author: liucf <liucf@zjlantone.com>
Date:   Thu May 9 17:23:57 2019 +0800

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

commit 22a9006dad60aab2a146046ae7363c2ce8171ef8
Author: liucf <liucf@zjlantone.com>
Date:   Thu May 9 17:23:46 2019 +0800

    慢病填充模板，现病史更改编辑状态

commit afa920d99609acb3f69842f27274220f8e8b5d8f
Merge: 9831a28 9f9c16e
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 17:13:47 2019 +0800

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

commit 9831a28a82fc1cb7eae6dce7a8a783ca16766fca
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 17:13:35 2019 +0800

    修改不良反应说明标题和没内容时提示

commit 9f9c16e6c1177dc5bf0f7344e8adccd847207c80
Merge: 18feefa 217e0c6
Author: liucf <liucf@zjlantone.com>
Date:   Thu May 9 16:54:47 2019 +0800

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

commit 18feefa694331e26c7e5b7bef7f81f2402112d04
Author: liucf <liucf@zjlantone.com>
Date:   Thu May 9 16:54:33 2019 +0800

    文本模式下现病史中复诊去掉分号

commit 217e0c6737886e0273ecbcb86cac8de29108a9f9
Merge: 746f72a 7a1dee0
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 16:42:18 2019 +0800

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

commit 746f72ab5be39561cacb8fab055676977f067a3b
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 16:42:05 2019 +0800

    清除时清除掉治疗方案的回访时间列表

commit 7a1dee052660d0449382a3c7e0e3ffd7ae7e1edb
Merge: e19b880 d7520e8
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 9 16:40:56 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

commit 9fa60ba3ebbab0ee0b93f3cfc5e3b14ca2709b66
Author: liucf <liucf@zjlantone.com>
Date:   Thu May 9 16:37:24 2019 +0800

    Squashed commit of the following:

    commit d7520e8fad7a96a166a94e9f0f39a93d12c47ffd
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu May 9 16:31:33 2019 +0800

        获取量表接口动态入参

    commit a5ecde168841823a10451a50e7cf2cd886f1384b
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu May 9 16:07:28 2019 +0800

        请求失败时关闭loading

    commit 2272eed62c6cda488f623650ca59bd0d95a0709d
    Merge: 8974e91 443a8c4
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu May 9 15:59:17 2019 +0800

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

    commit 8974e91fcb666f314ce34f241f72acaa5dce434a
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu May 9 15:59:03 2019 +0800

        获取查体模板时加loading

    commit 443a8c46b3b52252b17130429a25e80d2431e203
    Merge: b41344d 040fc9f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 9 15:17:56 2019 +0800

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

    commit b41344d0e818e12af3e08c24b2446fbfe97d058f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 9 15:17:46 2019 +0800

        模板医嘱中添加回访时间和开单项

    commit 040fc9f2079b46d7e36edd7375222a31f04a96a7
    Merge: 0f6eb6b 3ad2996
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu May 9 15:15:37 2019 +0800

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

    commit 0f6eb6b2b43a3bf8464e54049499d95553d9b458
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu May 9 15:15:23 2019 +0800

        历史病历和治疗方案添加loading

    commit de4d7014f0407706f206d7434fea02899422b970
    Merge: 468d3d9 851f8fa
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 9 14:02:28 2019 +0800

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

    commit 468d3d9a2d8ea5c6d41ac0bcec347943b0389f04
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 9 14:02:13 2019 +0800

        修改检验检查样式

    commit 819465ac742b79ab88aa675a986d6af8ab5ea502
    Merge: b8ae295 d2d7c4d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 9 11:05:40 2019 +0800

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

    commit b8ae295393d78c690bf63c8bf4f01aef76ee5cdd
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 9 11:05:26 2019 +0800

        清除清除回访时间

    commit 8da8184d5c37e5f6197887819545fdd6eecf4fad
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 9 10:36:12 2019 +0800

        修改警惕样式

    commit 23899fe90e4051d901a23027200b481c8106329e
    Merge: 0d8cecb fff1ed8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 9 09:46:45 2019 +0800

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

    commit 0d8cecb09a7671d2b605efd2a249383a89fcdd78
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 9 09:46:32 2019 +0800

        说明书菜单栏高亮和内容匹配

commit d7520e8fad7a96a166a94e9f0f39a93d12c47ffd
Author: liucf <liucf@zjlantone.com>
Date:   Thu May 9 16:31:33 2019 +0800

    获取量表接口动态入参

commit e19b880451bc569b633e889824f140444d767149
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 9 16:12:45 2019 +0800

    历史病例查看结果收起结果bug修改

commit a5ecde168841823a10451a50e7cf2cd886f1384b
Author: liucf <liucf@zjlantone.com>
Date:   Thu May 9 16:07:28 2019 +0800

    请求失败时关闭loading

commit 2272eed62c6cda488f623650ca59bd0d95a0709d
Merge: 8974e91 443a8c4
Author: liucf <liucf@zjlantone.com>
Date:   Thu May 9 15:59:17 2019 +0800

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

commit 8974e91fcb666f314ce34f241f72acaa5dce434a
Author: liucf <liucf@zjlantone.com>
Date:   Thu May 9 15:59:03 2019 +0800

    获取查体模板时加loading

commit 58c4b5f0e302958a1f8971abde72fe6b3ea65b5e
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 9 15:50:05 2019 +0800

    历史病例查看结果收起结果1165

commit 41d07ad8b21eec930b1f1ae7c29857afdaeea1b4
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 15:45:09 2019 +0800

    切换模式清除医嘱输入内容

commit 443a8c46b3b52252b17130429a25e80d2431e203
Merge: b41344d 040fc9f
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 15:17:56 2019 +0800

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

commit b41344d0e818e12af3e08c24b2446fbfe97d058f
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 15:17:46 2019 +0800

    模板医嘱中添加回访时间和开单项

commit 040fc9f2079b46d7e36edd7375222a31f04a96a7
Merge: 0f6eb6b 3ad2996
Author: liucf <liucf@zjlantone.com>
Date:   Thu May 9 15:15:37 2019 +0800

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

commit 0f6eb6b2b43a3bf8464e54049499d95553d9b458
Author: liucf <liucf@zjlantone.com>
Date:   Thu May 9 15:15:23 2019 +0800

    历史病历和治疗方案添加loading

commit 2ccd3a6fcf79a8f1fd48fd48420bc81212523a73
Merge: 1a5552a 3ad2996
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 9 14:37:27 2019 +0800

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

commit 3ad29962531ed9bed195105bd327ec5c2d8c4906
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 9 14:36:37 2019 +0800

    历史病例量表bug修改

commit f895c55a5dc0713de1adfd9027710e7e27d67e9d
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 9 14:17:56 2019 +0800

    清空重新获取其他史记录1301，查体主诉空提示1296，查体展开收起bug1176

commit de4d7014f0407706f206d7434fea02899422b970
Merge: 468d3d9 851f8fa
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 14:02:28 2019 +0800

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

commit 468d3d9a2d8ea5c6d41ac0bcec347943b0389f04
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 14:02:13 2019 +0800

    修改检验检查样式

commit 8454ee5646eed2a10859e06a5455f79f50f17717
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 9 13:16:51 2019 +0800

    计算公式弹窗样式修改1318

commit 851f8fac518e7cbdf81647a46a1e4ae6117e4327
Merge: 72b89b6 039c3be
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 9 13:07:22 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

commit 72b89b69538b390daf5c0bdb56f227bdd4212f86
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 9 13:07:00 2019 +0800

    评估图表时间，样式修改

commit 819465ac742b79ab88aa675a986d6af8ab5ea502
Merge: b8ae295 d2d7c4d
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 11:05:40 2019 +0800

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

commit b8ae295393d78c690bf63c8bf4f01aef76ee5cdd
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 11:05:26 2019 +0800

    清除清除回访时间

commit 8da8184d5c37e5f6197887819545fdd6eecf4fad
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 10:36:12 2019 +0800

    修改警惕样式

commit 23899fe90e4051d901a23027200b481c8106329e
Merge: 0d8cecb fff1ed8
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 09:46:45 2019 +0800

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

commit 0d8cecb09a7671d2b605efd2a249383a89fcdd78
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 9 09:46:32 2019 +0800

    说明书菜单栏高亮和内容匹配

commit 1a5552a4f6b63d2b405350a4ccafbf93abe72ef2
Merge: e5d2667 f2bf620
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed May 8 18:12:38 2019 +0800

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

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

commit e5d2667aa01531f0f6d3764887e00a48b96914af
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 7 17:36:26 2019 +0800

    Squashed commit of the following:

    commit 352b054332f99885a6cd4ef5c504407aa93152b2
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 7 17:35:12 2019 +0800

        现病史部分代码优化

    commit bc08d0b0d32fbcabf3f26c07a1554a9d08099cf8
    Merge: e70ce0c 3538f81
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 7 17:29:05 2019 +0800

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

    commit e70ce0c810e879eb84c6819f7737210d31a563db
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 7 17:28:55 2019 +0800

        现病史无模板时saveText处理

    commit 3538f81446252e2cbe5e50f6eb1265404089384b
    Merge: f78ecc6 16f4a9b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 16:31:19 2019 +0800

        Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

    commit f78ecc64897377c4c8e5a3a65b55f4981d905334
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 16:30:34 2019 +0800

        现病史双击编辑数字键盘阻止冒泡1234

    commit 762a35f36ed8a2d5e7a361c8a0a5455c872ea263
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 16:26:49 2019 +0800

        现病史双击编辑阻止冒泡1225

    commit 7512723af99610e9fe3de469ad9532ed3ce788d0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 16:16:49 2019 +0800

        容错

    commit 16f4a9bd92d379e2115e7d10001df91309a8b9c3
    Merge: c1bf7dc 6f8fde5
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 7 15:04:15 2019 +0800

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

    commit c1bf7dc19fab28d1699cfad6473142352209d4f8
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 7 15:04:08 2019 +0800

        计算结果text为null处理

    commit 6f8fde5f1de4a2fd1ed9eeb19d4771abd46299b7
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 14:40:55 2019 +0800

        查体收起个数bug修改1176

    commit bb5f042e0b42cb38c6bdca1164b00b4479ad00e1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 13:15:35 2019 +0800

        查体收起遮挡加背景

    commit fada0ec114385c5664c515f4f86ba2618a096f9d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 12:23:58 2019 +0800

        其他史无数据显示模板，评估参数不写死

    commit 347443f14bf0902edbd8ca3cd1bbc943ec17d8af
    Merge: d4cb47b 6e43e19
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 11:10:20 2019 +0800

        Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

    commit d4cb47b6f2aee8d8134751c6b7262993d29c599f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 11:10:07 2019 +0800

        历史病例量表显示

    commit 6e43e1966c9f376c46f83af92da50021186977d5
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 7 10:54:02 2019 +0800

        可能结果添加推荐项

    commit 2ee6ba8b86b835e759429f811ca4d7ee7c073f26
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 6 17:07:34 2019 +0800

        右侧推送放开

    commit 65f81b639d8581348d50885584197e18f643536f
    Merge: 4011f28 a2f09ac
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 6 17:05:06 2019 +0800

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

    commit 4011f28c7f66f79d14ace47ce32e459bb7edde64
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 6 17:04:57 2019 +0800

        计算按钮显示字段修改

    commit a2f09ac4de68c23433a43db3dda66e489f7b555c
    Merge: 74e4f37 50a207d
    Author: Luolei <16657115156@163.com>
    Date:   Mon May 6 17:03:14 2019 +0800

        Merge branch 'Chronic-ll' into ChronicMag

    commit 50a207dc27beb237197ca553421b4f44e377ee68
    Author: Luolei <16657115156@163.com>
    Date:   Mon May 6 17:02:36 2019 +0800

        保存日期修改

    commit 74e4f373155c043eccd0b142a1c1039a38e2a254
    Merge: 4d13996 af6ea4c
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon May 6 16:49:28 2019 +0800

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

    commit 4d13996993605eea3f5e7638c58acf9085645293
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon May 6 16:49:09 2019 +0800

        修改慢病用药和普通病用药顺序

commit 58c7a71d2dda5eaf9efcca9f94aeb631da495538
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 7 15:05:43 2019 +0800

    Squashed commit of the following:

    commit 16f4a9bd92d379e2115e7d10001df91309a8b9c3
    Merge: c1bf7dc 6f8fde5
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 7 15:04:15 2019 +0800

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

    commit c1bf7dc19fab28d1699cfad6473142352209d4f8
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 7 15:04:08 2019 +0800

        计算结果text为null处理

    commit 6f8fde5f1de4a2fd1ed9eeb19d4771abd46299b7
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 14:40:55 2019 +0800

        查体收起个数bug修改1176

    commit bb5f042e0b42cb38c6bdca1164b00b4479ad00e1
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 13:15:35 2019 +0800

        查体收起遮挡加背景

    commit fada0ec114385c5664c515f4f86ba2618a096f9d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 12:23:58 2019 +0800

        其他史无数据显示模板，评估参数不写死

    commit 347443f14bf0902edbd8ca3cd1bbc943ec17d8af
    Merge: d4cb47b 6e43e19
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 11:10:20 2019 +0800

        Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

    commit d4cb47b6f2aee8d8134751c6b7262993d29c599f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue May 7 11:10:07 2019 +0800

        历史病例量表显示

    commit 6e43e1966c9f376c46f83af92da50021186977d5
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 7 10:54:02 2019 +0800

        可能结果添加推荐项

    commit 2ee6ba8b86b835e759429f811ca4d7ee7c073f26
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 6 17:07:34 2019 +0800

        右侧推送放开

    commit 65f81b639d8581348d50885584197e18f643536f
    Merge: 4011f28 a2f09ac
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 6 17:05:06 2019 +0800

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

    commit 4011f28c7f66f79d14ace47ce32e459bb7edde64
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 6 17:04:57 2019 +0800

        计算按钮显示字段修改

    commit a2f09ac4de68c23433a43db3dda66e489f7b555c
    Merge: 74e4f37 50a207d
    Author: Luolei <16657115156@163.com>
    Date:   Mon May 6 17:03:14 2019 +0800

        Merge branch 'Chronic-ll' into ChronicMag

    commit 50a207dc27beb237197ca553421b4f44e377ee68
    Author: Luolei <16657115156@163.com>
    Date:   Mon May 6 17:02:36 2019 +0800

        保存日期修改

    commit 74e4f373155c043eccd0b142a1c1039a38e2a254
    Merge: 4d13996 af6ea4c
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon May 6 16:49:28 2019 +0800

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

    commit 4d13996993605eea3f5e7638c58acf9085645293
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon May 6 16:49:09 2019 +0800

        修改慢病用药和普通病用药顺序

commit 6d066418584e0c2a9610808b9042dec642d9cecf
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 6 17:08:48 2019 +0800

    Squashed commit of the following:

    commit 2ee6ba8b86b835e759429f811ca4d7ee7c073f26
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 6 17:07:34 2019 +0800

        右侧推送放开

    commit 65f81b639d8581348d50885584197e18f643536f
    Merge: 4011f28 a2f09ac
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 6 17:05:06 2019 +0800

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

    commit 4011f28c7f66f79d14ace47ce32e459bb7edde64
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 6 17:04:57 2019 +0800

        计算按钮显示字段修改

    commit a2f09ac4de68c23433a43db3dda66e489f7b555c
    Merge: 74e4f37 50a207d
    Author: Luolei <16657115156@163.com>
    Date:   Mon May 6 17:03:14 2019 +0800

        Merge branch 'Chronic-ll' into ChronicMag

    commit 50a207dc27beb237197ca553421b4f44e377ee68
    Author: Luolei <16657115156@163.com>
    Date:   Mon May 6 17:02:36 2019 +0800

        保存日期修改

    commit 74e4f373155c043eccd0b142a1c1039a38e2a254
    Merge: 4d13996 af6ea4c
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon May 6 16:49:28 2019 +0800

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

    commit 4d13996993605eea3f5e7638c58acf9085645293
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon May 6 16:49:09 2019 +0800

        修改慢病用药和普通病用药顺序

commit 1a0cffac0bdb76b7502a928fc62a9f620b493bee
Merge: e4f4ef7 af6ea4c
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 6 16:48:04 2019 +0800

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

commit e4f4ef7073bc41eaeb3352b841fcd1f8f5ab7227
Merge: da4f7c6 55575a4
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 6 16:47:44 2019 +0800

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

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

commit da4f7c6d72fc178363ef54a83f825d5e6e02679e
Merge: 4fcc02f 44dbf93
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 6 16:46:28 2019 +0800

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

commit 55575a46fc14e632b31d53a5fe77bcd39cea3bc3
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 6 13:24:40 2019 +0800

    Squashed commit of the following:

    commit f45feb4822d8cf4101ff64909bc6541d09e8d1a5
    Merge: 8152ae4 96c3c29
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 6 13:19:36 2019 +0800

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

    commit 8152ae4d3e94567e76d9b8e65429b102df4bd25e
    Author: liucf <liucf@zjlantone.com>
    Date:   Mon May 6 13:19:26 2019 +0800

        主诉搜索结果容错处理

    commit 96c3c2945cee7f7f19ef3c8b83dd331999f455b3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Sun May 5 17:44:09 2019 +0800

        历史病例中评估文字判断，删除按钮删除

commit 4fcc02fc0890c4c312c308d5ff0dac77269b8866
Merge: 1b28c56 b13bab2
Author: zhouna <zhouna@zjlantone.com>
Date:   Sun May 5 17:05:39 2019 +0800

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

commit 1b28c5632aa157d10fd90e54eb52d8096d12ecfa
Merge: 936e718 a56840d
Author: zhouna <zhouna@zjlantone.com>
Date:   Sun May 5 17:05:22 2019 +0800

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

commit b13bab2182515e688634abac125b8286ce6820ba
Author: liucf <liucf@zjlantone.com>
Date:   Sun May 5 16:39:04 2019 +0800

    Squashed commit of the following:

    commit c1adeae4557977a31e96c42ea7b87bf29930384e
    Author: liucf <liucf@zjlantone.com>
    Date:   Sun May 5 16:35:57 2019 +0800

        清除时若页面为慢病内容则重新获取模板

    commit 3dfb8126b40c7475f01f89f7afea4f88d5e6ef2e
    Author: liucf <liucf@zjlantone.com>
    Date:   Sun May 5 15:25:24 2019 +0800

        Squashed commit of the following:

        commit 78b89e31fd0456bb7e91095afdcf7a7577f9e515
        Author: liucf <liucf@zjlantone.com>
        Date:   Sun May 5 15:15:42 2019 +0800

            Squashed commit of the following:

            commit ae9394cc73983ca2fd3f40ce9efd18190597a712
            Merge: e60c29f 30e6fd9
            Author: liucf <liucf@zjlantone.com>
            Date:   Sun May 5 14:56:25 2019 +0800

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

            commit e60c29f6fc2f280670dacad8ddba5301c7dbcd00
            Author: liucf <liucf@zjlantone.com>
            Date:   Sun May 5 14:56:09 2019 +0800

                现病史手动输入存值；量表内容根据type展示

        commit 522c7445609fa8340b6080debf72f79f693f3393
        Author: liucf <liucf@zjlantone.com>
        Date:   Sun May 5 15:10:39 2019 +0800

            现病史多选展开逻辑处理

        commit 936e7189ccd3bd7b1baeed70066356434f8ba81f
        Merge: 30e6fd9 569c75c
        Author: zhouna <zhouna@zjlantone.com>
        Date:   Tue Apr 30 17:39:48 2019 +0800

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

        commit 569c75c4ef0d00b1c18856e237fcc384a1231248
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Apr 30 17:09:46 2019 +0800

            Squashed commit of the following:

            commit 789538c57c5bc65feceb945f6e52211ae7599411
            Merge: 1e5597f f85a0d0
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 17:07:55 2019 +0800

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

            commit 1e5597f3e99480d8f87712844a131ae059738369
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 17:07:44 2019 +0800

                历史病例未选择病例直接点确定的情况处理

            commit f85a0d0d9230445337d5100a40cd0a03cc6ce5d6
            Merge: b2b2787 d6499d5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 16:38:34 2019 +0800

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

            commit b2b2787c6f6aadae1b35e5e4919f398ed9382f6e
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 16:37:00 2019 +0800

                不良反应初始化选中状态

            commit d6499d5ffb3dd05813a2ee53d733b1fde0665a97
            Merge: 2a9ae58 0d787a3
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 14:56:47 2019 +0800

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

            commit 2a9ae58a665feac264d4b047e1fb4329bffbf33e
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 14:56:36 2019 +0800

                量表项显示分数；未点计算直接关闭量表保存之前的选中项；量表结果同步

            commit 0d787a315235c3d60c6bef05ac6404acda6be879
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Apr 30 14:48:13 2019 +0800

                查体展开bug修改1097

            commit 3598f0386e32b1736ca5d986ed8a4dbb4837d8d8
            Merge: dc138c4 e08b366
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Apr 30 14:26:13 2019 +0800

                Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

            commit dc138c43658be0cf67569b993e2fbe1f480ec703
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Apr 30 14:26:04 2019 +0800

                样式修改

            commit e08b366be2e796f71d46646f2de7229420e46c39
            Merge: e7dbad6 01290a6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 13:56:36 2019 +0800

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

            commit e7dbad60ebfcc0b8d70944dc2a8ab74550532b0f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 13:56:23 2019 +0800

                判断是否存在治疗方案添加历史病历容错

            commit 18034574b6841b88ce5f8e29598df1a1fffeb41f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Apr 30 13:27:30 2019 +0800

                推荐结果历史显示bug修改1107

            commit 01290a66bab66b77e22a906c52ea04c6c18d49f8
            Merge: a3b0f48 27eb150
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 13:12:01 2019 +0800

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

            commit a3b0f488434b5012ca9025b082cb720687e3393b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 13:11:52 2019 +0800

                历史病例点击颜色修改，主诉共用诊断历史病例

            commit 27eb15092f711bc754d6a869baaa0ae9600bfec7
            Merge: 1c16cce 29169ab
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 11:39:23 2019 +0800

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

            commit 1c16cce4bd94bb18a4fad453d0baabcf46c04757
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 11:19:47 2019 +0800

                开单项显示到医嘱

            commit 5b09301416bcec54d7af0cee7dfa846a1e72ad23
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 11:19:37 2019 +0800

                修改核心指标静态信息类型

            commit 29169ab80ae62aae61d7081a615691ba25999a31
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 11:03:41 2019 +0800

                慢病bug修改

            commit 757123ddc349b5857e812c358913517c4ae1a2f4
            Merge: 05acdd4 7534d10
            Author: Luolei <16657115156@163.com>
            Date:   Mon Apr 29 15:00:48 2019 +0800

                Merge branch 'Chronic-ll' into ChronicMag

            commit 7534d1002b2449b7826a8e405924dd5c0d8c8409
            Author: Luolei <16657115156@163.com>
            Date:   Mon Apr 29 14:57:13 2019 +0800

                彈窗可移動添加

            commit 05acdd4c1baa4957fbaf9f8fb1881c9412166f58
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 14:44:50 2019 +0800

                量表计算无结果提示

            commit 84c5a28777a7f268d0e7a77298ecff1d8192bb3a
            Merge: 09481b6 dd9204c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:47:46 2019 +0800

                Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

            commit 09481b6bdaea5b66ccfac950d432f92f7b7776d7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:47:19 2019 +0800

                评估容错

            commit dd9204c919b350dbd69f437dfc404b3edbdf9117
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:31:49 2019 +0800

                治疗方案是否存在判断条件

            commit f32a03ee9c77b50dfe4389e3682a7044c5b0b5de
            Merge: 0fcb618 6b6ff32
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:22:24 2019 +0800

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

            commit 69fd5d61fd0a592b8f83c5fb3fb2a54768f89f41
            Merge: 6a23ae1 d3f6e01
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:22:06 2019 +0800

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

            commit 6a23ae1ae9fd07ed2e8200041ae72612455e4477
            Merge: a3fb1eb 19fbb89
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:21:58 2019 +0800

                Merge branch 'dev/new1' into ChronicMag

            commit 0fcb6186e5139904bf19ad5b44bb3ec6bff67c45
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:21:55 2019 +0800

                不良反应静态知识

            commit a3fb1eba78caa297475c85f948326dc0d0d88c88
            Merge: 7bcef57 6b6ff32
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:18:17 2019 +0800

                Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

            commit 7bcef571328c906461251340e933ecef9bea2a7a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:18:07 2019 +0800

                查体无模板报错bug修改

            commit 6b6ff326a1434a3222e67ee1193fdc52541137e0
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Apr 29 11:35:58 2019 +0800

                Squashed commit of the following:

                commit 6332a2a78617b9399cb8584a3ae3a7492c5d230d
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Apr 29 11:27:20 2019 +0800

                    历史病例接口无数据时逻辑处理

                commit bf091afd13dc29e7d123357f81dd23adfb141d97
                Author: liucf <liucf@zjlantone.com>
                Date:   Sun Apr 28 13:37:18 2019 +0800

                    合并chronicMag分支

                commit ad43cd7703c9abd9218d39bc5ca2ecbc55c83565
                Author: liucf <liucf@zjlantone.com>
                Date:   Sun Apr 28 13:19:13 2019 +0800

                    合并远程分支

                commit 1a61bc8860afd4be87a796593aa98daf25f38021
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 15:34:04 2019 +0800

                    右侧推送量表根据id展示结果，去掉index

                commit e9bb69c1eb062e1c8a3d7d75db2552ddd62fba3d
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 14:21:35 2019 +0800

                    合并远程分支

                commit 2b2d2395be20378bd90ece24d9364985a8ae4444
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 14:06:36 2019 +0800

                    量表容错处理

                commit ac70fb283eec5b0601898a419eea43e07053be3d
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 13:25:44 2019 +0800

                    合并远程分支

                commit f7c7a75edba7282049d51d0f9dae1ff3aeba9f7b
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 11:42:05 2019 +0800

                    解决量表计算时页面更新问题

                commit 269d9cfbed90b980935e3f949a2e75246308519e
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 09:57:50 2019 +0800

                    合并远程分支

                commit b0d8e931c7d945c53c5454e30e4a0f59e278f48b
                Author: liucf <liucf@zjlantone.com>
                Date:   Thu Apr 25 20:19:19 2019 +0800

                    慢病诊断入口

                commit a5cb935038e2e63699d1f2f250322b759635eb82
                Author: liucf <liucf@zjlantone.com>
                Date:   Thu Apr 25 16:50:03 2019 +0800

                    分组小计结果处理

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/ScaleTable/index.jsx
                #	src/containers/AssessResult.js
                #	src/containers/DiagnosticList.js
                #	src/containers/MainSuit.js

            commit 082b60e12126a46c18d088188c87e308061064d7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Sun Apr 28 17:22:07 2019 +0800

                修改右侧推送滚动条

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

        commit bbe3e0ff004791659bcbaf7ab4bbf28fb9eed814
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Apr 30 15:03:10 2019 +0800

            Squashed commit of the following:

            commit d6499d5ffb3dd05813a2ee53d733b1fde0665a97
            Merge: 2a9ae58 0d787a3
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 14:56:47 2019 +0800

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

            commit 2a9ae58a665feac264d4b047e1fb4329bffbf33e
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 14:56:36 2019 +0800

                量表项显示分数；未点计算直接关闭量表保存之前的选中项；量表结果同步

            commit 0d787a315235c3d60c6bef05ac6404acda6be879
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Apr 30 14:48:13 2019 +0800

                查体展开bug修改1097

            commit 3598f0386e32b1736ca5d986ed8a4dbb4837d8d8
            Merge: dc138c4 e08b366
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Apr 30 14:26:13 2019 +0800

                Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

            commit dc138c43658be0cf67569b993e2fbe1f480ec703
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Apr 30 14:26:04 2019 +0800

                样式修改

            commit e08b366be2e796f71d46646f2de7229420e46c39
            Merge: e7dbad6 01290a6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 13:56:36 2019 +0800

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

            commit e7dbad60ebfcc0b8d70944dc2a8ab74550532b0f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 13:56:23 2019 +0800

                判断是否存在治疗方案添加历史病历容错

            commit 18034574b6841b88ce5f8e29598df1a1fffeb41f
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Apr 30 13:27:30 2019 +0800

                推荐结果历史显示bug修改1107

            commit 01290a66bab66b77e22a906c52ea04c6c18d49f8
            Merge: a3b0f48 27eb150
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 13:12:01 2019 +0800

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

            commit a3b0f488434b5012ca9025b082cb720687e3393b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 13:11:52 2019 +0800

                历史病例点击颜色修改，主诉共用诊断历史病例

            commit 27eb15092f711bc754d6a869baaa0ae9600bfec7
            Merge: 1c16cce 29169ab
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 11:39:23 2019 +0800

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

            commit 1c16cce4bd94bb18a4fad453d0baabcf46c04757
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 11:19:47 2019 +0800

                开单项显示到医嘱

            commit 5b09301416bcec54d7af0cee7dfa846a1e72ad23
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 11:19:37 2019 +0800

                修改核心指标静态信息类型

            commit 29169ab80ae62aae61d7081a615691ba25999a31
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 11:03:41 2019 +0800

                慢病bug修改

            commit 757123ddc349b5857e812c358913517c4ae1a2f4
            Merge: 05acdd4 7534d10
            Author: Luolei <16657115156@163.com>
            Date:   Mon Apr 29 15:00:48 2019 +0800

                Merge branch 'Chronic-ll' into ChronicMag

            commit 7534d1002b2449b7826a8e405924dd5c0d8c8409
            Author: Luolei <16657115156@163.com>
            Date:   Mon Apr 29 14:57:13 2019 +0800

                彈窗可移動添加

            commit 05acdd4c1baa4957fbaf9f8fb1881c9412166f58
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 14:44:50 2019 +0800

                量表计算无结果提示

            commit 84c5a28777a7f268d0e7a77298ecff1d8192bb3a
            Merge: 09481b6 dd9204c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:47:46 2019 +0800

                Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

            commit 09481b6bdaea5b66ccfac950d432f92f7b7776d7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:47:19 2019 +0800

                评估容错

            commit dd9204c919b350dbd69f437dfc404b3edbdf9117
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:31:49 2019 +0800

                治疗方案是否存在判断条件

            commit f32a03ee9c77b50dfe4389e3682a7044c5b0b5de
            Merge: 0fcb618 6b6ff32
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:22:24 2019 +0800

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

            commit 69fd5d61fd0a592b8f83c5fb3fb2a54768f89f41
            Merge: 6a23ae1 d3f6e01
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:22:06 2019 +0800

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

            commit 6a23ae1ae9fd07ed2e8200041ae72612455e4477
            Merge: a3fb1eb 19fbb89
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:21:58 2019 +0800

                Merge branch 'dev/new1' into ChronicMag

            commit 0fcb6186e5139904bf19ad5b44bb3ec6bff67c45
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:21:55 2019 +0800

                不良反应静态知识

            commit a3fb1eba78caa297475c85f948326dc0d0d88c88
            Merge: 7bcef57 6b6ff32
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:18:17 2019 +0800

                Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

            commit 7bcef571328c906461251340e933ecef9bea2a7a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:18:07 2019 +0800

                查体无模板报错bug修改

            commit 6b6ff326a1434a3222e67ee1193fdc52541137e0
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Apr 29 11:35:58 2019 +0800

                Squashed commit of the following:

                commit 6332a2a78617b9399cb8584a3ae3a7492c5d230d
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Apr 29 11:27:20 2019 +0800

                    历史病例接口无数据时逻辑处理

                commit bf091afd13dc29e7d123357f81dd23adfb141d97
                Author: liucf <liucf@zjlantone.com>
                Date:   Sun Apr 28 13:37:18 2019 +0800

                    合并chronicMag分支

                commit ad43cd7703c9abd9218d39bc5ca2ecbc55c83565
                Author: liucf <liucf@zjlantone.com>
                Date:   Sun Apr 28 13:19:13 2019 +0800

                    合并远程分支

                commit 1a61bc8860afd4be87a796593aa98daf25f38021
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 15:34:04 2019 +0800

                    右侧推送量表根据id展示结果，去掉index

                commit e9bb69c1eb062e1c8a3d7d75db2552ddd62fba3d
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 14:21:35 2019 +0800

                    合并远程分支

                commit 2b2d2395be20378bd90ece24d9364985a8ae4444
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 14:06:36 2019 +0800

                    量表容错处理

                commit ac70fb283eec5b0601898a419eea43e07053be3d
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 13:25:44 2019 +0800

                    合并远程分支

                commit f7c7a75edba7282049d51d0f9dae1ff3aeba9f7b
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 11:42:05 2019 +0800

                    解决量表计算时页面更新问题

                commit 269d9cfbed90b980935e3f949a2e75246308519e
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 09:57:50 2019 +0800

                    合并远程分支

                commit b0d8e931c7d945c53c5454e30e4a0f59e278f48b
                Author: liucf <liucf@zjlantone.com>
                Date:   Thu Apr 25 20:19:19 2019 +0800

                    慢病诊断入口

                commit a5cb935038e2e63699d1f2f250322b759635eb82
                Author: liucf <liucf@zjlantone.com>
                Date:   Thu Apr 25 16:50:03 2019 +0800

                    分组小计结果处理

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/ScaleTable/index.jsx
                #	src/containers/AssessResult.js
                #	src/containers/DiagnosticList.js
                #	src/containers/MainSuit.js

            commit 082b60e12126a46c18d088188c87e308061064d7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Sun Apr 28 17:22:07 2019 +0800

                修改右侧推送滚动条

            # Conflicts:
            #	src/components/CheckBody/index.jsx
            #	src/components/ChronicInfo/index.jsx
            #	src/components/DiagnosticList/index.jsx

        commit 2ff73f62bc62f79b568fb77ed3f2d7f5c860eed0
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Apr 30 13:16:58 2019 +0800

            Squashed commit of the following:

            commit 01290a66bab66b77e22a906c52ea04c6c18d49f8
            Merge: a3b0f48 27eb150
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 13:12:01 2019 +0800

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

            commit a3b0f488434b5012ca9025b082cb720687e3393b
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 13:11:52 2019 +0800

                历史病例点击颜色修改，主诉共用诊断历史病例

            commit 27eb15092f711bc754d6a869baaa0ae9600bfec7
            Merge: 1c16cce 29169ab
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 11:39:23 2019 +0800

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

            commit 1c16cce4bd94bb18a4fad453d0baabcf46c04757
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 11:19:47 2019 +0800

                开单项显示到医嘱

            commit 5b09301416bcec54d7af0cee7dfa846a1e72ad23
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Apr 30 11:19:37 2019 +0800

                修改核心指标静态信息类型

            commit 29169ab80ae62aae61d7081a615691ba25999a31
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 11:03:41 2019 +0800

                慢病bug修改

            commit 757123ddc349b5857e812c358913517c4ae1a2f4
            Merge: 05acdd4 7534d10
            Author: Luolei <16657115156@163.com>
            Date:   Mon Apr 29 15:00:48 2019 +0800

                Merge branch 'Chronic-ll' into ChronicMag

            commit 7534d1002b2449b7826a8e405924dd5c0d8c8409
            Author: Luolei <16657115156@163.com>
            Date:   Mon Apr 29 14:57:13 2019 +0800

                彈窗可移動添加

            commit 05acdd4c1baa4957fbaf9f8fb1881c9412166f58
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 14:44:50 2019 +0800

                量表计算无结果提示

            commit 84c5a28777a7f268d0e7a77298ecff1d8192bb3a
            Merge: 09481b6 dd9204c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:47:46 2019 +0800

                Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

            commit 09481b6bdaea5b66ccfac950d432f92f7b7776d7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:47:19 2019 +0800

                评估容错

            commit dd9204c919b350dbd69f437dfc404b3edbdf9117
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:31:49 2019 +0800

                治疗方案是否存在判断条件

            commit f32a03ee9c77b50dfe4389e3682a7044c5b0b5de
            Merge: 0fcb618 6b6ff32
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:22:24 2019 +0800

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

            commit 69fd5d61fd0a592b8f83c5fb3fb2a54768f89f41
            Merge: 6a23ae1 d3f6e01
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:22:06 2019 +0800

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

            commit 6a23ae1ae9fd07ed2e8200041ae72612455e4477
            Merge: a3fb1eb 19fbb89
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:21:58 2019 +0800

                Merge branch 'dev/new1' into ChronicMag

            commit 0fcb6186e5139904bf19ad5b44bb3ec6bff67c45
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:21:55 2019 +0800

                不良反应静态知识

            commit a3fb1eba78caa297475c85f948326dc0d0d88c88
            Merge: 7bcef57 6b6ff32
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:18:17 2019 +0800

                Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

            commit 7bcef571328c906461251340e933ecef9bea2a7a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:18:07 2019 +0800

                查体无模板报错bug修改

            commit 6b6ff326a1434a3222e67ee1193fdc52541137e0
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Apr 29 11:35:58 2019 +0800

                Squashed commit of the following:

                commit 6332a2a78617b9399cb8584a3ae3a7492c5d230d
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Apr 29 11:27:20 2019 +0800

                    历史病例接口无数据时逻辑处理

                commit bf091afd13dc29e7d123357f81dd23adfb141d97
                Author: liucf <liucf@zjlantone.com>
                Date:   Sun Apr 28 13:37:18 2019 +0800

                    合并chronicMag分支

                commit ad43cd7703c9abd9218d39bc5ca2ecbc55c83565
                Author: liucf <liucf@zjlantone.com>
                Date:   Sun Apr 28 13:19:13 2019 +0800

                    合并远程分支

                commit 1a61bc8860afd4be87a796593aa98daf25f38021
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 15:34:04 2019 +0800

                    右侧推送量表根据id展示结果，去掉index

                commit e9bb69c1eb062e1c8a3d7d75db2552ddd62fba3d
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 14:21:35 2019 +0800

                    合并远程分支

                commit 2b2d2395be20378bd90ece24d9364985a8ae4444
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 14:06:36 2019 +0800

                    量表容错处理

                commit ac70fb283eec5b0601898a419eea43e07053be3d
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 13:25:44 2019 +0800

                    合并远程分支

                commit f7c7a75edba7282049d51d0f9dae1ff3aeba9f7b
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 11:42:05 2019 +0800

                    解决量表计算时页面更新问题

                commit 269d9cfbed90b980935e3f949a2e75246308519e
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 09:57:50 2019 +0800

                    合并远程分支

                commit b0d8e931c7d945c53c5454e30e4a0f59e278f48b
                Author: liucf <liucf@zjlantone.com>
                Date:   Thu Apr 25 20:19:19 2019 +0800

                    慢病诊断入口

                commit a5cb935038e2e63699d1f2f250322b759635eb82
                Author: liucf <liucf@zjlantone.com>
                Date:   Thu Apr 25 16:50:03 2019 +0800

                    分组小计结果处理

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/ScaleTable/index.jsx
                #	src/containers/AssessResult.js
                #	src/containers/DiagnosticList.js
                #	src/containers/MainSuit.js

            commit 082b60e12126a46c18d088188c87e308061064d7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Sun Apr 28 17:22:07 2019 +0800

                修改右侧推送滚动条

        commit 183aa7003319c09d31e84adf5022bededdf8cda0
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Apr 30 11:06:10 2019 +0800

            Squashed commit of the following:

            commit 29169ab80ae62aae61d7081a615691ba25999a31
            Author: liucf <liucf@zjlantone.com>
            Date:   Tue Apr 30 11:03:41 2019 +0800

                慢病bug修改

            commit 757123ddc349b5857e812c358913517c4ae1a2f4
            Merge: 05acdd4 7534d10
            Author: Luolei <16657115156@163.com>
            Date:   Mon Apr 29 15:00:48 2019 +0800

                Merge branch 'Chronic-ll' into ChronicMag

            commit 7534d1002b2449b7826a8e405924dd5c0d8c8409
            Author: Luolei <16657115156@163.com>
            Date:   Mon Apr 29 14:57:13 2019 +0800

                彈窗可移動添加

            commit 05acdd4c1baa4957fbaf9f8fb1881c9412166f58
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 14:44:50 2019 +0800

                量表计算无结果提示

            commit 84c5a28777a7f268d0e7a77298ecff1d8192bb3a
            Merge: 09481b6 dd9204c
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:47:46 2019 +0800

                Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

            commit 09481b6bdaea5b66ccfac950d432f92f7b7776d7
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:47:19 2019 +0800

                评估容错

            commit dd9204c919b350dbd69f437dfc404b3edbdf9117
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:31:49 2019 +0800

                治疗方案是否存在判断条件

            commit f32a03ee9c77b50dfe4389e3682a7044c5b0b5de
            Merge: 0fcb618 6b6ff32
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:22:24 2019 +0800

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

            commit 69fd5d61fd0a592b8f83c5fb3fb2a54768f89f41
            Merge: 6a23ae1 d3f6e01
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:22:06 2019 +0800

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

            commit 6a23ae1ae9fd07ed2e8200041ae72612455e4477
            Merge: a3fb1eb 19fbb89
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:21:58 2019 +0800

                Merge branch 'dev/new1' into ChronicMag

            commit 0fcb6186e5139904bf19ad5b44bb3ec6bff67c45
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Apr 29 13:21:55 2019 +0800

                不良反应静态知识

            commit a3fb1eba78caa297475c85f948326dc0d0d88c88
            Merge: 7bcef57 6b6ff32
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:18:17 2019 +0800

                Merge remote-tracking branch 'origin/ChronicMag' into ChronicMag

            commit 7bcef571328c906461251340e933ecef9bea2a7a
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Apr 29 13:18:07 2019 +0800

                查体无模板报错bug修改

            commit 6b6ff326a1434a3222e67ee1193fdc52541137e0
            Author: liucf <liucf@zjlantone.com>
            Date:   Mon Apr 29 11:35:58 2019 +0800

                Squashed commit of the following:

                commit 6332a2a78617b9399cb8584a3ae3a7492c5d230d
                Author: liucf <liucf@zjlantone.com>
                Date:   Mon Apr 29 11:27:20 2019 +0800

                    历史病例接口无数据时逻辑处理

                commit bf091afd13dc29e7d123357f81dd23adfb141d97
                Author: liucf <liucf@zjlantone.com>
                Date:   Sun Apr 28 13:37:18 2019 +0800

                    合并chronicMag分支

                commit ad43cd7703c9abd9218d39bc5ca2ecbc55c83565
                Author: liucf <liucf@zjlantone.com>
                Date:   Sun Apr 28 13:19:13 2019 +0800

                    合并远程分支

                commit 1a61bc8860afd4be87a796593aa98daf25f38021
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 15:34:04 2019 +0800

                    右侧推送量表根据id展示结果，去掉index

                commit e9bb69c1eb062e1c8a3d7d75db2552ddd62fba3d
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 14:21:35 2019 +0800

                    合并远程分支

                commit 2b2d2395be20378bd90ece24d9364985a8ae4444
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 14:06:36 2019 +0800

                    量表容错处理

                commit ac70fb283eec5b0601898a419eea43e07053be3d
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 13:25:44 2019 +0800

                    合并远程分支

                commit f7c7a75edba7282049d51d0f9dae1ff3aeba9f7b
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 11:42:05 2019 +0800

                    解决量表计算时页面更新问题

                commit 269d9cfbed90b980935e3f949a2e75246308519e
                Author: liucf <liucf@zjlantone.com>
                Date:   Fri Apr 26 09:57:50 2019 +0800

                    合并远程分支

                commit b0d8e931c7d945c53c5454e30e4a0f59e278f48b
                Author: liucf <liucf@zjlantone.com>
                Date:   Thu Apr 25 20:19:19 2019 +0800

                    慢病诊断入口

                commit a5cb935038e2e63699d1f2f250322b759635eb82
                Author: liucf <liucf@zjlantone.com>
                Date:   Thu Apr 25 16:50:03 2019 +0800

                    分组小计结果处理

                # Conflicts:
                #	src/components/DiagnosticList/index.jsx
                #	src/components/ScaleTable/index.jsx
                #	src/containers/AssessResult.js
                #	src/containers/DiagnosticList.js
                #	src/containers/MainSuit.js

            commit 082b60e12126a46c18d088188c87e308061064d7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Sun Apr 28 17:22:07 2019 +0800

                修改右侧推送滚动条

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

    commit ae9394cc73983ca2fd3f40ce9efd18190597a712
    Merge: e60c29f 30e6fd9
    Author: liucf <liucf@zjlantone.com>
    Date:   Sun May 5 14:56:25 2019 +0800

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

    commit e60c29f6fc2f280670dacad8ddba5301c7dbcd00
    Author: liucf <liucf@zjlantone.com>
    Date:   Sun May 5 14:56:09 2019 +0800

        现病史手动输入存值；量表内容根据type展示

commit 78b89e31fd0456bb7e91095afdcf7a7577f9e515
Author: liucf <liucf@zjlantone.com>
Date:   Sun May 5 15:15:42 2019 +0800

    Squashed commit of the following:

    commit ae9394cc73983ca2fd3f40ce9efd18190597a712
    Merge: e60c29f 30e6fd9
    Author: liucf <liucf@zjlantone.com>
    Date:   Sun May 5 14:56:25 2019 +0800

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

    commit e60c29f6fc2f280670dacad8ddba5301c7dbcd00
    Author: liucf <liucf@zjlantone.com>
    Date:   Sun May 5 14:56:09 2019 +0800

        现病史手动输入存值；量表内容根据type展示

commit 522c7445609fa8340b6080debf72f79f693f3393
Author: liucf <liucf@zjlantone.com>
Date:   Sun May 5 15:10:39 2019 +0800

    现病史多选展开逻辑处理

# Conflicts:
#	src/common/js/func.js
#	src/components/AssessResult/AssessHis/index.jsx
#	src/components/ChronicInfo/index.jsx
#	src/components/ChronicInfo/index.less
#	src/components/PreviewBody/index.jsx
#	src/containers/MainSuit.js
#	src/utils/tools.js

src/components/NumberDrop/index.jsx

@@ -240,7 +240,7 @@ class NumberDrop extends Component{
     let changeVal = this.$span.current.innerText.trim();//数字框值-修改后;去掉前空格避免多空格叠加
     let prefix = this.$pre.current.innerText.trim(); //前缀值-修改后
     let suffix = this.$suf.current.innerText.trim(); //后缀值-修改后
-    //console.log('数字框：'+changeVal,";全部："+totalVal,";前缀："+prefix+";后缀："+suffix);
+    // console.log('数字框：'+changeVal,";全部："+totalVal,";前缀："+prefix+";后缀："+suffix);
     handleLabelChange && handleLabelChange({ikey,changeVal,type:boxMark,totalVal,prefix,suffix});
   }
   getSpanClass(){       //将被替换的文字选中状态显示

src/components/ScaleTable/index.jsx

@@ -206,22 +206,24 @@ class ScaleTable extends React.Component{
   }
   componentWillUnmount(){
     // 储存计算结果和选择后的data
-    const {tableId,getResult,parentId,parentIndex,scaleInfo,saveScaleData} = this.props; 
-    const {valueData,scaleResult1} = this.state; 
-    // 替换表格内容
-    let allDatas = scaleInfo[tableId]?JSON.parse(JSON.stringify(scaleInfo[tableId])):'' ;
-    if(allDatas){
-      // allDatas[1].content = JSON.stringify(valueData);
-      for(let i=0; i<allDatas.length; i++){
-        if(allDatas[i].type==1){
-          allDatas[i].content = JSON.stringify(valueData);
+    const {tableId,getResult,parentId,parentIndex,scaleInfo,saveScaleData,formulaResult} = this.props; 
+    const {valueData,scaleResult1,start} = this.state; 
+    // 替换表格内容--1）没有点计算且没有计算结果；2）点了计算
+    const scaleResult = scaleResult1 || formulaResult&&formulaResult[tableId]; //量表计算结果
+    if(start || !scaleResult){
+      let allDatas = scaleInfo[tableId]?JSON.parse(JSON.stringify(scaleInfo[tableId])):'' ;
+      if(allDatas){
+        for(let i=0; i<allDatas.length; i++){
+          if(allDatas[i].type==1){
+            allDatas[i].content = JSON.stringify(valueData);
+          }
         }
+        // 需求：未点计算，直接点确定、关闭也保存选中数据 4-30
+        saveScaleData&&saveScaleData({id:tableId,data:allDatas});
       }
-      // 需求：未点计算，直接点确定、关闭也保存选中数据 4-30
-      saveScaleData&&saveScaleData({id:tableId,data:allDatas});
     }
     
-     if(scaleResult1){
+    if(scaleResult1){
       const params = {
         type:1,
         data:scaleResult1,
@@ -229,7 +231,7 @@ class ScaleTable extends React.Component{
         pIndex:parentIndex
       }
       getResult&&getResult(params);
-     }  
+    }  
   }
   getContent(){ 
     let {selecteds,valueData,start,scaleResult1} = this.state;

src/containers/MainSuit.js

@@ -14,7 +14,7 @@ import {getInitModules} from '@store/async-actions/homePage.js';
 import {SHOW_REFER_RECORD} from '@store/types/diagnosticList';
 
 function mapStateToProps(state) {
-  const {mainSuit,diagnosticList,homePage} = state;
+  const {mainSuit,homePage,diagnosticList} = state;
   return {
     showDrop:mainSuit.showDrop,//用于更新
     update:mainSuit.update,

src/store/actions/currentIll.js

@@ -634,14 +634,14 @@ export const changeNumLabelVal = (state,action)=>{
   const nextVal = next.value||next.name;
   //标签后是不是标点符号标签,是的话删除本标签时一起删除
   let nextIsDot = +next.tagType===8&&!nextVal.match(config.punctuationReg);
-  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
-  if(labText.trim()){
+  // let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
+  if(totalVal.trim()){
     if(item){
       item.value = newVal;
       item.labelPrefix = prefix||'';
       item.labelSuffix = suffix||'';
     }
-    res.saveText[index] = labText;
+    res.saveText[index] = totalVal;
   }else{//删除完标签内容则删除该标签
     const num = nextIsDot?2:1;
     res.data.splice(index,num);

src/store/actions/mainSuit.js

@@ -600,18 +600,18 @@ export const changeNumLabelVal = (state,action)=>{
   const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
   const index = ikey;
   const newVal = changeVal;
-  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
+  // let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
   let item = res.data[index];
   const next = res.data[+index+1];
   const nextVal = next.value||next.name;
   //标签后是不是标点符号标签,是的话删除本标签时一起删除
   let nextIsDot = +next.tagType===8&&!nextVal.match(config.punctuationReg);
-  if(labText.trim()){
+  if(totalVal.trim()){
     if(item){
       item.value = newVal;
       item.labelPrefix = prefix||'';
       item.labelSuffix = suffix||'';
-      res.saveText[index] = labText;
+      res.saveText[index] = totalVal;
     }
   }else{//删除完标签内容则删除该标签
     const num = nextIsDot?2:1;