首頁 探索 說明
註冊 登入
front
/
newICSS
2
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

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
liucf 6 年之前
父節點
ae9394cc73
當前提交
3dfb8126b4
共有 2 個文件被更改，包括 3 次插入 和 6 次删除
分割檢視 顯示文件統計
  1. 1 1
      src/components/CurrentIll/index.jsx
  2. 2 5
      src/containers/SpreadDrop.js

+ 1 - 1
src/components/CurrentIll/index.jsx
查看文件 

@@ -141,7 +141,7 @@ class CurrentIll extends Component{
 
     })
 
     return list;
 
   }
 
-  handleBlur(e){console.log(234,e)
 
+  handleBlur(e){
 
     const {freeText} = this.props;
 
     const ev = e || window.event;
 
     const data = ev.target.innerText || e.target.innerHTML;

+ 2 - 5
src/containers/SpreadDrop.js
查看文件 

@@ -140,21 +140,18 @@ function mainSuitModule(dispatch,store,params){
 
 // 现病史
 
 function currentIll(dispatch,store,params){
 
   const {nones,exists,withs,exclusion,excluName,ban,noneIds} = params;
 
-  // const ikey = params.ikey.substr(1,1);
 
   const index = params.ikey;
 
   let ikey = getLabelIndex(index);
 
-  // let existsId = getIds(exists);
 
-  // let withsId = getIds(withs);
 
   let existsId = exists && exists.length>0?getIds(exists):[];
 
   let withsId = withs && withs.length>0?getIds(withs):[];
 
-  // const ids = existsId.join(",")+withsId.join(",");
 
   const ids = (existsId.concat(withsId)).join(",");
 
   let has = [],wes=[];
 
   //获取选中项目模板
 
   fetchModules(ids).then((res)=>{
 
     if(+res.data.code===0){
 
       const list = res.data.data;
 
-      if(list&&list.length>0){
 
+      // if(list&&list.length>0){
 
+      if(list&&JSON.stringify(list) !== '{}'){
 
         existsId.map((i)=>{
 
           // has.push(...list[i].questionMapping);
 
           has.push(list[i]);