Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
front
/
platformFront
2
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

Squashed commit of the following:

commit 614834f38462e0c26b3ae7533d7072ad9ea7bcbd
Author: liucf <liucf@zjlantone.com>
Date:   Tue Mar 19 15:23:15 2019 +0800

    Squashed commit of the following:

    commit a39882fb598ad90451fbfd224b6891a7435bf52b
    Merge: eb9514a 9598d94
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 19 09:41:27 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit 9598d94c53b73cb3df116180f76c2c1748d922e6
    Merge: 621f140 a34c487
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 19 09:38:59 2019 +0800

        Merge branch 'independentTag' into dev2/luolei

    commit 621f1403ff1d937760d1dbac7a51285c21d2413a
    Merge: 8c21876 019bf02
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 19 09:27:59 2019 +0800

        Merge branch 'depart' into dev2/luolei

    commit eb9514adcd6ca8b5c994e62fdc599edecc35d28b
    Merge: 339757e b09082a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 18 17:41:04 2019 +0800

        Merge branch 'test' into dev2/zhangxc

    commit 339757e6ffe47a70ea5b70ef9a6cbc9c6ac588f7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 18 17:40:24 2019 +0800

        修改填写单类型初始化非公共数据

    commit c2bccce8a4757c593c46d168dbb56464f6f59825
    Merge: 5f05a09 8c21876
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 18 17:34:05 2019 +0800

        merge from 'dev'

    commit 5f05a0901e939d421dd3dfe3bf33237b6a61ef10
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 18 17:28:34 2019 +0800

        修改填写单类型，初始化非公用数据

    commit b09082a5947c02980bccd544de54dc035958c3a5
    Merge: 0c683ce 8c21876
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 18 17:27:25 2019 +0800

        Merge branch 'dev' into test

    commit 8c21876bee94cef3d8485d7c58a01e58d992ef80
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 18 17:23:46 2019 +0800

        既往史toleft加判断

    commit 2e06ad10f877fc0fd18ed1a40866096c01cf1314
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 18 16:52:41 2019 +0800

        增加是否为症状

    commit e056b1acc3a1161dbcc7f2b2f84a0fec4d702673
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 18 16:52:21 2019 +0800

        增加是否为症状

    commit 5b24bee80e9e7c105514218ae06b8210c9068fcf
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 18 16:51:42 2019 +0800

        填写单类型判断bug

    commit fa4b3e51bcbed84646fa2aeaf1b26a165c444e18
    Merge: 95b977d 238b7a0
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 18 16:32:14 2019 +0800

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

    commit 95b977da112d0c456abb8604dc287f6a92236809
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 18 16:32:00 2019 +0800

        既往史修改

    commit a34c4875dd8de5a58fbcf1d682d5b682e815b21f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 18 15:39:52 2019 +0800

        术语静态知识未完

    commit 22bf16a5ab5b0dfbda03ffc078ffb9c1f865a28d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 18 15:12:56 2019 +0800

        添加独立标签标签明细限制30个字

    commit 71b2b268d6dffa536ce4a2bbb908410935854bbb
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 18 09:55:42 2019 +0800

        独立标签列表显示类型bug修改

    commit 0c683ce6d2a9124e8407c03bf849e012ef0bd641
    Merge: 3af8ef7 238b7a0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 17:05:34 2019 +0800

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

    commit 238b7a09cfd44561122001f946d9f7c43cbea945
    Merge: 6b41a18 30f21b9
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 17:04:16 2019 +0800

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

    commit 6b41a18eedcdba1bc7a3444b19d64b310fa1a52b
    Merge: 2b6eb62 2ca1fb2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 17:04:11 2019 +0800

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

    commit 2b6eb62b7d560ad106f2e62e9b831f4ee01f6f9b
    Merge: c93337c 1040e80
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 17:04:06 2019 +0800

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

    commit 30f21b92e4216e86e10df1c210f94949fe34a028
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 15 16:48:35 2019 +0800

        独立标签单选多选去除空数据

    commit 2ca1fb28c4f90f4ce45918ebdfcbc945fbc2ef06
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 16:46:26 2019 +0800

        单选多选空选项过滤

    commit 32f57b4df37b134f5ce926283617129da6f57822
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 16:19:57 2019 +0800

        无控制台时默认页面不请求数据bug修改

    commit a6b4df99023aa6ed9ca479a2e5dcfdff2f2dd390
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 14:59:21 2019 +0800

        无控制台时默认页面不请求数据

    commit c93337c2660faae3bcb7a341a28483b9e9880c2a
    Merge: f3bf75a 1f970e0
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 15 13:42:25 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit 3af8ef787a0fef6747c9a2dbbc1a0a06a230326a
    Merge: 596e1f0 1f970e0
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 15 13:39:51 2019 +0800

        Merge branch 'dev2/luolei' into test

    commit 0ce01a9ceb8de1ac832df54615e7ede068e50657
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 15 13:38:52 2019 +0800

        独立标签和标签组修改参数修改

    commit 1f970e06ce073c126bc0a16cde614aac3dc08063
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 15 13:36:00 2019 +0800

        配置文件改动

    commit e0611ffef509322090d66dff6f48e78b9ad2e3c9
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 15 13:10:00 2019 +0800

        bug

    commit cbdb0771d38a2f2fc9f7cde87aa3ee6fc736bf47
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 11:19:44 2019 +0800

        同无同伴可有多个选项，未选中行禁用按钮

    commit 596e1f06cd5cfa1f53704611de405dcac15cd608
    Merge: 080d5ee f3bf75a
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 10:41:51 2019 +0800

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

    commit f3bf75aca37ff49a32bd70492ad7925be1fc07ec
    Merge: 8983bf8 b5d0868
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 10:39:33 2019 +0800

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

    commit 8983bf86f32b0b938f78869bf8cdfadd1877fb0f
    Merge: 8c43a86 2639ce7
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 10:35:35 2019 +0800

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

        # Conflicts:
        #	src/api/config.js

    commit 8c43a86bfa08ee8abfce581d40a4d1b003912a22
    Merge: dfcada3 3981702
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 10:33:47 2019 +0800

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

        # Conflicts:
        #	src/api/config.js

    commit dfcada342de93cad1b2e79cbcb5f09afab6f3c3b
    Merge: 37d1343 1309a48
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 10:31:40 2019 +0800

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

        # Conflicts:
        #	src/api/config.js
        #	src/api/icss.js
        #	src/components/icss/AddDisclInfo.vue
        #	src/components/icss/AddMedicinePrompt.vue
        #	src/components/icss/CommonTemplate.vue
        #	src/components/icss/IndeptLabel.vue
        #	src/components/icss/MedicinePrompt.vue
        #	src/components/icss/PubTemplateGroup.vue
        #	src/components/icss/TemplateMaintenance.vue
        #	src/components/icss/TemplateMaintenanceWrap.vue
        #	src/routes.js

    commit 37d1343525323228f3f5f857217daf62196ea729
    Merge: 326491e 381645f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 15 10:14:37 2019 +0800

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

    commit 13f7f467645c0644b69308242e22f6510d5abfe0
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 14 20:31:17 2019 +0800

        增加最小年龄不能小于最大年龄判断

    commit 3981702a621519f1d0b3ad497b40c0609310aab8
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 14 16:59:56 2019 +0800

        操作人参数去错了

    commit e82348bbfcca495fb9b438bd9a1ed3df4e0438f8
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 14 16:17:44 2019 +0800

        参数调整

    commit e52e7358c9b2f2ff0dda98f022f30e1e0208cf77
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 14 13:56:08 2019 +0800

        模板维护基本完成

    commit 381645fa24247459dbe2c9dfa27ab102631e63aa
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 14 13:26:13 2019 +0800

        保存术语静态知识接口未完

    commit 326491e11f514415af550bb36ab4a6e9b961b07f
    Merge: 9d8e78e 3a35d38
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 14 11:23:08 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit 080d5ee96746c135b8448580f490c9e7945ec511
    Merge: 3a35d38 9d8e78e
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 14 11:20:37 2019 +0800

        Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

    commit 3a35d38517110be2ff2fb9c216d38d800cc3757d
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 14 11:18:43 2019 +0800

        模板维护功能提交

    commit 2639ce711923bf4ef2c9c6dd06a515b504704748
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 14 10:51:22 2019 +0800

        常见症状详情和修改

    commit e39088b6d35790033d7d24ec444e9c2f8c05c92c
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 13 16:46:33 2019 +0800

        修改标签池标签类型

    commit 9d8e78e5c7915fca2d57588e2fc7de5c3f5b737c
    Merge: 581d3ec 7c4e0c7
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 15:43:00 2019 +0800

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

        # Conflicts:
        #	src/components/icss/IndeptLabel.vue
        #	src/components/icss/SingleSelect.vue

    commit 7c4e0c7c2759ce35aba20392f2ddf8a0a5959ca2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 13 15:35:49 2019 +0800

        常见科室症状

    commit ea0f58d9620813f41d86db07b3b423593889e890
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 13 15:35:21 2019 +0800

        多选取消默认选中

    commit 581d3eca1b25e0a4ce75d638291ba0c5a94b6e35
    Merge: ddc468f cdc557d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 15:30:08 2019 +0800

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

        # Conflicts:
        #	src/api/config.js
        #	src/components/icss/IndeptLabel.vue
        #	src/components/icss/PromptInfo.vue
        #	src/routes.js

    commit cdc557d0eee2af3a58aa67bfece53cbf32c343bd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 14:54:48 2019 +0800

        独立标签表格标签类型显示修改，既往史添加标签池可选类型修改

    commit 44fab27447641937bfa3f934e259ddc9f9b760cf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 14:20:04 2019 +0800

        症状尾巴标签池有时间单位

    commit d5a9d0b0cdf2976a1d50ff484ecb5c7f6843ef66
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 13:55:39 2019 +0800

        下拉组件清空与下拉箭头重合修改

    commit feb792b515c554af8dde2a06127d3758b2b583eb
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 13:22:48 2019 +0800

        独立标签筛选类型辅捡等不显示

    commit c3a666aa1af0b9c561eaa5ed589effe614e985a5
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 11:43:37 2019 +0800

        后台数据typeCn转换为筛选中对应的字段名称

    commit efb80b4bf9e9d8aa6298b72f8b864a671edea2b7
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 11:21:29 2019 +0800

        单选无同伴同无，多选无默认选中

    commit b138d164f421524e7c66ee8673102d4738078b6e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 10:06:55 2019 +0800

        术语静态知识未完

    commit f0659f14489821e423f9c70564969af5edf2da2b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 13 09:16:02 2019 +0800

        其他史多选的不需要显示默认选中

    commit 592302ac839e01e17286f332cee2cafda9d82d78
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 12 18:50:27 2019 +0800

        修改v-show为v-if

    commit cb868f04f62ef05bbf2fd5038a71845a79ba75e0
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 12 18:50:05 2019 +0800

        血压修改问题

    commit a2aa1c103fb35c7f788fe3499b22695898a1a99a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 12 18:49:37 2019 +0800

        症状修改文字标签添加标识

    commit ecdfcb194300b3b88f194a5a00c19aa474c7da34
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 12 10:48:55 2019 +0800

        医学术语静态知识维护页面添加

    commit 5fb0d31284c1ea9f980ed42ee4ec0ea6e137e851
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 12 10:23:29 2019 +0800

        提示信息修改

    commit 27e21af25e41e49ad609a06fb46157f2b635922c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 11 20:32:19 2019 +0800

        静态知识修改

    commit c4701778218a01ab699ed29be3402cc68b9ef5da
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 11 20:27:44 2019 +0800

        单选异常选项修改

    commit 822df8507b0c48b06e8d9b9350001cfd1f85765e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 11 20:11:18 2019 +0800

        添加查体模板

    commit 7658d6f547d6b067d42d4cbaebc07e46d206340f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 11 20:10:15 2019 +0800

        独立标签标签归属名称

    commit 7b0204b6b2fb9ab2c1adbdc29b7af8cfb68da26f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 11 18:56:57 2019 +0800

        提示信息详情完成

    commit 5e8f323a81a735e062abbd0289fef01ed39646b3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 11 15:58:36 2019 +0800

        提示信息详情删除修改-接口对接

    commit 74714bd95e9ba5a0312b1afc44ca8b156d8e9f6c
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 17:44:53 2019 +0800

        test

    commit 2bf8231b03c8eef66abfc2e1a6f9d96c457c2e67
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 8 15:21:28 2019 +0800

        提示信息添加

    commit ddc468fe5f2c18dd3860ffdad97cdb3e9c8d30d8
    Merge: 5033494 b809a69
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:31:28 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit b809a6993c8f2b4d53a921ed17ce4beb96afe714
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:30:52 2019 +0800

        药品分类

    commit 5033494965fd13f7511755590f106a42a08ba368
    Merge: 069d57c 11280b2
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:25:59 2019 +0800

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

    commit c17df7317718acbf2dfbde32fcc545f1ed818af8
    Merge: 069d57c 11280b2
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:22:38 2019 +0800

        Merge branch 'dev2/zhangxc' into dev2/luolei

    commit 11280b23fd6f56315cf8b686f9ed9279c4d92bff
    Merge: 0ac18a8 c96333d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 11:18:52 2019 +0800

        merge from 'luolei'

    commit 069d57c50a1aec671dc3e6a9a531cbf07472adad
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:10:14 2019 +0800

        注释

    commit a380af30e459f7db199c78963f1d138747880822
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:08:58 2019 +0800

        11

    commit 0ac18a8c7555daba27c2693ea6dc6fd08ed94e55
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 11:07:50 2019 +0800

        修改参数转换函数

    commit 370bfc071e6e89235fee91aa495bb89b662d3713
    Merge: c96333d a8359c2
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:04:12 2019 +0800

        Merge branch 'dev' into dev2/luolei

    commit 6074687f3d18f71e668224ca59e514b6696a558f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 11:04:12 2019 +0800

        修改独立标签样式

    commit c96333d02f1af5286ef46aab04ef104963d4bbaa
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:02:56 2019 +0800

        样式

    commit cc411cc6733931097a8cdd6b9c57b192d8935196
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 11:02:29 2019 +0800

        Revert "修改独立标签样式"

        This reverts commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9.

    commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 11:01:23 2019 +0800

        修改独立标签样式

    commit 5ac3b253c2d3fca4de474100b650bab1b0138d61
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 10:55:17 2019 +0800

        11

    commit a8359c2a226ae695bfa22c2e480088e025fe192b
    Merge: 072bc67 cb3e95b
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 10:32:32 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit cb3e95b38a46ba9e38a311f72f933c534cee104e
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 10:31:04 2019 +0800

        123456

    commit bb5b301daacc785155578147f66575848d39c21f
    Merge: 1b9fe73 072bc67
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 10:23:55 2019 +0800

        merge from 'dev'

    commit 1b9fe73bd1fae8e2eef414e520b985cee7c17e93
    Merge: 45f3fff a28b97b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 10:18:52 2019 +0800

        merge feom 'luolei'

    commit 45f3fff542bbdb72399411b0d807c45ef53cfe9a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 10:14:22 2019 +0800

        查体模板维护

    commit e91e545be4b9fa9eb9d3738c636b2d3be4934c50
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 09:56:18 2019 +0800

        修改参数转换tagFlag

    commit 072bc671096d52b8a4f477f562fd26340bfde0ca
    Merge: 376205e a28b97b
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 7 17:44:22 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit a28b97bdbc88658bd958a9341add8f86c0c52961
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 7 17:39:30 2019 +0800

        模板添加界面

    commit cb1b285b6b482be1006e239caec531cb0bdef070
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 15:31:56 2019 +0800

        常见科室症状添加症状

    commit 2a1b26b33ac8f879bf2bd76f0b862d450651d8ba
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 15:29:35 2019 +0800

        表格添加不可拖拽属性

    commit 8281112592b596ba405b5db8e49571c41e8e8d0e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 15:29:18 2019 +0800

        常用科室症状上下排序

    commit 4323a2cbd123f252dcf81a90fbfc304be5529d40
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 14:54:14 2019 +0800

        独立标签最小年龄类型限制

    commit 87a95a9d52190e088a05f0cac5c95c721c419fba
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 13:55:58 2019 +0800

        修改报错

    commit ac0d7ede74d93bf0630e4b72eb029b78f3360907
    Merge: 6e62e30 fda8c97
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 13:54:16 2019 +0800

        merge from 'dev2/luolei'

    commit 6e62e30f3ae5cd9e72651f311584c203c2a468df
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 13:43:35 2019 +0800

        归属添加药品分类

    commit fda8c97ddd693aa794d87937bba640746a9439c0
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 7 13:43:02 2019 +0800

        标签池获取问题

    commit 4d0718701f413e87eec87f120249ba51127b2c1a
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 7 13:25:19 2019 +0800

        标签组类别填写单类型9没有标签池报错问题

    commit 376205ee088e63aa291e02221dcc9ebbd8b3499c
    Merge: 99048a5 2f00eb8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 7 11:41:53 2019 +0800

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

    commit 99048a54361560591510c2e3f79342134d9a1c29
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 7 11:41:12 2019 +0800

        文件服务器地址修改

    commit 6930a001d2a87a04a67f2e6b35f1362b5920ff98
    Merge: c6a276a 2f00eb8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 11:36:35 2019 +0800

        merge from 'dev'

    commit fcb91f06b700e7c3d84058985ad4bd89539cf092
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 7 11:31:38 2019 +0800

        新增模板维护系统

    commit c6a276a09579b4478c1fb5c7e6aaabb7fcdef4ea
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 11:23:13 2019 +0800

        修改标签组添加是否显示加号和是否复制子标签字段

    commit 3869532cff2a3c176935a9498def94f5384820ee
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 11:13:28 2019 +0800

        添加常用科室症状

    commit 2f00eb8a4baee7dae8bdf11986f139f692c3376d
    Merge: 0c12c5e 0fe383a
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Mar 7 09:58:35 2019 +0800

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

    commit ae8596b1e19d3b46939535694342d2b63e7bd270
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 09:16:44 2019 +0800

        修改独立标签添加/修改标题

    commit 0c12c5e77187de09015015fc95bc5072cb967097
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Mar 6 16:49:04 2019 +0800

        合并depart分支
        Squashed commit of the following:

        commit 49f3af28dbb3e149975a326ba706b0fc1e9544c4
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Mar 6 16:42:01 2019 +0800

            合并dev
            Squashed commit of the following:

            commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
            Merge: 6dde00e f2ad245
            Author: Luolei <16657115156@163.com>
            Date:   Wed Mar 6 11:15:37 2019 +0800

                Merge branch 'dev2/luolei' into dev

            commit f2ad24529f7716a96e6e01c57056343fcd516473
            Merge: e0223af 76dfc4f
            Author: Luolei <16657115156@163.com>
            Date:   Wed Mar 6 11:13:37 2019 +0800

                Merge branch 'dev2/zhangxc' into dev2/luolei

            commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Mar 6 11:12:15 2019 +0800

                修改标签组参数转换

            commit 365b676fb3adfb19828a6295b94527da158b0a56
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Mar 6 10:52:38 2019 +0800

                修改独立标签没有修改不能保存问题

            commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 16:46:45 2019 +0800

                token失效问题

            commit 36d73051401858000de44211f71d931d0b061e6e
            Merge: 28fdc7d b1feaf1
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 11:10:10 2019 +0800

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

            commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 11:05:01 2019 +0800

                独立标签分页样式

            commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
            Merge: 216dd81 28336ac
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 11:03:07 2019 +0800

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

            commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
            Merge: db78e24 1c7e1b4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:59:41 2019 +0800

                merge from 'lcf'

            commit db78e24b427d92b0a8aa9d774deb2bad253912a7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:49:32 2019 +0800

                症状推送类样式修改

            commit 09a0e94857dab141bdc5740d74550a3daf4efaea
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:33:59 2019 +0800

                修改底部分页宽度

            commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
            Merge: 7d489cf e0223af
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 10:28:44 2019 +0800

                Merge branch 'dev2/luolei' into dev

            commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 10:26:04 2019 +0800

                去掉类型判断

            commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
            Merge: 69f1559 3cb5b42
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:24:20 2019 +0800

                Merge branch 'dev' into dev2/zhangxc

            commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
            Merge: b232857 0e7f672
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:22:12 2019 +0800

                Merge branch 'dev2/luolei' into dev2/zhangxc

            commit b2328579f94768eaca1a20191733639b07343235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 09:49:21 2019 +0800

                底部分页添加最小宽度

            commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
            Merge: 51c17f1 0e7f672
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 09:39:54 2019 +0800

                Merge branch 'dev2/luolei' into dev

            commit 51c17f117d137e82c82a0883d546e17063a1a180
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 09:39:39 2019 +0800

                富文本编辑依赖添加

            commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 16:33:14 2019 +0800

                修改操作界面样式

            commit 457d83209b5c780554eeee8accf88e4c1630394a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 16:16:44 2019 +0800

                症状推送添加标签标识

            commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
            Merge: bfdb2a4 de516f0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 13:09:42 2019 +0800

                Merge branch 'test' into dev2/zhangxc

            commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 10:34:54 2019 +0800

                症状推送有内容显示状态

            commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
            Author: Luolei <16657115156@163.com>
            Date:   Mon Mar 4 09:25:40 2019 +0800

                删除console

            commit 83920a95b2a26706470d5effd09e14dc60aec472
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 17:52:56 2019 +0800

                报错问题

            commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
            Merge: e1b7e26 73440ab
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:33:02 2019 +0800

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

            commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
            Merge: 163e4c9 de516f0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:32:42 2019 +0800

                Merge branch 'test' into dev

                # Conflicts:
                #	src/api/icss.js

            commit 73440abf636577fda0d05524180791434ca727b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 17:03:31 2019 +0800

                症状推送

            commit de516f030d664bb82787ae5a35f68515237ab4c4
            Merge: 4c3985a aebb7f7
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:39:30 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 4c3985ae9ebe589d36c352b579501681f060b795
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:19:02 2019 +0800

                限制调用时机

            commit f0d48657fba60ba4fd72c031b8368b7c67efc619
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 16:15:33 2019 +0800

                noIds添加判断

            commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
            Merge: 8324bf6 f9a0af3
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:43:24 2019 +0800

                Merge branch 'dev2/luolei' into dev2/zhangxc

            commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:42:41 2019 +0800

                症状推送（未完成）

            commit f9a0af3b869f1e84296e4630293ae99532e35155
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 15:40:56 2019 +0800

                合并问题

            commit aad93151bf13fb20e8b732369d05452e62d05c17
            Merge: f61ed45 cad991f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:08:39 2019 +0800

                merge from 'luolei'

            commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:01:33 2019 +0800

                症状推送及其修改（未完成）

            commit aebb7f75c35177143468f1c70c43738de296363e
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 14:32:58 2019 +0800

                多次调用问题解决

            commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 09:40:18 2019 +0800

                修改完成，参数统一配置

            commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:20:45 2019 +0800

                配置项修改

            commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:09:38 2019 +0800

                添加富文本编辑器

            commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 16:03:58 2019 +0800

                标签组修改

            commit 78b130de9259175f18e1c2e06a61188c35ddb864
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 15:08:40 2019 +0800

                判断有误

            commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
            Merge: 77a9c8c a0b68ed
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:47:20 2019 +0800

                merge from 'dev2/luolei'

            commit 77a9c8c7c09e2981265d35abc5425484d9519783
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:41:59 2019 +0800

                标签组修改（血压和症状）

            commit a0b68ed4950b1a6fa297aa3828229e7561631978
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 14:40:44 2019 +0800

                修改

            commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 20:25:47 2019 +0800

                提示信息维护

            commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:51:54 2019 +0800

                标签组修改标签组公共数据部分

            commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:37:03 2019 +0800

                初始化时填写单类型赋值

            commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:36:02 2019 +0800

                删除联合推送标签明细项

            commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 14:34:32 2019 +0800

                标签组添加限制条件

            commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 15:08:17 2019 +0800

                修改归属,填写单类型,性别,标签明细重置

            commit 061de293c240f35ad7e82056d57d846c8f3cb531
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 13:57:28 2019 +0800

                修改归属为化验类别为多选时标签显示

            commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 10:57:15 2019 +0800

                化验和多选框

            commit a4724d13390450886b82d650e703095dada8a401
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 11:08:15 2019 +0800

                修改标签类型和归属显示名称

            commit b448a51594240b8b0da025ee9a823c4577e2d18a
            Merge: 0b52ec6 db7e04f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 17:15:00 2019 +0800

                Merge branch 'test' into dev2/zhangxc

            commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 13:08:58 2019 +0800

                和单标签

            commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:59 2019 +0800

                修改bug

            commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:39 2019 +0800

                修改标签池标签名称样式

            commit 3663d6490026fc3f4fab92f3966dec703705a017
            Merge: 7aec89a 43e196f
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 10:13:29 2019 +0800

                Merge branch 'dev2/luolei' into independentTag

            commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:08:57 2019 +0800

                修改标签名称样式

            commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 17:26:43 2019 +0800

                bug修改

            commit 7aec89ad1af7201574105b99f0636c44e91a69e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:32:54 2019 +0800

                禁用传值布尔型

            commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:28:50 2019 +0800

                修改标签归属、类型和性别不可改

            commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:22:22 2019 +0800

                单选标签修改

            commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 11:20:22 2019 +0800

                文本类型修改，单选类型修改未完

            commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 18:10:47 2019 +0800

                单选维护属性tag显示

            commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 17:35:26 2019 +0800

                输入框类型维护

            commit 082c91207349481dd5bbc13de511d46d212d83ea
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 16:37:36 2019 +0800

                单选维护bug修改

            commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 14:53:29 2019 +0800

                单选标签属性选项置灰

            commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
            Merge: 7b95e36 d8f8c68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 10:04:46 2019 +0800

                Merge branch 'dev' into independentTag

            commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
            Merge: e2dd153 ba5e9e6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 09:48:48 2019 +0800

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

            commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sat Feb 2 17:30:26 2019 +0800

                单选维护

            commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 17:57:41 2019 +0800

                独立标签

            commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
            Merge: 6568234 c1ca617
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 15:29:27 2019 +0800

                Merge remote-tracking branch 'origin/depart' into independentTag

            commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:12:44 2019 +0800

                bug修改

            commit c4b0acf690b308b061c567aaa3620bd02879ec29
            Merge: 34570c5 b77e984
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:17 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 34570c5385b33631c74c29db58d02faad21367b0
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:09 2019 +0800

                bug修改

            commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
            Merge: 93ce48b ba5e9e6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:36:20 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:35:33 2019 +0800

                修改顶部标题样式

            commit 93ce48bda37148c865cb0b305a6e645f8418badd
            Merge: 148d49f db0659a
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:23:42 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit db0659aab84a70449bb5b5c61a9084463554b100
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:22:51 2019 +0800

                优化

            commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
            Merge: 3e9010f 60307c5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:19:38 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:18:06 2019 +0800

                修改横铺统一（血压）为每个后面添加一个输入框

            commit 3e9010f66dc1ad911c37486615ea5423be2c9285
            Merge: 77d8884 f04c384
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:16:48 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit f04c384d802839228bc2f74fb7dc65ede83a1775
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:15:12 2019 +0800

                互斥项

            commit 77d88846790cf2166999d602a6890d6ef4422190
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:06:13 2019 +0800

                修改左右箭头位置

            commit 714eba80c300c481857d0df5285a86944c4469e0
            Merge: 969688f 3fe9e97
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:58 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 969688f82f0f869e5eafdc40263054c83cf0093d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:49 2019 +0800

                修改标签属性删除

            commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 14:34:44 2019 +0800

                保存忘打开了

            commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
            Merge: 58d39fc 3f48de8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:55 2019 +0800

                Merge branch 'dev' into test

            commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
            Merge: bf43109 025ac3d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:36 2019 +0800

                Merge branch 'dev2/zhangxc' into dev

            commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:22:17 2019 +0800

                修改操作池样式

            commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 13:18:04 2019 +0800

                去掉既往史下面的提示

            commit 2964171fec51793f979776c433cede0594777d96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 11:13:21 2019 +0800

                修改性别清除标签明细

            commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:41:53 2019 +0800

                不区分单选多选

            commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:13:39 2019 +0800

                去掉弹窗

            commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
            Merge: e0ae7ed 393d9e4
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:23 2019 +0800

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

            commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:13 2019 +0800

                添加参数，默认值修改

            commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 09:53:55 2019 +0800

                修改样式

            # Conflicts:
            #	src/api/icss.js
            #	src/components/icss/IndeptLabel.vue
            #	src/components/icss/LabelGroup.vue
            #	src/components/icss/PubTagGroup.vue

        commit 19f3f1de0e04cf8c4e4980713c886087b72f22b9
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Mar 5 16:52:40 2019 +0800

            合并dev分支，并统一分页样式和删除颜色
            Squashed commit of the following:

            commit 36d73051401858000de44211f71d931d0b061e6e
            Merge: 28fdc7d b1feaf1
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 11:10:10 2019 +0800

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

            commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 11:05:01 2019 +0800

                独立标签分页样式

            commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
            Merge: 216dd81 28336ac
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 11:03:07 2019 +0800

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

            commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
            Merge: db78e24 1c7e1b4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:59:41 2019 +0800

                merge from 'lcf'

            commit db78e24b427d92b0a8aa9d774deb2bad253912a7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:49:32 2019 +0800

                症状推送类样式修改

            commit 09a0e94857dab141bdc5740d74550a3daf4efaea
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:33:59 2019 +0800

                修改底部分页宽度

            commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
            Merge: 7d489cf e0223af
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 10:28:44 2019 +0800

                Merge branch 'dev2/luolei' into dev

            commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 10:26:04 2019 +0800

                去掉类型判断

            commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
            Merge: 69f1559 3cb5b42
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:24:20 2019 +0800

                Merge branch 'dev' into dev2/zhangxc

            commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
            Merge: b232857 0e7f672
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:22:12 2019 +0800

                Merge branch 'dev2/luolei' into dev2/zhangxc

            commit b2328579f94768eaca1a20191733639b07343235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 09:49:21 2019 +0800

                底部分页添加最小宽度

            commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
            Merge: 51c17f1 0e7f672
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 09:39:54 2019 +0800

                Merge branch 'dev2/luolei' into dev

            commit 51c17f117d137e82c82a0883d546e17063a1a180
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 09:39:39 2019 +0800

                富文本编辑依赖添加

            commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 16:33:14 2019 +0800

                修改操作界面样式

            commit 457d83209b5c780554eeee8accf88e4c1630394a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 16:16:44 2019 +0800

                症状推送添加标签标识

            commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
            Merge: bfdb2a4 de516f0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 13:09:42 2019 +0800

                Merge branch 'test' into dev2/zhangxc

            commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 10:34:54 2019 +0800

                症状推送有内容显示状态

            commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
            Author: Luolei <16657115156@163.com>
            Date:   Mon Mar 4 09:25:40 2019 +0800

                删除console

            commit 83920a95b2a26706470d5effd09e14dc60aec472
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 17:52:56 2019 +0800

                报错问题

            commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
            Merge: e1b7e26 73440ab
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:33:02 2019 +0800

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

            commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
            Merge: 163e4c9 de516f0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:32:42 2019 +0800

                Merge branch 'test' into dev

                # Conflicts:
                #	src/api/icss.js

            commit 73440abf636577fda0d05524180791434ca727b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 17:03:31 2019 +0800

                症状推送

            commit de516f030d664bb82787ae5a35f68515237ab4c4
            Merge: 4c3985a aebb7f7
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:39:30 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 4c3985ae9ebe589d36c352b579501681f060b795
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:19:02 2019 +0800

                限制调用时机

            commit f0d48657fba60ba4fd72c031b8368b7c67efc619
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 16:15:33 2019 +0800

                noIds添加判断

            commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
            Merge: 8324bf6 f9a0af3
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:43:24 2019 +0800

                Merge branch 'dev2/luolei' into dev2/zhangxc

            commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:42:41 2019 +0800

                症状推送（未完成）

            commit f9a0af3b869f1e84296e4630293ae99532e35155
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 15:40:56 2019 +0800

                合并问题

            commit aad93151bf13fb20e8b732369d05452e62d05c17
            Merge: f61ed45 cad991f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:08:39 2019 +0800

                merge from 'luolei'

            commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:01:33 2019 +0800

                症状推送及其修改（未完成）

            commit aebb7f75c35177143468f1c70c43738de296363e
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 14:32:58 2019 +0800

                多次调用问题解决

            commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 09:40:18 2019 +0800

                修改完成，参数统一配置

            commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:20:45 2019 +0800

                配置项修改

            commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:09:38 2019 +0800

                添加富文本编辑器

            commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 16:03:58 2019 +0800

                标签组修改

            commit 78b130de9259175f18e1c2e06a61188c35ddb864
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 15:08:40 2019 +0800

                判断有误

            commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
            Merge: 77a9c8c a0b68ed
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:47:20 2019 +0800

                merge from 'dev2/luolei'

            commit 77a9c8c7c09e2981265d35abc5425484d9519783
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:41:59 2019 +0800

                标签组修改（血压和症状）

            commit a0b68ed4950b1a6fa297aa3828229e7561631978
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 14:40:44 2019 +0800

                修改

            commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 20:25:47 2019 +0800

                提示信息维护

            commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:51:54 2019 +0800

                标签组修改标签组公共数据部分

            commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:37:03 2019 +0800

                初始化时填写单类型赋值

            commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:36:02 2019 +0800

                删除联合推送标签明细项

            commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 14:34:32 2019 +0800

                标签组添加限制条件

            commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 15:08:17 2019 +0800

                修改归属,填写单类型,性别,标签明细重置

            commit 061de293c240f35ad7e82056d57d846c8f3cb531
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 13:57:28 2019 +0800

                修改归属为化验类别为多选时标签显示

            commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 10:57:15 2019 +0800

                化验和多选框

            commit a4724d13390450886b82d650e703095dada8a401
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 11:08:15 2019 +0800

                修改标签类型和归属显示名称

            commit b448a51594240b8b0da025ee9a823c4577e2d18a
            Merge: 0b52ec6 db7e04f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 17:15:00 2019 +0800

                Merge branch 'test' into dev2/zhangxc

            commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 13:08:58 2019 +0800

                和单标签

            commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:59 2019 +0800

                修改bug

            commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:39 2019 +0800

                修改标签池标签名称样式

            commit 3663d6490026fc3f4fab92f3966dec703705a017
            Merge: 7aec89a 43e196f
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 10:13:29 2019 +0800

                Merge branch 'dev2/luolei' into independentTag

            commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:08:57 2019 +0800

                修改标签名称样式

            commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 17:26:43 2019 +0800

                bug修改

            commit 7aec89ad1af7201574105b99f0636c44e91a69e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:32:54 2019 +0800

                禁用传值布尔型

            commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:28:50 2019 +0800

                修改标签归属、类型和性别不可改

            commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:22:22 2019 +0800

                单选标签修改

            commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 11:20:22 2019 +0800

                文本类型修改，单选类型修改未完

            commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 18:10:47 2019 +0800

                单选维护属性tag显示

            commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 17:35:26 2019 +0800

                输入框类型维护

            commit 082c91207349481dd5bbc13de511d46d212d83ea
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 16:37:36 2019 +0800

                单选维护bug修改

            commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 14:53:29 2019 +0800

                单选标签属性选项置灰

            commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
            Merge: 7b95e36 d8f8c68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 10:04:46 2019 +0800

                Merge branch 'dev' into independentTag

            commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
            Merge: e2dd153 ba5e9e6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 09:48:48 2019 +0800

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

            commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sat Feb 2 17:30:26 2019 +0800

                单选维护

            commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 17:57:41 2019 +0800

                独立标签

            commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
            Merge: 6568234 c1ca617
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 15:29:27 2019 +0800

                Merge remote-tracking branch 'origin/depart' into independentTag

            commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:12:44 2019 +0800

                bug修改

            commit c4b0acf690b308b061c567aaa3620bd02879ec29
            Merge: 34570c5 b77e984
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:17 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 34570c5385b33631c74c29db58d02faad21367b0
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:09 2019 +0800

                bug修改

            commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
            Merge: 93ce48b ba5e9e6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:36:20 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:35:33 2019 +0800

                修改顶部标题样式

            commit 93ce48bda37148c865cb0b305a6e645f8418badd
            Merge: 148d49f db0659a
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:23:42 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit db0659aab84a70449bb5b5c61a9084463554b100
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:22:51 2019 +0800

                优化

            commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
            Merge: 3e9010f 60307c5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:19:38 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:18:06 2019 +0800

                修改横铺统一（血压）为每个后面添加一个输入框

            commit 3e9010f66dc1ad911c37486615ea5423be2c9285
            Merge: 77d8884 f04c384
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:16:48 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit f04c384d802839228bc2f74fb7dc65ede83a1775
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:15:12 2019 +0800

                互斥项

            commit 77d88846790cf2166999d602a6890d6ef4422190
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:06:13 2019 +0800

                修改左右箭头位置

            commit 714eba80c300c481857d0df5285a86944c4469e0
            Merge: 969688f 3fe9e97
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:58 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 969688f82f0f869e5eafdc40263054c83cf0093d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:49 2019 +0800

                修改标签属性删除

            commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 14:34:44 2019 +0800

                保存忘打开了

            commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
            Merge: 58d39fc 3f48de8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:55 2019 +0800

                Merge branch 'dev' into test

            commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
            Merge: bf43109 025ac3d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:36 2019 +0800

                Merge branch 'dev2/zhangxc' into dev

            commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:22:17 2019 +0800

                修改操作池样式

            commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 13:18:04 2019 +0800

                去掉既往史下面的提示

            commit 2964171fec51793f979776c433cede0594777d96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 11:13:21 2019 +0800

                修改性别清除标签明细

            commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:41:53 2019 +0800

                不区分单选多选

            commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:13:39 2019 +0800

                去掉弹窗

            commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
            Merge: e0ae7ed 393d9e4
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:23 2019 +0800

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

            commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:13 2019 +0800

                添加参数，默认值修改

            commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 09:53:55 2019 +0800

                修改样式

            # Conflicts:
            #	src/api/icss.js
            #	src/components/icss/IndeptLabel.vue
            #	src/components/icss/InspactTagGroup.vue
            #	src/components/icss/NoiseTemplate.vue
            #	src/components/icss/PubTagGroup.vue
            #	src/components/icss/SymptomPush.vue
            #	src/components/icss/SymptomTagGroup.vue

        commit e6f42e9e126128ec189ebc2505abd3a432bd01d6
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Mar 5 16:10:22 2019 +0800

            免责声明、详情、添加修改、启用停用

        commit f142c2dc630547b619612ed97270a9ff4a3221e0
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 21:02:41 2019 +0800

            添加免责声明
            Squashed commit of the following:

            commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
            Merge: e1b7e26 73440ab
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:33:02 2019 +0800

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

            commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
            Merge: 163e4c9 de516f0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:32:42 2019 +0800

                Merge branch 'test' into dev

                # Conflicts:
                #	src/api/icss.js

            commit 73440abf636577fda0d05524180791434ca727b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 17:03:31 2019 +0800

                症状推送

            commit de516f030d664bb82787ae5a35f68515237ab4c4
            Merge: 4c3985a aebb7f7
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:39:30 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 4c3985ae9ebe589d36c352b579501681f060b795
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:19:02 2019 +0800

                限制调用时机

            commit f0d48657fba60ba4fd72c031b8368b7c67efc619
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 16:15:33 2019 +0800

                noIds添加判断

            commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
            Merge: 8324bf6 f9a0af3
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:43:24 2019 +0800

                Merge branch 'dev2/luolei' into dev2/zhangxc

            commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:42:41 2019 +0800

                症状推送（未完成）

            commit f9a0af3b869f1e84296e4630293ae99532e35155
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 15:40:56 2019 +0800

                合并问题

            commit aad93151bf13fb20e8b732369d05452e62d05c17
            Merge: f61ed45 cad991f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:08:39 2019 +0800

                merge from 'luolei'

            commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:01:33 2019 +0800

                症状推送及其修改（未完成）

            commit aebb7f75c35177143468f1c70c43738de296363e
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 14:32:58 2019 +0800

                多次调用问题解决

            commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 09:40:18 2019 +0800

                修改完成，参数统一配置

            commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:20:45 2019 +0800

                配置项修改

            commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:09:38 2019 +0800

                添加富文本编辑器

            commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 16:03:58 2019 +0800

                标签组修改

            commit 78b130de9259175f18e1c2e06a61188c35ddb864
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 15:08:40 2019 +0800

                判断有误

            commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
            Merge: 77a9c8c a0b68ed
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:47:20 2019 +0800

                merge from 'dev2/luolei'

            commit 77a9c8c7c09e2981265d35abc5425484d9519783
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:41:59 2019 +0800

                标签组修改（血压和症状）

            commit a0b68ed4950b1a6fa297aa3828229e7561631978
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 14:40:44 2019 +0800

                修改

            commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 20:25:47 2019 +0800

                提示信息维护

            commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:51:54 2019 +0800

                标签组修改标签组公共数据部分

            commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:37:03 2019 +0800

                初始化时填写单类型赋值

            commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:36:02 2019 +0800

                删除联合推送标签明细项

            commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 14:34:32 2019 +0800

                标签组添加限制条件

            commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 15:08:17 2019 +0800

                修改归属,填写单类型,性别,标签明细重置

            commit 061de293c240f35ad7e82056d57d846c8f3cb531
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 13:57:28 2019 +0800

                修改归属为化验类别为多选时标签显示

            commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 10:57:15 2019 +0800

                化验和多选框

            commit a4724d13390450886b82d650e703095dada8a401
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 11:08:15 2019 +0800

                修改标签类型和归属显示名称

            commit b448a51594240b8b0da025ee9a823c4577e2d18a
            Merge: 0b52ec6 db7e04f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 17:15:00 2019 +0800

                Merge branch 'test' into dev2/zhangxc

            commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 13:08:58 2019 +0800

                和单标签

            commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:59 2019 +0800

                修改bug

            commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:39 2019 +0800

                修改标签池标签名称样式

            commit 3663d6490026fc3f4fab92f3966dec703705a017
            Merge: 7aec89a 43e196f
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 10:13:29 2019 +0800

                Merge branch 'dev2/luolei' into independentTag

            commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:08:57 2019 +0800

                修改标签名称样式

            commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 17:26:43 2019 +0800

                bug修改

            commit 7aec89ad1af7201574105b99f0636c44e91a69e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:32:54 2019 +0800

                禁用传值布尔型

            commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:28:50 2019 +0800

                修改标签归属、类型和性别不可改

            commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:22:22 2019 +0800

                单选标签修改

            commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 11:20:22 2019 +0800

                文本类型修改，单选类型修改未完

            commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 18:10:47 2019 +0800

                单选维护属性tag显示

            commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 17:35:26 2019 +0800

                输入框类型维护

            commit 082c91207349481dd5bbc13de511d46d212d83ea
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 16:37:36 2019 +0800

                单选维护bug修改

            commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 14:53:29 2019 +0800

                单选标签属性选项置灰

            commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
            Merge: 7b95e36 d8f8c68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 10:04:46 2019 +0800

                Merge branch 'dev' into independentTag

            commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
            Merge: e2dd153 ba5e9e6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 09:48:48 2019 +0800

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

            commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sat Feb 2 17:30:26 2019 +0800

                单选维护

            commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 17:57:41 2019 +0800

                独立标签

            commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
            Merge: 6568234 c1ca617
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 15:29:27 2019 +0800

                Merge remote-tracking branch 'origin/depart' into independentTag

            commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:12:44 2019 +0800

                bug修改

            commit c4b0acf690b308b061c567aaa3620bd02879ec29
            Merge: 34570c5 b77e984
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:17 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 34570c5385b33631c74c29db58d02faad21367b0
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:09 2019 +0800

                bug修改

            commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
            Merge: 93ce48b ba5e9e6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:36:20 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:35:33 2019 +0800

                修改顶部标题样式

            commit 93ce48bda37148c865cb0b305a6e645f8418badd
            Merge: 148d49f db0659a
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:23:42 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit db0659aab84a70449bb5b5c61a9084463554b100
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:22:51 2019 +0800

                优化

            commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
            Merge: 3e9010f 60307c5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:19:38 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:18:06 2019 +0800

                修改横铺统一（血压）为每个后面添加一个输入框

            commit 3e9010f66dc1ad911c37486615ea5423be2c9285
            Merge: 77d8884 f04c384
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:16:48 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit f04c384d802839228bc2f74fb7dc65ede83a1775
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:15:12 2019 +0800

                互斥项

            commit 77d88846790cf2166999d602a6890d6ef4422190
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:06:13 2019 +0800

                修改左右箭头位置

            commit 714eba80c300c481857d0df5285a86944c4469e0
            Merge: 969688f 3fe9e97
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:58 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 969688f82f0f869e5eafdc40263054c83cf0093d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:49 2019 +0800

                修改标签属性删除

            commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 14:34:44 2019 +0800

                保存忘打开了

            commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
            Merge: 58d39fc 3f48de8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:55 2019 +0800

                Merge branch 'dev' into test

            commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
            Merge: bf43109 025ac3d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:36 2019 +0800

                Merge branch 'dev2/zhangxc' into dev

            commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:22:17 2019 +0800

                修改操作池样式

            commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 13:18:04 2019 +0800

                去掉既往史下面的提示

            commit 2964171fec51793f979776c433cede0594777d96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 11:13:21 2019 +0800

                修改性别清除标签明细

            commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:41:53 2019 +0800

                不区分单选多选

            commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:13:39 2019 +0800

                去掉弹窗

            commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
            Merge: e0ae7ed 393d9e4
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:23 2019 +0800

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

            commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:13 2019 +0800

                添加参数，默认值修改

            commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 09:53:55 2019 +0800

                修改样式

            # Conflicts:
            #	src/api/config.js
            #	src/api/icss.js
            #	src/api/utils.js
            #	src/components/icss/BloodPressTagGroup.vue
            #	src/components/icss/NoiseTemplate.vue
            #	src/components/icss/PubTagGroup.vue
            #	src/components/icss/PubTagPartDetail.vue
            #	src/components/icss/SymptomTagGroup.vue
            #	src/routes.js

        # Conflicts:
        #	src/components/icss/IndeptLabel.vue
        #	src/components/icss/LabelGroup.vue

    commit 4340f9c1e06625f368d3acf2c81f10797a50d74c
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 6 14:18:37 2019 +0800

        常见科室症状

    commit 0fe383a169541a4af26341a94dbdcca18026b9a9
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 6 13:33:31 2019 +0800

        标题修改

    commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
    Merge: 6dde00e f2ad245
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 6 11:15:37 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit f2ad24529f7716a96e6e01c57056343fcd516473
    Merge: e0223af 76dfc4f
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 6 11:13:37 2019 +0800

        Merge branch 'dev2/zhangxc' into dev2/luolei

    commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 6 11:12:15 2019 +0800

        修改标签组参数转换

    commit 365b676fb3adfb19828a6295b94527da158b0a56
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 6 10:52:38 2019 +0800

        修改独立标签没有修改不能保存问题

    commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 16:46:45 2019 +0800

        token失效问题

    commit 36d73051401858000de44211f71d931d0b061e6e
    Merge: 28fdc7d b1feaf1
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 11:10:10 2019 +0800

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

    commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 11:05:01 2019 +0800

        独立标签分页样式

    commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
    Merge: 216dd81 28336ac
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 11:03:07 2019 +0800

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

    commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
    Merge: db78e24 1c7e1b4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 10:59:41 2019 +0800

        merge from 'lcf'

    commit db78e24b427d92b0a8aa9d774deb2bad253912a7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 10:49:32 2019 +0800

        症状推送类样式修改

    commit 09a0e94857dab141bdc5740d74550a3daf4efaea
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 10:33:59 2019 +0800

        修改底部分页宽度

    commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
    Merge: 7d489cf e0223af
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 10:28:44 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 10:26:04 2019 +0800

        去掉类型判断

    commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
    Merge: 69f1559 3cb5b42
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 10:24:20 2019 +0800

        Merge branch 'dev' into dev2/zhangxc

    commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
    Merge: b232857 0e7f672
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 10:22:12 2019 +0800

        Merge branch 'dev2/luolei' into dev2/zhangxc

    commit b2328579f94768eaca1a20191733639b07343235
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 09:49:21 2019 +0800

        底部分页添加最小宽度

    commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
    Merge: 51c17f1 0e7f672
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 09:39:54 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit 51c17f117d137e82c82a0883d546e17063a1a180
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 09:39:39 2019 +0800

        富文本编辑依赖添加

    commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 16:33:14 2019 +0800

        修改操作界面样式

    commit 457d83209b5c780554eeee8accf88e4c1630394a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 16:16:44 2019 +0800

        症状推送添加标签标识

    commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
    Merge: bfdb2a4 de516f0
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 13:09:42 2019 +0800

        Merge branch 'test' into dev2/zhangxc

    commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 10:34:54 2019 +0800

        症状推送有内容显示状态

    commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 4 09:25:40 2019 +0800

        删除console

    commit 9d5e136b249f446288db7f42347d829ff995c901
    Merge: 5aa2bdc 83920a9
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 17:57:05 2019 +0800

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

    commit 83920a95b2a26706470d5effd09e14dc60aec472
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 17:52:56 2019 +0800

        报错问题

    commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
    Merge: e1b7e26 73440ab
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 17:33:02 2019 +0800

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

    commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
    Merge: 163e4c9 de516f0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 17:32:42 2019 +0800

        Merge branch 'test' into dev

        # Conflicts:
        #	src/api/icss.js

    commit 73440abf636577fda0d05524180791434ca727b7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 17:03:31 2019 +0800

        症状推送

    commit de516f030d664bb82787ae5a35f68515237ab4c4
    Merge: 4c3985a aebb7f7
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 16:39:30 2019 +0800

        Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

    commit 4c3985ae9ebe589d36c352b579501681f060b795
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 16:19:02 2019 +0800

        限制调用时机

    commit f0d48657fba60ba4fd72c031b8368b7c67efc619
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 16:15:33 2019 +0800

        noIds添加判断

    commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
    Merge: 8324bf6 f9a0af3
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 15:43:24 2019 +0800

        Merge branch 'dev2/luolei' into dev2/zhangxc

    commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 15:42:41 2019 +0800

        症状推送（未完成）

    commit f9a0af3b869f1e84296e4630293ae99532e35155
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 15:40:56 2019 +0800

        合并问题

    commit aad93151bf13fb20e8b732369d05452e62d05c17
    Merge: f61ed45 cad991f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 15:08:39 2019 +0800

        merge from 'luolei'

    commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 15:01:33 2019 +0800

        症状推送及其修改（未完成）

    commit aebb7f75c35177143468f1c70c43738de296363e
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 14:32:58 2019 +0800

        多次调用问题解决

    commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 09:40:18 2019 +0800

        修改完成，参数统一配置

    commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 20:20:45 2019 +0800

        配置项修改

    commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 20:09:38 2019 +0800

        添加富文本编辑器

    commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 28 16:03:58 2019 +0800

        标签组修改

    commit 78b130de9259175f18e1c2e06a61188c35ddb864
    Author: Luolei <16657115156@163.com>
    Date:   Wed Feb 27 15:08:40 2019 +0800

        判断有误

    commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
    Merge: 77a9c8c a0b68ed
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 27 14:47:20 2019 +0800

        merge from 'dev2/luolei'

    commit 77a9c8c7c09e2981265d35abc5425484d9519783
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 27 14:41:59 2019 +0800

        标签组修改（血压和症状）

    commit a0b68ed4950b1a6fa297aa3828229e7561631978
    Author: Luolei <16657115156@163.com>
    Date:   Wed Feb 27 14:40:44 2019 +0800

        修改

    commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 26 20:25:47 2019 +0800

        提示信息维护

    commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 09:51:54 2019 +0800

        标签组修改标签组公共数据部分

    commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 25 15:37:03 2019 +0800

        初始化时填写单类型赋值

    commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 25 15:36:02 2019 +0800

        删除联合推送标签明细项

    commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 25 14:34:32 2019 +0800

        标签组添加限制条件

    commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Feb 22 15:08:17 2019 +0800

        修改归属,填写单类型,性别,标签明细重置

    commit 061de293c240f35ad7e82056d57d846c8f3cb531
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Feb 22 13:57:28 2019 +0800

        修改归属为化验类别为多选时标签显示

    commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Feb 22 10:57:15 2019 +0800

        化验和多选框

    commit a4724d13390450886b82d650e703095dada8a401
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Feb 21 11:08:15 2019 +0800

        修改标签类型和归属显示名称

    commit b448a51594240b8b0da025ee9a823c4577e2d18a
    Merge: 0b52ec6 db7e04f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 18 17:15:00 2019 +0800

        Merge branch 'test' into dev2/zhangxc

    commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 18 13:08:58 2019 +0800

        和单标签

    commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 18 10:30:59 2019 +0800

        修改bug

    commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 18 10:30:39 2019 +0800

        修改标签池标签名称样式

    commit 3663d6490026fc3f4fab92f3966dec703705a017
    Merge: 7aec89a 43e196f
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 18 10:13:29 2019 +0800

        Merge branch 'dev2/luolei' into independentTag

    commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 18 10:08:57 2019 +0800

        修改标签名称样式

    commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 15 17:26:43 2019 +0800

        bug修改

    commit 7aec89ad1af7201574105b99f0636c44e91a69e2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 13 16:32:54 2019 +0800

        禁用传值布尔型

    commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 13 16:28:50 2019 +0800

        修改标签归属、类型和性别不可改

    commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 13 16:22:22 2019 +0800

        单选标签修改

    commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 12 11:20:22 2019 +0800

        文本类型修改，单选类型修改未完

    commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 11 18:10:47 2019 +0800

        单选维护属性tag显示

    commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 11 17:35:26 2019 +0800

        输入框类型维护

    commit 082c91207349481dd5bbc13de511d46d212d83ea
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 11 16:37:36 2019 +0800

        单选维护bug修改

    commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 11 14:53:29 2019 +0800

        单选标签属性选项置灰

    commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
    Merge: 7b95e36 d8f8c68
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Sun Feb 3 10:04:46 2019 +0800

        Merge branch 'dev' into independentTag

    commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
    Merge: e2dd153 ba5e9e6
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Sun Feb 3 09:48:48 2019 +0800

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

    commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Sat Feb 2 17:30:26 2019 +0800

        单选维护

    commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 1 17:57:41 2019 +0800

        独立标签

    commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
    Merge: 6568234 c1ca617
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 1 15:29:27 2019 +0800

        Merge remote-tracking branch 'origin/depart' into independentTag

    commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 1 10:12:44 2019 +0800

        bug修改

    commit c4b0acf690b308b061c567aaa3620bd02879ec29
    Merge: 34570c5 b77e984
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 17:23:17 2019 +0800

        Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

    commit 34570c5385b33631c74c29db58d02faad21367b0
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 17:23:09 2019 +0800

        bug修改

    commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
    Merge: 93ce48b ba5e9e6
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:36:20 2019 +0800

        Merge branch 'dev2/zhangxc' into test

    commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:35:33 2019 +0800

        修改顶部标题样式

    commit 93ce48bda37148c865cb0b305a6e645f8418badd
    Merge: 148d49f db0659a
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 15:23:42 2019 +0800

        Merge branch 'dev2/luolei' into test

    commit db0659aab84a70449bb5b5c61a9084463554b100
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 15:22:51 2019 +0800

        优化

    commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
    Merge: 3e9010f 60307c5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:19:38 2019 +0800

        Merge branch 'dev2/zhangxc' into test

    commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:18:06 2019 +0800

        修改横铺统一（血压）为每个后面添加一个输入框

    commit 3e9010f66dc1ad911c37486615ea5423be2c9285
    Merge: 77d8884 f04c384
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 15:16:48 2019 +0800

        Merge branch 'dev2/luolei' into test

    commit f04c384d802839228bc2f74fb7dc65ede83a1775
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 15:15:12 2019 +0800

        互斥项

    commit 77d88846790cf2166999d602a6890d6ef4422190
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:06:13 2019 +0800

        修改左右箭头位置

    commit 714eba80c300c481857d0df5285a86944c4469e0
    Merge: 969688f 3fe9e97
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:01:58 2019 +0800

        Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

    commit 969688f82f0f869e5eafdc40263054c83cf0093d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:01:49 2019 +0800

        修改标签属性删除

    commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 14:34:44 2019 +0800

        保存忘打开了

    commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
    Merge: 58d39fc 3f48de8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 13:24:55 2019 +0800

        Merge branch 'dev' into test

    commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
    Merge: bf43109 025ac3d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 13:24:36 2019 +0800

        Merge branch 'dev2/zhangxc' into dev

    commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 13:22:17 2019 +0800

        修改操作池样式

    commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 13:18:04 2019 +0800

        去掉既往史下面的提示

    commit 2964171fec51793f979776c433cede0594777d96
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 11:13:21 2019 +0800

        修改性别清除标签明细

    commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 10:41:53 2019 +0800

        不区分单选多选

    commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 10:13:39 2019 +0800

        去掉弹窗

    commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
    Merge: e0ae7ed 393d9e4
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 10:11:23 2019 +0800

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

    commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 10:11:13 2019 +0800

        添加参数，默认值修改

    commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 09:53:55 2019 +0800

        修改样式

    # Conflicts:
    #	src/api/config.js

commit 5601cff44dec52b43a0c7426e51816e6ad00523e
Author: liucf <liucf@zjlantone.com>
Date:   Tue Mar 19 14:07:10 2019 +0800

    合并dev
    Squashed commit of the following:

    commit 9d8e78e5c7915fca2d57588e2fc7de5c3f5b737c
    Merge: 581d3ec 7c4e0c7
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 15:43:00 2019 +0800

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

        # Conflicts:
        #	src/components/icss/IndeptLabel.vue
        #	src/components/icss/SingleSelect.vue

    commit 7c4e0c7c2759ce35aba20392f2ddf8a0a5959ca2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 13 15:35:49 2019 +0800

        常见科室症状

    commit ea0f58d9620813f41d86db07b3b423593889e890
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 13 15:35:21 2019 +0800

        多选取消默认选中

    commit 581d3eca1b25e0a4ce75d638291ba0c5a94b6e35
    Merge: ddc468f cdc557d
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 15:30:08 2019 +0800

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

        # Conflicts:
        #	src/api/config.js
        #	src/components/icss/IndeptLabel.vue
        #	src/components/icss/PromptInfo.vue
        #	src/routes.js

    commit cdc557d0eee2af3a58aa67bfece53cbf32c343bd
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 14:54:48 2019 +0800

        独立标签表格标签类型显示修改，既往史添加标签池可选类型修改

    commit 44fab27447641937bfa3f934e259ddc9f9b760cf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 14:20:04 2019 +0800

        症状尾巴标签池有时间单位

    commit d5a9d0b0cdf2976a1d50ff484ecb5c7f6843ef66
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 13:55:39 2019 +0800

        下拉组件清空与下拉箭头重合修改

    commit feb792b515c554af8dde2a06127d3758b2b583eb
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 13:22:48 2019 +0800

        独立标签筛选类型辅捡等不显示

    commit c3a666aa1af0b9c561eaa5ed589effe614e985a5
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 11:43:37 2019 +0800

        后台数据typeCn转换为筛选中对应的字段名称

    commit efb80b4bf9e9d8aa6298b72f8b864a671edea2b7
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 11:21:29 2019 +0800

        单选无同伴同无，多选无默认选中

    commit b138d164f421524e7c66ee8673102d4738078b6e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Mar 13 10:06:55 2019 +0800

        术语静态知识未完

    commit f0659f14489821e423f9c70564969af5edf2da2b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 13 09:16:02 2019 +0800

        其他史多选的不需要显示默认选中

    commit 592302ac839e01e17286f332cee2cafda9d82d78
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 12 18:50:27 2019 +0800

        修改v-show为v-if

    commit cb868f04f62ef05bbf2fd5038a71845a79ba75e0
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 12 18:50:05 2019 +0800

        血压修改问题

    commit a2aa1c103fb35c7f788fe3499b22695898a1a99a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 12 18:49:37 2019 +0800

        症状修改文字标签添加标识

    commit ecdfcb194300b3b88f194a5a00c19aa474c7da34
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 12 10:48:55 2019 +0800

        医学术语静态知识维护页面添加

    commit 5fb0d31284c1ea9f980ed42ee4ec0ea6e137e851
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Mar 12 10:23:29 2019 +0800

        提示信息修改

    commit 27e21af25e41e49ad609a06fb46157f2b635922c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 11 20:32:19 2019 +0800

        静态知识修改

    commit c4701778218a01ab699ed29be3402cc68b9ef5da
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 11 20:27:44 2019 +0800

        单选异常选项修改

    commit 822df8507b0c48b06e8d9b9350001cfd1f85765e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 11 20:11:18 2019 +0800

        添加查体模板

    commit 7658d6f547d6b067d42d4cbaebc07e46d206340f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 11 20:10:15 2019 +0800

        独立标签标签归属名称

    commit 7b0204b6b2fb9ab2c1adbdc29b7af8cfb68da26f
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 11 18:56:57 2019 +0800

        提示信息详情完成

    commit 5e8f323a81a735e062abbd0289fef01ed39646b3
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Mar 11 15:58:36 2019 +0800

        提示信息详情删除修改-接口对接

    commit 2bf8231b03c8eef66abfc2e1a6f9d96c457c2e67
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 8 15:21:28 2019 +0800

        提示信息添加

    commit ddc468fe5f2c18dd3860ffdad97cdb3e9c8d30d8
    Merge: 5033494 b809a69
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:31:28 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit b809a6993c8f2b4d53a921ed17ce4beb96afe714
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:30:52 2019 +0800

        药品分类

    commit 5033494965fd13f7511755590f106a42a08ba368
    Merge: 069d57c 11280b2
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:25:59 2019 +0800

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

    commit c17df7317718acbf2dfbde32fcc545f1ed818af8
    Merge: 069d57c 11280b2
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:22:38 2019 +0800

        Merge branch 'dev2/zhangxc' into dev2/luolei

    commit 11280b23fd6f56315cf8b686f9ed9279c4d92bff
    Merge: 0ac18a8 c96333d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 11:18:52 2019 +0800

        merge from 'luolei'

    commit 069d57c50a1aec671dc3e6a9a531cbf07472adad
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:10:14 2019 +0800

        注释

    commit a380af30e459f7db199c78963f1d138747880822
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:08:58 2019 +0800

        11

    commit 0ac18a8c7555daba27c2693ea6dc6fd08ed94e55
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 11:07:50 2019 +0800

        修改参数转换函数

    commit 370bfc071e6e89235fee91aa495bb89b662d3713
    Merge: c96333d a8359c2
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:04:12 2019 +0800

        Merge branch 'dev' into dev2/luolei

    commit 6074687f3d18f71e668224ca59e514b6696a558f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 11:04:12 2019 +0800

        修改独立标签样式

    commit c96333d02f1af5286ef46aab04ef104963d4bbaa
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 11:02:56 2019 +0800

        样式

    commit cc411cc6733931097a8cdd6b9c57b192d8935196
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 11:02:29 2019 +0800

        Revert "修改独立标签样式"

        This reverts commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9.

    commit fc1d5a12ade36fbc24461b5bb2c55b8b352d38f9
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 11:01:23 2019 +0800

        修改独立标签样式

    commit 5ac3b253c2d3fca4de474100b650bab1b0138d61
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 10:55:17 2019 +0800

        11

    commit a8359c2a226ae695bfa22c2e480088e025fe192b
    Merge: 072bc67 cb3e95b
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 10:32:32 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit cb3e95b38a46ba9e38a311f72f933c534cee104e
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 8 10:31:04 2019 +0800

        123456

    commit bb5b301daacc785155578147f66575848d39c21f
    Merge: 1b9fe73 072bc67
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 10:23:55 2019 +0800

        merge from 'dev'

    commit 1b9fe73bd1fae8e2eef414e520b985cee7c17e93
    Merge: 45f3fff a28b97b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 10:18:52 2019 +0800

        merge feom 'luolei'

    commit 45f3fff542bbdb72399411b0d807c45ef53cfe9a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 10:14:22 2019 +0800

        查体模板维护

    commit e91e545be4b9fa9eb9d3738c636b2d3be4934c50
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 8 09:56:18 2019 +0800

        修改参数转换tagFlag

    commit 072bc671096d52b8a4f477f562fd26340bfde0ca
    Merge: 376205e a28b97b
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 7 17:44:22 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit a28b97bdbc88658bd958a9341add8f86c0c52961
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 7 17:39:30 2019 +0800

        模板添加界面

    commit cb1b285b6b482be1006e239caec531cb0bdef070
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 15:31:56 2019 +0800

        常见科室症状添加症状

    commit 2a1b26b33ac8f879bf2bd76f0b862d450651d8ba
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 15:29:35 2019 +0800

        表格添加不可拖拽属性

    commit 8281112592b596ba405b5db8e49571c41e8e8d0e
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 15:29:18 2019 +0800

        常用科室症状上下排序

    commit 4323a2cbd123f252dcf81a90fbfc304be5529d40
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 14:54:14 2019 +0800

        独立标签最小年龄类型限制

    commit 87a95a9d52190e088a05f0cac5c95c721c419fba
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 13:55:58 2019 +0800

        修改报错

    commit ac0d7ede74d93bf0630e4b72eb029b78f3360907
    Merge: 6e62e30 fda8c97
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 13:54:16 2019 +0800

        merge from 'dev2/luolei'

    commit 6e62e30f3ae5cd9e72651f311584c203c2a468df
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 13:43:35 2019 +0800

        归属添加药品分类

    commit fda8c97ddd693aa794d87937bba640746a9439c0
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 7 13:43:02 2019 +0800

        标签池获取问题

    commit 4d0718701f413e87eec87f120249ba51127b2c1a
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 7 13:25:19 2019 +0800

        标签组类别填写单类型9没有标签池报错问题

    commit 376205ee088e63aa291e02221dcc9ebbd8b3499c
    Merge: 99048a5 2f00eb8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 7 11:41:53 2019 +0800

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

    commit 99048a54361560591510c2e3f79342134d9a1c29
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Mar 7 11:41:12 2019 +0800

        文件服务器地址修改

    commit 6930a001d2a87a04a67f2e6b35f1362b5920ff98
    Merge: c6a276a 2f00eb8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 11:36:35 2019 +0800

        merge from 'dev'

    commit fcb91f06b700e7c3d84058985ad4bd89539cf092
    Author: Luolei <16657115156@163.com>
    Date:   Thu Mar 7 11:31:38 2019 +0800

        新增模板维护系统

    commit c6a276a09579b4478c1fb5c7e6aaabb7fcdef4ea
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 11:23:13 2019 +0800

        修改标签组添加是否显示加号和是否复制子标签字段

    commit 3869532cff2a3c176935a9498def94f5384820ee
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 11:13:28 2019 +0800

        添加常用科室症状

    commit 2f00eb8a4baee7dae8bdf11986f139f692c3376d
    Merge: 0c12c5e 0fe383a
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu Mar 7 09:58:35 2019 +0800

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

    commit ae8596b1e19d3b46939535694342d2b63e7bd270
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Mar 7 09:16:44 2019 +0800

        修改独立标签添加/修改标题

    commit 0c12c5e77187de09015015fc95bc5072cb967097
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed Mar 6 16:49:04 2019 +0800

        合并depart分支
        Squashed commit of the following:

        commit 49f3af28dbb3e149975a326ba706b0fc1e9544c4
        Author: liucf <liucf@zjlantone.com>
        Date:   Wed Mar 6 16:42:01 2019 +0800

            合并dev
            Squashed commit of the following:

            commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
            Merge: 6dde00e f2ad245
            Author: Luolei <16657115156@163.com>
            Date:   Wed Mar 6 11:15:37 2019 +0800

                Merge branch 'dev2/luolei' into dev

            commit f2ad24529f7716a96e6e01c57056343fcd516473
            Merge: e0223af 76dfc4f
            Author: Luolei <16657115156@163.com>
            Date:   Wed Mar 6 11:13:37 2019 +0800

                Merge branch 'dev2/zhangxc' into dev2/luolei

            commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Mar 6 11:12:15 2019 +0800

                修改标签组参数转换

            commit 365b676fb3adfb19828a6295b94527da158b0a56
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Mar 6 10:52:38 2019 +0800

                修改独立标签没有修改不能保存问题

            commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 16:46:45 2019 +0800

                token失效问题

            commit 36d73051401858000de44211f71d931d0b061e6e
            Merge: 28fdc7d b1feaf1
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 11:10:10 2019 +0800

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

            commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 11:05:01 2019 +0800

                独立标签分页样式

            commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
            Merge: 216dd81 28336ac
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 11:03:07 2019 +0800

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

            commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
            Merge: db78e24 1c7e1b4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:59:41 2019 +0800

                merge from 'lcf'

            commit db78e24b427d92b0a8aa9d774deb2bad253912a7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:49:32 2019 +0800

                症状推送类样式修改

            commit 09a0e94857dab141bdc5740d74550a3daf4efaea
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:33:59 2019 +0800

                修改底部分页宽度

            commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
            Merge: 7d489cf e0223af
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 10:28:44 2019 +0800

                Merge branch 'dev2/luolei' into dev

            commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 10:26:04 2019 +0800

                去掉类型判断

            commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
            Merge: 69f1559 3cb5b42
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:24:20 2019 +0800

                Merge branch 'dev' into dev2/zhangxc

            commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
            Merge: b232857 0e7f672
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:22:12 2019 +0800

                Merge branch 'dev2/luolei' into dev2/zhangxc

            commit b2328579f94768eaca1a20191733639b07343235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 09:49:21 2019 +0800

                底部分页添加最小宽度

            commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
            Merge: 51c17f1 0e7f672
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 09:39:54 2019 +0800

                Merge branch 'dev2/luolei' into dev

            commit 51c17f117d137e82c82a0883d546e17063a1a180
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 09:39:39 2019 +0800

                富文本编辑依赖添加

            commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 16:33:14 2019 +0800

                修改操作界面样式

            commit 457d83209b5c780554eeee8accf88e4c1630394a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 16:16:44 2019 +0800

                症状推送添加标签标识

            commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
            Merge: bfdb2a4 de516f0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 13:09:42 2019 +0800

                Merge branch 'test' into dev2/zhangxc

            commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 10:34:54 2019 +0800

                症状推送有内容显示状态

            commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
            Author: Luolei <16657115156@163.com>
            Date:   Mon Mar 4 09:25:40 2019 +0800

                删除console

            commit 83920a95b2a26706470d5effd09e14dc60aec472
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 17:52:56 2019 +0800

                报错问题

            commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
            Merge: e1b7e26 73440ab
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:33:02 2019 +0800

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

            commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
            Merge: 163e4c9 de516f0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:32:42 2019 +0800

                Merge branch 'test' into dev

                # Conflicts:
                #	src/api/icss.js

            commit 73440abf636577fda0d05524180791434ca727b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 17:03:31 2019 +0800

                症状推送

            commit de516f030d664bb82787ae5a35f68515237ab4c4
            Merge: 4c3985a aebb7f7
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:39:30 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 4c3985ae9ebe589d36c352b579501681f060b795
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:19:02 2019 +0800

                限制调用时机

            commit f0d48657fba60ba4fd72c031b8368b7c67efc619
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 16:15:33 2019 +0800

                noIds添加判断

            commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
            Merge: 8324bf6 f9a0af3
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:43:24 2019 +0800

                Merge branch 'dev2/luolei' into dev2/zhangxc

            commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:42:41 2019 +0800

                症状推送（未完成）

            commit f9a0af3b869f1e84296e4630293ae99532e35155
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 15:40:56 2019 +0800

                合并问题

            commit aad93151bf13fb20e8b732369d05452e62d05c17
            Merge: f61ed45 cad991f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:08:39 2019 +0800

                merge from 'luolei'

            commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:01:33 2019 +0800

                症状推送及其修改（未完成）

            commit aebb7f75c35177143468f1c70c43738de296363e
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 14:32:58 2019 +0800

                多次调用问题解决

            commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 09:40:18 2019 +0800

                修改完成，参数统一配置

            commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:20:45 2019 +0800

                配置项修改

            commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:09:38 2019 +0800

                添加富文本编辑器

            commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 16:03:58 2019 +0800

                标签组修改

            commit 78b130de9259175f18e1c2e06a61188c35ddb864
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 15:08:40 2019 +0800

                判断有误

            commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
            Merge: 77a9c8c a0b68ed
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:47:20 2019 +0800

                merge from 'dev2/luolei'

            commit 77a9c8c7c09e2981265d35abc5425484d9519783
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:41:59 2019 +0800

                标签组修改（血压和症状）

            commit a0b68ed4950b1a6fa297aa3828229e7561631978
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 14:40:44 2019 +0800

                修改

            commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 20:25:47 2019 +0800

                提示信息维护

            commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:51:54 2019 +0800

                标签组修改标签组公共数据部分

            commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:37:03 2019 +0800

                初始化时填写单类型赋值

            commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:36:02 2019 +0800

                删除联合推送标签明细项

            commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 14:34:32 2019 +0800

                标签组添加限制条件

            commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 15:08:17 2019 +0800

                修改归属,填写单类型,性别,标签明细重置

            commit 061de293c240f35ad7e82056d57d846c8f3cb531
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 13:57:28 2019 +0800

                修改归属为化验类别为多选时标签显示

            commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 10:57:15 2019 +0800

                化验和多选框

            commit a4724d13390450886b82d650e703095dada8a401
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 11:08:15 2019 +0800

                修改标签类型和归属显示名称

            commit b448a51594240b8b0da025ee9a823c4577e2d18a
            Merge: 0b52ec6 db7e04f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 17:15:00 2019 +0800

                Merge branch 'test' into dev2/zhangxc

            commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 13:08:58 2019 +0800

                和单标签

            commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:59 2019 +0800

                修改bug

            commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:39 2019 +0800

                修改标签池标签名称样式

            commit 3663d6490026fc3f4fab92f3966dec703705a017
            Merge: 7aec89a 43e196f
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 10:13:29 2019 +0800

                Merge branch 'dev2/luolei' into independentTag

            commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:08:57 2019 +0800

                修改标签名称样式

            commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 17:26:43 2019 +0800

                bug修改

            commit 7aec89ad1af7201574105b99f0636c44e91a69e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:32:54 2019 +0800

                禁用传值布尔型

            commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:28:50 2019 +0800

                修改标签归属、类型和性别不可改

            commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:22:22 2019 +0800

                单选标签修改

            commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 11:20:22 2019 +0800

                文本类型修改，单选类型修改未完

            commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 18:10:47 2019 +0800

                单选维护属性tag显示

            commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 17:35:26 2019 +0800

                输入框类型维护

            commit 082c91207349481dd5bbc13de511d46d212d83ea
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 16:37:36 2019 +0800

                单选维护bug修改

            commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 14:53:29 2019 +0800

                单选标签属性选项置灰

            commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
            Merge: 7b95e36 d8f8c68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 10:04:46 2019 +0800

                Merge branch 'dev' into independentTag

            commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
            Merge: e2dd153 ba5e9e6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 09:48:48 2019 +0800

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

            commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sat Feb 2 17:30:26 2019 +0800

                单选维护

            commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 17:57:41 2019 +0800

                独立标签

            commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
            Merge: 6568234 c1ca617
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 15:29:27 2019 +0800

                Merge remote-tracking branch 'origin/depart' into independentTag

            commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:12:44 2019 +0800

                bug修改

            commit c4b0acf690b308b061c567aaa3620bd02879ec29
            Merge: 34570c5 b77e984
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:17 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 34570c5385b33631c74c29db58d02faad21367b0
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:09 2019 +0800

                bug修改

            commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
            Merge: 93ce48b ba5e9e6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:36:20 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:35:33 2019 +0800

                修改顶部标题样式

            commit 93ce48bda37148c865cb0b305a6e645f8418badd
            Merge: 148d49f db0659a
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:23:42 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit db0659aab84a70449bb5b5c61a9084463554b100
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:22:51 2019 +0800

                优化

            commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
            Merge: 3e9010f 60307c5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:19:38 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:18:06 2019 +0800

                修改横铺统一（血压）为每个后面添加一个输入框

            commit 3e9010f66dc1ad911c37486615ea5423be2c9285
            Merge: 77d8884 f04c384
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:16:48 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit f04c384d802839228bc2f74fb7dc65ede83a1775
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:15:12 2019 +0800

                互斥项

            commit 77d88846790cf2166999d602a6890d6ef4422190
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:06:13 2019 +0800

                修改左右箭头位置

            commit 714eba80c300c481857d0df5285a86944c4469e0
            Merge: 969688f 3fe9e97
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:58 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 969688f82f0f869e5eafdc40263054c83cf0093d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:49 2019 +0800

                修改标签属性删除

            commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 14:34:44 2019 +0800

                保存忘打开了

            commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
            Merge: 58d39fc 3f48de8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:55 2019 +0800

                Merge branch 'dev' into test

            commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
            Merge: bf43109 025ac3d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:36 2019 +0800

                Merge branch 'dev2/zhangxc' into dev

            commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:22:17 2019 +0800

                修改操作池样式

            commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 13:18:04 2019 +0800

                去掉既往史下面的提示

            commit 2964171fec51793f979776c433cede0594777d96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 11:13:21 2019 +0800

                修改性别清除标签明细

            commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:41:53 2019 +0800

                不区分单选多选

            commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:13:39 2019 +0800

                去掉弹窗

            commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
            Merge: e0ae7ed 393d9e4
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:23 2019 +0800

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

            commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:13 2019 +0800

                添加参数，默认值修改

            commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 09:53:55 2019 +0800

                修改样式

            # Conflicts:
            #	src/api/icss.js
            #	src/components/icss/IndeptLabel.vue
            #	src/components/icss/LabelGroup.vue
            #	src/components/icss/PubTagGroup.vue

        commit 19f3f1de0e04cf8c4e4980713c886087b72f22b9
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Mar 5 16:52:40 2019 +0800

            合并dev分支，并统一分页样式和删除颜色
            Squashed commit of the following:

            commit 36d73051401858000de44211f71d931d0b061e6e
            Merge: 28fdc7d b1feaf1
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 11:10:10 2019 +0800

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

            commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 11:05:01 2019 +0800

                独立标签分页样式

            commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
            Merge: 216dd81 28336ac
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 11:03:07 2019 +0800

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

            commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
            Merge: db78e24 1c7e1b4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:59:41 2019 +0800

                merge from 'lcf'

            commit db78e24b427d92b0a8aa9d774deb2bad253912a7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:49:32 2019 +0800

                症状推送类样式修改

            commit 09a0e94857dab141bdc5740d74550a3daf4efaea
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:33:59 2019 +0800

                修改底部分页宽度

            commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
            Merge: 7d489cf e0223af
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 10:28:44 2019 +0800

                Merge branch 'dev2/luolei' into dev

            commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 10:26:04 2019 +0800

                去掉类型判断

            commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
            Merge: 69f1559 3cb5b42
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:24:20 2019 +0800

                Merge branch 'dev' into dev2/zhangxc

            commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
            Merge: b232857 0e7f672
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 10:22:12 2019 +0800

                Merge branch 'dev2/luolei' into dev2/zhangxc

            commit b2328579f94768eaca1a20191733639b07343235
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Mar 5 09:49:21 2019 +0800

                底部分页添加最小宽度

            commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
            Merge: 51c17f1 0e7f672
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 09:39:54 2019 +0800

                Merge branch 'dev2/luolei' into dev

            commit 51c17f117d137e82c82a0883d546e17063a1a180
            Author: Luolei <16657115156@163.com>
            Date:   Tue Mar 5 09:39:39 2019 +0800

                富文本编辑依赖添加

            commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 16:33:14 2019 +0800

                修改操作界面样式

            commit 457d83209b5c780554eeee8accf88e4c1630394a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 16:16:44 2019 +0800

                症状推送添加标签标识

            commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
            Merge: bfdb2a4 de516f0
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 13:09:42 2019 +0800

                Merge branch 'test' into dev2/zhangxc

            commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Mar 4 10:34:54 2019 +0800

                症状推送有内容显示状态

            commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
            Author: Luolei <16657115156@163.com>
            Date:   Mon Mar 4 09:25:40 2019 +0800

                删除console

            commit 83920a95b2a26706470d5effd09e14dc60aec472
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 17:52:56 2019 +0800

                报错问题

            commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
            Merge: e1b7e26 73440ab
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:33:02 2019 +0800

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

            commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
            Merge: 163e4c9 de516f0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:32:42 2019 +0800

                Merge branch 'test' into dev

                # Conflicts:
                #	src/api/icss.js

            commit 73440abf636577fda0d05524180791434ca727b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 17:03:31 2019 +0800

                症状推送

            commit de516f030d664bb82787ae5a35f68515237ab4c4
            Merge: 4c3985a aebb7f7
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:39:30 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 4c3985ae9ebe589d36c352b579501681f060b795
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:19:02 2019 +0800

                限制调用时机

            commit f0d48657fba60ba4fd72c031b8368b7c67efc619
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 16:15:33 2019 +0800

                noIds添加判断

            commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
            Merge: 8324bf6 f9a0af3
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:43:24 2019 +0800

                Merge branch 'dev2/luolei' into dev2/zhangxc

            commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:42:41 2019 +0800

                症状推送（未完成）

            commit f9a0af3b869f1e84296e4630293ae99532e35155
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 15:40:56 2019 +0800

                合并问题

            commit aad93151bf13fb20e8b732369d05452e62d05c17
            Merge: f61ed45 cad991f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:08:39 2019 +0800

                merge from 'luolei'

            commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:01:33 2019 +0800

                症状推送及其修改（未完成）

            commit aebb7f75c35177143468f1c70c43738de296363e
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 14:32:58 2019 +0800

                多次调用问题解决

            commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 09:40:18 2019 +0800

                修改完成，参数统一配置

            commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:20:45 2019 +0800

                配置项修改

            commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:09:38 2019 +0800

                添加富文本编辑器

            commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 16:03:58 2019 +0800

                标签组修改

            commit 78b130de9259175f18e1c2e06a61188c35ddb864
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 15:08:40 2019 +0800

                判断有误

            commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
            Merge: 77a9c8c a0b68ed
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:47:20 2019 +0800

                merge from 'dev2/luolei'

            commit 77a9c8c7c09e2981265d35abc5425484d9519783
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:41:59 2019 +0800

                标签组修改（血压和症状）

            commit a0b68ed4950b1a6fa297aa3828229e7561631978
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 14:40:44 2019 +0800

                修改

            commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 20:25:47 2019 +0800

                提示信息维护

            commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:51:54 2019 +0800

                标签组修改标签组公共数据部分

            commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:37:03 2019 +0800

                初始化时填写单类型赋值

            commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:36:02 2019 +0800

                删除联合推送标签明细项

            commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 14:34:32 2019 +0800

                标签组添加限制条件

            commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 15:08:17 2019 +0800

                修改归属,填写单类型,性别,标签明细重置

            commit 061de293c240f35ad7e82056d57d846c8f3cb531
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 13:57:28 2019 +0800

                修改归属为化验类别为多选时标签显示

            commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 10:57:15 2019 +0800

                化验和多选框

            commit a4724d13390450886b82d650e703095dada8a401
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 11:08:15 2019 +0800

                修改标签类型和归属显示名称

            commit b448a51594240b8b0da025ee9a823c4577e2d18a
            Merge: 0b52ec6 db7e04f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 17:15:00 2019 +0800

                Merge branch 'test' into dev2/zhangxc

            commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 13:08:58 2019 +0800

                和单标签

            commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:59 2019 +0800

                修改bug

            commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:39 2019 +0800

                修改标签池标签名称样式

            commit 3663d6490026fc3f4fab92f3966dec703705a017
            Merge: 7aec89a 43e196f
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 10:13:29 2019 +0800

                Merge branch 'dev2/luolei' into independentTag

            commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:08:57 2019 +0800

                修改标签名称样式

            commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 17:26:43 2019 +0800

                bug修改

            commit 7aec89ad1af7201574105b99f0636c44e91a69e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:32:54 2019 +0800

                禁用传值布尔型

            commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:28:50 2019 +0800

                修改标签归属、类型和性别不可改

            commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:22:22 2019 +0800

                单选标签修改

            commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 11:20:22 2019 +0800

                文本类型修改，单选类型修改未完

            commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 18:10:47 2019 +0800

                单选维护属性tag显示

            commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 17:35:26 2019 +0800

                输入框类型维护

            commit 082c91207349481dd5bbc13de511d46d212d83ea
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 16:37:36 2019 +0800

                单选维护bug修改

            commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 14:53:29 2019 +0800

                单选标签属性选项置灰

            commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
            Merge: 7b95e36 d8f8c68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 10:04:46 2019 +0800

                Merge branch 'dev' into independentTag

            commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
            Merge: e2dd153 ba5e9e6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 09:48:48 2019 +0800

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

            commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sat Feb 2 17:30:26 2019 +0800

                单选维护

            commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 17:57:41 2019 +0800

                独立标签

            commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
            Merge: 6568234 c1ca617
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 15:29:27 2019 +0800

                Merge remote-tracking branch 'origin/depart' into independentTag

            commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:12:44 2019 +0800

                bug修改

            commit c4b0acf690b308b061c567aaa3620bd02879ec29
            Merge: 34570c5 b77e984
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:17 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 34570c5385b33631c74c29db58d02faad21367b0
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:09 2019 +0800

                bug修改

            commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
            Merge: 93ce48b ba5e9e6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:36:20 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:35:33 2019 +0800

                修改顶部标题样式

            commit 93ce48bda37148c865cb0b305a6e645f8418badd
            Merge: 148d49f db0659a
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:23:42 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit db0659aab84a70449bb5b5c61a9084463554b100
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:22:51 2019 +0800

                优化

            commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
            Merge: 3e9010f 60307c5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:19:38 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:18:06 2019 +0800

                修改横铺统一（血压）为每个后面添加一个输入框

            commit 3e9010f66dc1ad911c37486615ea5423be2c9285
            Merge: 77d8884 f04c384
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:16:48 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit f04c384d802839228bc2f74fb7dc65ede83a1775
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:15:12 2019 +0800

                互斥项

            commit 77d88846790cf2166999d602a6890d6ef4422190
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:06:13 2019 +0800

                修改左右箭头位置

            commit 714eba80c300c481857d0df5285a86944c4469e0
            Merge: 969688f 3fe9e97
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:58 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 969688f82f0f869e5eafdc40263054c83cf0093d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:49 2019 +0800

                修改标签属性删除

            commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 14:34:44 2019 +0800

                保存忘打开了

            commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
            Merge: 58d39fc 3f48de8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:55 2019 +0800

                Merge branch 'dev' into test

            commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
            Merge: bf43109 025ac3d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:36 2019 +0800

                Merge branch 'dev2/zhangxc' into dev

            commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:22:17 2019 +0800

                修改操作池样式

            commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 13:18:04 2019 +0800

                去掉既往史下面的提示

            commit 2964171fec51793f979776c433cede0594777d96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 11:13:21 2019 +0800

                修改性别清除标签明细

            commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:41:53 2019 +0800

                不区分单选多选

            commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:13:39 2019 +0800

                去掉弹窗

            commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
            Merge: e0ae7ed 393d9e4
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:23 2019 +0800

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

            commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:13 2019 +0800

                添加参数，默认值修改

            commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 09:53:55 2019 +0800

                修改样式

            # Conflicts:
            #	src/api/icss.js
            #	src/components/icss/IndeptLabel.vue
            #	src/components/icss/InspactTagGroup.vue
            #	src/components/icss/NoiseTemplate.vue
            #	src/components/icss/PubTagGroup.vue
            #	src/components/icss/SymptomPush.vue
            #	src/components/icss/SymptomTagGroup.vue

        commit e6f42e9e126128ec189ebc2505abd3a432bd01d6
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Mar 5 16:10:22 2019 +0800

            免责声明、详情、添加修改、启用停用

        commit f142c2dc630547b619612ed97270a9ff4a3221e0
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Mar 4 21:02:41 2019 +0800

            添加免责声明
            Squashed commit of the following:

            commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
            Merge: e1b7e26 73440ab
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:33:02 2019 +0800

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

            commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
            Merge: 163e4c9 de516f0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Mar 1 17:32:42 2019 +0800

                Merge branch 'test' into dev

                # Conflicts:
                #	src/api/icss.js

            commit 73440abf636577fda0d05524180791434ca727b7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 17:03:31 2019 +0800

                症状推送

            commit de516f030d664bb82787ae5a35f68515237ab4c4
            Merge: 4c3985a aebb7f7
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:39:30 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 4c3985ae9ebe589d36c352b579501681f060b795
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 16:19:02 2019 +0800

                限制调用时机

            commit f0d48657fba60ba4fd72c031b8368b7c67efc619
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 16:15:33 2019 +0800

                noIds添加判断

            commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
            Merge: 8324bf6 f9a0af3
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:43:24 2019 +0800

                Merge branch 'dev2/luolei' into dev2/zhangxc

            commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:42:41 2019 +0800

                症状推送（未完成）

            commit f9a0af3b869f1e84296e4630293ae99532e35155
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 15:40:56 2019 +0800

                合并问题

            commit aad93151bf13fb20e8b732369d05452e62d05c17
            Merge: f61ed45 cad991f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:08:39 2019 +0800

                merge from 'luolei'

            commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Mar 1 15:01:33 2019 +0800

                症状推送及其修改（未完成）

            commit aebb7f75c35177143468f1c70c43738de296363e
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 14:32:58 2019 +0800

                多次调用问题解决

            commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
            Author: Luolei <16657115156@163.com>
            Date:   Fri Mar 1 09:40:18 2019 +0800

                修改完成，参数统一配置

            commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:20:45 2019 +0800

                配置项修改

            commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Thu Feb 28 20:09:38 2019 +0800

                添加富文本编辑器

            commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
            Author: Luolei <16657115156@163.com>
            Date:   Thu Feb 28 16:03:58 2019 +0800

                标签组修改

            commit 78b130de9259175f18e1c2e06a61188c35ddb864
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 15:08:40 2019 +0800

                判断有误

            commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
            Merge: 77a9c8c a0b68ed
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:47:20 2019 +0800

                merge from 'dev2/luolei'

            commit 77a9c8c7c09e2981265d35abc5425484d9519783
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Wed Feb 27 14:41:59 2019 +0800

                标签组修改（血压和症状）

            commit a0b68ed4950b1a6fa297aa3828229e7561631978
            Author: Luolei <16657115156@163.com>
            Date:   Wed Feb 27 14:40:44 2019 +0800

                修改

            commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 26 20:25:47 2019 +0800

                提示信息维护

            commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Tue Feb 26 09:51:54 2019 +0800

                标签组修改标签组公共数据部分

            commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:37:03 2019 +0800

                初始化时填写单类型赋值

            commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 15:36:02 2019 +0800

                删除联合推送标签明细项

            commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 25 14:34:32 2019 +0800

                标签组添加限制条件

            commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 15:08:17 2019 +0800

                修改归属,填写单类型,性别,标签明细重置

            commit 061de293c240f35ad7e82056d57d846c8f3cb531
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 13:57:28 2019 +0800

                修改归属为化验类别为多选时标签显示

            commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Fri Feb 22 10:57:15 2019 +0800

                化验和多选框

            commit a4724d13390450886b82d650e703095dada8a401
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Feb 21 11:08:15 2019 +0800

                修改标签类型和归属显示名称

            commit b448a51594240b8b0da025ee9a823c4577e2d18a
            Merge: 0b52ec6 db7e04f
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 17:15:00 2019 +0800

                Merge branch 'test' into dev2/zhangxc

            commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 13:08:58 2019 +0800

                和单标签

            commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:59 2019 +0800

                修改bug

            commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:30:39 2019 +0800

                修改标签池标签名称样式

            commit 3663d6490026fc3f4fab92f3966dec703705a017
            Merge: 7aec89a 43e196f
            Author: Luolei <16657115156@163.com>
            Date:   Mon Feb 18 10:13:29 2019 +0800

                Merge branch 'dev2/luolei' into independentTag

            commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Mon Feb 18 10:08:57 2019 +0800

                修改标签名称样式

            commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 15 17:26:43 2019 +0800

                bug修改

            commit 7aec89ad1af7201574105b99f0636c44e91a69e2
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:32:54 2019 +0800

                禁用传值布尔型

            commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:28:50 2019 +0800

                修改标签归属、类型和性别不可改

            commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Wed Feb 13 16:22:22 2019 +0800

                单选标签修改

            commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Tue Feb 12 11:20:22 2019 +0800

                文本类型修改，单选类型修改未完

            commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 18:10:47 2019 +0800

                单选维护属性tag显示

            commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 17:35:26 2019 +0800

                输入框类型维护

            commit 082c91207349481dd5bbc13de511d46d212d83ea
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 16:37:36 2019 +0800

                单选维护bug修改

            commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Mon Feb 11 14:53:29 2019 +0800

                单选标签属性选项置灰

            commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
            Merge: 7b95e36 d8f8c68
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 10:04:46 2019 +0800

                Merge branch 'dev' into independentTag

            commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
            Merge: e2dd153 ba5e9e6
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sun Feb 3 09:48:48 2019 +0800

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

            commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Sat Feb 2 17:30:26 2019 +0800

                单选维护

            commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 17:57:41 2019 +0800

                独立标签

            commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
            Merge: 6568234 c1ca617
            Author: zhouna <zhouna@zjlantone.com>
            Date:   Fri Feb 1 15:29:27 2019 +0800

                Merge remote-tracking branch 'origin/depart' into independentTag

            commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
            Author: Luolei <16657115156@163.com>
            Date:   Fri Feb 1 10:12:44 2019 +0800

                bug修改

            commit c4b0acf690b308b061c567aaa3620bd02879ec29
            Merge: 34570c5 b77e984
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:17 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 34570c5385b33631c74c29db58d02faad21367b0
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 17:23:09 2019 +0800

                bug修改

            commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
            Merge: 93ce48b ba5e9e6
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:36:20 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:35:33 2019 +0800

                修改顶部标题样式

            commit 93ce48bda37148c865cb0b305a6e645f8418badd
            Merge: 148d49f db0659a
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:23:42 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit db0659aab84a70449bb5b5c61a9084463554b100
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:22:51 2019 +0800

                优化

            commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
            Merge: 3e9010f 60307c5
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:19:38 2019 +0800

                Merge branch 'dev2/zhangxc' into test

            commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:18:06 2019 +0800

                修改横铺统一（血压）为每个后面添加一个输入框

            commit 3e9010f66dc1ad911c37486615ea5423be2c9285
            Merge: 77d8884 f04c384
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:16:48 2019 +0800

                Merge branch 'dev2/luolei' into test

            commit f04c384d802839228bc2f74fb7dc65ede83a1775
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 15:15:12 2019 +0800

                互斥项

            commit 77d88846790cf2166999d602a6890d6ef4422190
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:06:13 2019 +0800

                修改左右箭头位置

            commit 714eba80c300c481857d0df5285a86944c4469e0
            Merge: 969688f 3fe9e97
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:58 2019 +0800

                Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

            commit 969688f82f0f869e5eafdc40263054c83cf0093d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 15:01:49 2019 +0800

                修改标签属性删除

            commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 14:34:44 2019 +0800

                保存忘打开了

            commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
            Merge: 58d39fc 3f48de8
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:55 2019 +0800

                Merge branch 'dev' into test

            commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
            Merge: bf43109 025ac3d
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:24:36 2019 +0800

                Merge branch 'dev2/zhangxc' into dev

            commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 13:22:17 2019 +0800

                修改操作池样式

            commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 13:18:04 2019 +0800

                去掉既往史下面的提示

            commit 2964171fec51793f979776c433cede0594777d96
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 11:13:21 2019 +0800

                修改性别清除标签明细

            commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:41:53 2019 +0800

                不区分单选多选

            commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:13:39 2019 +0800

                去掉弹窗

            commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
            Merge: e0ae7ed 393d9e4
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:23 2019 +0800

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

            commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
            Author: Luolei <16657115156@163.com>
            Date:   Thu Jan 31 10:11:13 2019 +0800

                添加参数，默认值修改

            commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
            Author: zhangxc <zhangxc@zjlantone.com>
            Date:   Thu Jan 31 09:53:55 2019 +0800

                修改样式

            # Conflicts:
            #	src/api/config.js
            #	src/api/icss.js
            #	src/api/utils.js
            #	src/components/icss/BloodPressTagGroup.vue
            #	src/components/icss/NoiseTemplate.vue
            #	src/components/icss/PubTagGroup.vue
            #	src/components/icss/PubTagPartDetail.vue
            #	src/components/icss/SymptomTagGroup.vue
            #	src/routes.js

        # Conflicts:
        #	src/components/icss/IndeptLabel.vue
        #	src/components/icss/LabelGroup.vue

    commit 4340f9c1e06625f368d3acf2c81f10797a50d74c
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 6 14:18:37 2019 +0800

        常见科室症状

    commit 0fe383a169541a4af26341a94dbdcca18026b9a9
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 6 13:33:31 2019 +0800

        标题修改

    commit 4c0d6ab1bdf57922ae75aa1a6a170afc085dc898
    Merge: 6dde00e f2ad245
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 6 11:15:37 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit f2ad24529f7716a96e6e01c57056343fcd516473
    Merge: e0223af 76dfc4f
    Author: Luolei <16657115156@163.com>
    Date:   Wed Mar 6 11:13:37 2019 +0800

        Merge branch 'dev2/zhangxc' into dev2/luolei

    commit 76dfc4fd7c7664af34654bd72bee0bf578af9ccd
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 6 11:12:15 2019 +0800

        修改标签组参数转换

    commit 365b676fb3adfb19828a6295b94527da158b0a56
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Mar 6 10:52:38 2019 +0800

        修改独立标签没有修改不能保存问题

    commit 6dde00e16e5f07d3e69e51de43aa99a56293ff4a
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 16:46:45 2019 +0800

        token失效问题

    commit 36d73051401858000de44211f71d931d0b061e6e
    Merge: 28fdc7d b1feaf1
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 11:10:10 2019 +0800

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

    commit b1feaf1f321edcd8d26aea2b20bae165151ab7c2
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 11:05:01 2019 +0800

        独立标签分页样式

    commit 28fdc7d0a8a2b49cbfdf379d3b5b8447c8025ad1
    Merge: 216dd81 28336ac
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 11:03:07 2019 +0800

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

    commit 28336ac7450ac9b1057ee467ea2166fb7b6e01ca
    Merge: db78e24 1c7e1b4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 10:59:41 2019 +0800

        merge from 'lcf'

    commit db78e24b427d92b0a8aa9d774deb2bad253912a7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 10:49:32 2019 +0800

        症状推送类样式修改

    commit 09a0e94857dab141bdc5740d74550a3daf4efaea
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 10:33:59 2019 +0800

        修改底部分页宽度

    commit 216dd81eaabdb52e0801671608c0fdb4e9e75200
    Merge: 7d489cf e0223af
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 10:28:44 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit e0223af7bb036a081b13b975dc5b1f0fba5d4733
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 10:26:04 2019 +0800

        去掉类型判断

    commit 7d489cfa185c3385c877ac2ecc86b32dd3b858a2
    Merge: 69f1559 3cb5b42
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 10:24:20 2019 +0800

        Merge branch 'dev' into dev2/zhangxc

    commit 69f1559ade6bf6636f5a43077203897d9e7c7d38
    Merge: b232857 0e7f672
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 10:22:12 2019 +0800

        Merge branch 'dev2/luolei' into dev2/zhangxc

    commit b2328579f94768eaca1a20191733639b07343235
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Mar 5 09:49:21 2019 +0800

        底部分页添加最小宽度

    commit 3cb5b426e5a671d331c29e15062eeffbcb2ec8ea
    Merge: 51c17f1 0e7f672
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 09:39:54 2019 +0800

        Merge branch 'dev2/luolei' into dev

    commit 51c17f117d137e82c82a0883d546e17063a1a180
    Author: Luolei <16657115156@163.com>
    Date:   Tue Mar 5 09:39:39 2019 +0800

        富文本编辑依赖添加

    commit 32ff97af416239ea70ca68cd60edd0dcdd1f659b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 16:33:14 2019 +0800

        修改操作界面样式

    commit 457d83209b5c780554eeee8accf88e4c1630394a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 16:16:44 2019 +0800

        症状推送添加标签标识

    commit 98a4e0135a012f95d6f1604b3030e3197d29acc7
    Merge: bfdb2a4 de516f0
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 13:09:42 2019 +0800

        Merge branch 'test' into dev2/zhangxc

    commit bfdb2a4fb1a75176a10d8fb20f500a1ea638c3d4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Mar 4 10:34:54 2019 +0800

        症状推送有内容显示状态

    commit 0e7f6729f0207ca2db7135dd4f4570aef9e30b74
    Author: Luolei <16657115156@163.com>
    Date:   Mon Mar 4 09:25:40 2019 +0800

        删除console

    commit 9d5e136b249f446288db7f42347d829ff995c901
    Merge: 5aa2bdc 83920a9
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 17:57:05 2019 +0800

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

    commit 83920a95b2a26706470d5effd09e14dc60aec472
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 17:52:56 2019 +0800

        报错问题

    commit 5aa2bdc4772a121a8f95796d287a6144aba0849a
    Merge: e1b7e26 73440ab
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 17:33:02 2019 +0800

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

    commit e1b7e2694cf8c386d3964ea9e0230d3983deb805
    Merge: 163e4c9 de516f0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Mar 1 17:32:42 2019 +0800

        Merge branch 'test' into dev

        # Conflicts:
        #	src/api/icss.js

    commit 73440abf636577fda0d05524180791434ca727b7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 17:03:31 2019 +0800

        症状推送

    commit de516f030d664bb82787ae5a35f68515237ab4c4
    Merge: 4c3985a aebb7f7
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 16:39:30 2019 +0800

        Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

    commit 4c3985ae9ebe589d36c352b579501681f060b795
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 16:19:02 2019 +0800

        限制调用时机

    commit f0d48657fba60ba4fd72c031b8368b7c67efc619
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 16:15:33 2019 +0800

        noIds添加判断

    commit 7822c027d53e42610d9c00a7a6cc7f6277fd940d
    Merge: 8324bf6 f9a0af3
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 15:43:24 2019 +0800

        Merge branch 'dev2/luolei' into dev2/zhangxc

    commit 8324bf6701f684f38e1fe3c906d2e10b27b20318
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 15:42:41 2019 +0800

        症状推送（未完成）

    commit f9a0af3b869f1e84296e4630293ae99532e35155
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 15:40:56 2019 +0800

        合并问题

    commit aad93151bf13fb20e8b732369d05452e62d05c17
    Merge: f61ed45 cad991f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 15:08:39 2019 +0800

        merge from 'luolei'

    commit f61ed45412bf0650f1eca8616018dbb5e5dad14f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Mar 1 15:01:33 2019 +0800

        症状推送及其修改（未完成）

    commit aebb7f75c35177143468f1c70c43738de296363e
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 14:32:58 2019 +0800

        多次调用问题解决

    commit cad991f7ef1b6740b8abc6e2fbd7a907471732b4
    Author: Luolei <16657115156@163.com>
    Date:   Fri Mar 1 09:40:18 2019 +0800

        修改完成，参数统一配置

    commit 163e4c98b7bf96e2c8e8f9369c2069c9f337c13e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 20:20:45 2019 +0800

        配置项修改

    commit 3992819f3cbccf6d8950af1db46f1c562ee7b700
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Thu Feb 28 20:09:38 2019 +0800

        添加富文本编辑器

    commit 14e739f9bc8d1064667f92622dc0fb7dd2597713
    Author: Luolei <16657115156@163.com>
    Date:   Thu Feb 28 16:03:58 2019 +0800

        标签组修改

    commit 78b130de9259175f18e1c2e06a61188c35ddb864
    Author: Luolei <16657115156@163.com>
    Date:   Wed Feb 27 15:08:40 2019 +0800

        判断有误

    commit fb3b8a9db8ad25b276585bf1994d36aea26d1d7c
    Merge: 77a9c8c a0b68ed
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 27 14:47:20 2019 +0800

        merge from 'dev2/luolei'

    commit 77a9c8c7c09e2981265d35abc5425484d9519783
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Wed Feb 27 14:41:59 2019 +0800

        标签组修改（血压和症状）

    commit a0b68ed4950b1a6fa297aa3828229e7561631978
    Author: Luolei <16657115156@163.com>
    Date:   Wed Feb 27 14:40:44 2019 +0800

        修改

    commit 7e1c8ed574b9c38f7f0385f0d1a8b551e7225ba0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 26 20:25:47 2019 +0800

        提示信息维护

    commit ee26bc4f4c3451b75130f73fc3049bfee0a70d08
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Tue Feb 26 09:51:54 2019 +0800

        标签组修改标签组公共数据部分

    commit 1b15b11ac6e8fe8b00ebd8a33f275539108bf5e5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 25 15:37:03 2019 +0800

        初始化时填写单类型赋值

    commit 9f1ce7bb11dbee76ddee677fca2710ef9f50bf9a
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 25 15:36:02 2019 +0800

        删除联合推送标签明细项

    commit f4dd8ed9ab6b249a970e9552f73233955e475bf7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 25 14:34:32 2019 +0800

        标签组添加限制条件

    commit 6d4dc57bfb9537ec7f37d09e6883458ff15eccfe
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Feb 22 15:08:17 2019 +0800

        修改归属,填写单类型,性别,标签明细重置

    commit 061de293c240f35ad7e82056d57d846c8f3cb531
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Feb 22 13:57:28 2019 +0800

        修改归属为化验类别为多选时标签显示

    commit 479a87035c1997213f6ec710cd8fa4ddd647d7a6
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Fri Feb 22 10:57:15 2019 +0800

        化验和多选框

    commit a4724d13390450886b82d650e703095dada8a401
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Feb 21 11:08:15 2019 +0800

        修改标签类型和归属显示名称

    commit b448a51594240b8b0da025ee9a823c4577e2d18a
    Merge: 0b52ec6 db7e04f
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 18 17:15:00 2019 +0800

        Merge branch 'test' into dev2/zhangxc

    commit db7e04f1441269684f4d3d9d93e2df81a77ba69a
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 18 13:08:58 2019 +0800

        和单标签

    commit 0b52ec6854995f8e3caee14237cac15bacfdd6b4
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 18 10:30:59 2019 +0800

        修改bug

    commit 56c4f223af587c04ae70c4d01b6c11cb480be35b
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 18 10:30:39 2019 +0800

        修改标签池标签名称样式

    commit 3663d6490026fc3f4fab92f3966dec703705a017
    Merge: 7aec89a 43e196f
    Author: Luolei <16657115156@163.com>
    Date:   Mon Feb 18 10:13:29 2019 +0800

        Merge branch 'dev2/luolei' into independentTag

    commit a589a6dedb9ef0c9ebf6edfa9b09b44e98fd33ef
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Mon Feb 18 10:08:57 2019 +0800

        修改标签名称样式

    commit 43e196ffb1e3a0cc0085f330794ebf423a0a2c6b
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 15 17:26:43 2019 +0800

        bug修改

    commit 7aec89ad1af7201574105b99f0636c44e91a69e2
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 13 16:32:54 2019 +0800

        禁用传值布尔型

    commit 66fc0760cfcd217eba0577f8bfe2e68f3998448b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 13 16:28:50 2019 +0800

        修改标签归属、类型和性别不可改

    commit 85d3a2321a8fbf021d3c8dd0185944dd1b8b4fd8
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed Feb 13 16:22:22 2019 +0800

        单选标签修改

    commit be7cbda8c07e9408ad26925b7cd6115fe5c3070e
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Tue Feb 12 11:20:22 2019 +0800

        文本类型修改，单选类型修改未完

    commit 2eb59396d0ba2af2245c2655ee3f9c0880f3ea79
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 11 18:10:47 2019 +0800

        单选维护属性tag显示

    commit 0321a75eab8f276a9d3ec826bd2dcc8f635902e0
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 11 17:35:26 2019 +0800

        输入框类型维护

    commit 082c91207349481dd5bbc13de511d46d212d83ea
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 11 16:37:36 2019 +0800

        单选维护bug修改

    commit 6e9b2f35040b7f082ba078cdab9634b6b2b9f6cf
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Mon Feb 11 14:53:29 2019 +0800

        单选标签属性选项置灰

    commit e344e25fd4fdfebf07d172e0e91cf35ad1b1835b
    Merge: 7b95e36 d8f8c68
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Sun Feb 3 10:04:46 2019 +0800

        Merge branch 'dev' into independentTag

    commit d8f8c684797c688a85bdb6c5d50f54765e0d6cd4
    Merge: e2dd153 ba5e9e6
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Sun Feb 3 09:48:48 2019 +0800

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

    commit e2dd1536cc4df81687c2f3634b7fb6582eba3ffe
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Sat Feb 2 17:30:26 2019 +0800

        单选维护

    commit 6eb57b7e5ccefc107775d6e9d7677deb50d3342b
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 1 17:57:41 2019 +0800

        独立标签

    commit 7b95e36f5bd527c1e23d3ff62b66184bb42b3743
    Merge: 6568234 c1ca617
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Fri Feb 1 15:29:27 2019 +0800

        Merge remote-tracking branch 'origin/depart' into independentTag

    commit 1cd9412ecd0d8cd09c694fdf238507017ec7d06b
    Author: Luolei <16657115156@163.com>
    Date:   Fri Feb 1 10:12:44 2019 +0800

        bug修改

    commit c4b0acf690b308b061c567aaa3620bd02879ec29
    Merge: 34570c5 b77e984
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 17:23:17 2019 +0800

        Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

    commit 34570c5385b33631c74c29db58d02faad21367b0
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 17:23:09 2019 +0800

        bug修改

    commit b77e984deaa7675a0364c1248f2b38b4d9ce76b0
    Merge: 93ce48b ba5e9e6
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:36:20 2019 +0800

        Merge branch 'dev2/zhangxc' into test

    commit ba5e9e68617c1696e27de52e6deb48b39b47c9af
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:35:33 2019 +0800

        修改顶部标题样式

    commit 93ce48bda37148c865cb0b305a6e645f8418badd
    Merge: 148d49f db0659a
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 15:23:42 2019 +0800

        Merge branch 'dev2/luolei' into test

    commit db0659aab84a70449bb5b5c61a9084463554b100
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 15:22:51 2019 +0800

        优化

    commit 148d49f1e88af00f186b116c3ec8a8defeabeb3c
    Merge: 3e9010f 60307c5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:19:38 2019 +0800

        Merge branch 'dev2/zhangxc' into test

    commit 60307c58ad8b6f06092ce19d0550c31b7c89c60d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:18:06 2019 +0800

        修改横铺统一（血压）为每个后面添加一个输入框

    commit 3e9010f66dc1ad911c37486615ea5423be2c9285
    Merge: 77d8884 f04c384
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 15:16:48 2019 +0800

        Merge branch 'dev2/luolei' into test

    commit f04c384d802839228bc2f74fb7dc65ede83a1775
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 15:15:12 2019 +0800

        互斥项

    commit 77d88846790cf2166999d602a6890d6ef4422190
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:06:13 2019 +0800

        修改左右箭头位置

    commit 714eba80c300c481857d0df5285a86944c4469e0
    Merge: 969688f 3fe9e97
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:01:58 2019 +0800

        Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

    commit 969688f82f0f869e5eafdc40263054c83cf0093d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 15:01:49 2019 +0800

        修改标签属性删除

    commit 3fe9e97cc952b42e09c6564fa5ccf9fccf060501
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 14:34:44 2019 +0800

        保存忘打开了

    commit 6568234d9e55ae3d7b0de1c6739d8627ded2e14a
    Merge: 58d39fc 3f48de8
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 13:24:55 2019 +0800

        Merge branch 'dev' into test

    commit 3f48de89a4a27030ce0315be08d7afde6ec2a4b8
    Merge: bf43109 025ac3d
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 13:24:36 2019 +0800

        Merge branch 'dev2/zhangxc' into dev

    commit 025ac3d1380cd268e40ce856f873f1b92c27c9f7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 13:22:17 2019 +0800

        修改操作池样式

    commit 58d39fcdde20bc640cae05942b8eaea3a4e9f4b6
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 13:18:04 2019 +0800

        去掉既往史下面的提示

    commit 2964171fec51793f979776c433cede0594777d96
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 11:13:21 2019 +0800

        修改性别清除标签明细

    commit bf43109c5f7a9da797f3256e5dcd178b1cb2c437
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 10:41:53 2019 +0800

        不区分单选多选

    commit 775e19e7edca1934ede0f43f42116bcefe29f5c6
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 10:13:39 2019 +0800

        去掉弹窗

    commit cdd3894959797fd53fa8fb26bf46e1d886d2d177
    Merge: e0ae7ed 393d9e4
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 10:11:23 2019 +0800

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

    commit e0ae7ed97452c8e17f9517ab4b466daccdecab1e
    Author: Luolei <16657115156@163.com>
    Date:   Thu Jan 31 10:11:13 2019 +0800

        添加参数，默认值修改

    commit 393d9e47dbbcc5293b3cb96f11024f30678fcaa7
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu Jan 31 09:53:55 2019 +0800

        修改样式

    # Conflicts:
    #	src/api/config.js
    #	src/api/icss.js
    #	src/components/icss/AddDisclInfo.vue
    #	src/less/admin.less
    #	src/routes.js

commit 7502372e1c25af3f53fcd073d06b29dd219b9796
Author: liucf <liucf@zjlantone.com>
Date:   Tue Mar 19 13:54:54 2019 +0800

    医学术语命名维护-列表和查询接口调试

# Conflicts:
#	src/api/config.js
#	src/api/icss.js
liucf 6 vuotta sitten
vanhempi
a39882fb59
commit
a4decccbcf
6 muutettua tiedostoa jossa 111 lisäystä ja 52 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 8 2
      src/api/config.js
  2. 10 0
      src/api/icss.js
  3. 40 31
      src/components/icss/AddMedicalName.vue
  4. 1 1
      src/components/icss/AddSimilarName.vue
  5. 51 17
      src/components/icss/MedicalName.vue
  6. 1 1
      src/routes.js

+ 8 - 2
src/api/config.js
Näytä tiedosto 

@@ -104,7 +104,8 @@ export default {
 
     'delSimilarName': 'api/icssman/retrieval/delRetrievalsByQuesId', //别名维护-删除
 
     'similarNameDetl': 'api/icssman/retrieval/getRetrievalsByTag', //别名维护-详情
 
     'addSimilarName': 'api/icssman/retrieval/addTagRetrieval', //别名维护-添加、修改
 
-    'searchLable': 'api/icssman/questionInfo/index', //标签检索
 
+    // 'searchLable': 'api/icssman/questionInfo/index', //标签检索
 
+    'searchLable': 'api/icssman/questionInfo/indexRev', //标签检索--过滤别名?
 
     'uploadFile': 'api/icssman/retrieval/retrievalExcelIm', //别名维护-导入
 
     'commonSymptomList': 'api/icssman/questionUsual/getDeptInfos', //常见症状维护-常见症状列表
 
     'getDepartmentList':'api/icssman/questionUsual/getDeptName', //常见症状维护-科室列表
 
@@ -142,8 +143,13 @@ export default {
 
     'addVersionInfo': 'api/icssman/versionDetail/addVersionDetails', //版本信息-添加版本说明
 
     'modiVersionInfo': 'api/icssman/versionDetail/updateVersionDetails', //版本信息-修改版本说明
 
     'getVersionDetlInfo': 'api/icssman/versionDetail/getDetailById', //版本信息-版本说明列表获取
 
-    'saveConceptInfo':'/api/knowledgeman/Knowledge/upsertConceptKnowledge',   //保存术语静态知识
 
+    /**************医学术语维护****************/
 
+	'saveConceptInfo':'/api/knowledgeman/Knowledge/upsertConceptKnowledge',   //保存术语静态知识
 
     'delConceptInfo':'/api/knowledgeman/Knowledge/removeConceptKnowledge',   //删除术语静态知识
 
+    // 'knowledgeName': 'api/knowledgeman/medical/getAllMedicalInfo', //医学术语--命名维护
 
+    'knowledgeName': 'api/knowledgeman/concept/getAllInformation', //医学术语--命名维护
 
+    'knowledgeUpload': 'api/knowledgeman/concept/importTermExcel', //医学术语--命名维护-导入
 
+    'allKnowledgeType': 'api/knowledgeman/type/getAllType', //医学术语--类型列表
 
 	},
 
 	menuIconList: { //菜单对应图标
 
 		'YH-KZT': 'el-icon-menu',

+ 10 - 0
src/api/icss.js
Näytä tiedosto 

@@ -213,4 +213,14 @@ export default {
 
     getVersionDetlInfo(param) {//版本信息-版本说明列表
 
       return axios.post(urls.getVersionDetlInfo, param)
 
     },
 
+    // 医学术语维护
 
+    knowledgeName(param) {//命名维护
 
+        return axios.post(urls.knowledgeName, param)
 
+    },
 
+    allKnowledgeType(param) {//命名维护
 
+        return axios.post(urls.allKnowledgeType, param)
 
+    },
 
+    knowledgeUpload(param) {//命名维护--导入
 
+        return axios.post(urls.knowledgeUpload, param)
 
+    },
 
 }

+ 40 - 31
src/components/icss/AddMedicalName.vue
Näytä tiedosto 

@@ -15,20 +15,21 @@
 
           <tr>
 
             <td class="ind">1</td>
 
             <td>
 
-              <el-input v-model="data.name" placeholder="请输入术语" maxlength="30"></el-input>
 
+              <el-input v-model="data.name" placeholder="请输入术语" maxlength="30" size="small"></el-input>
 
             </td>
 
             <td>
 
-              <el-select v-model="data.type" clearable placeholder="请选择">
 
+              <el-select v-if="!id" v-model="data.type" filterable placeholder="请选择" size="small">
 
                 <el-option
 
-                  v-for="item in data.typeList"
 
-                  :key="item.key"
 
+                  v-for="item in typeList"
 
+                  :key="item.id"
 
                   :label="item.name"
 
-                  :value="item.key">
 
+                  :value="item.name">
 
                 </el-option>
 
               </el-select>
 
+              <span v-else>{{data.type}}</span>
 
             </td>
 
             <td class="desc">
 
-              <el-input v-model="data.mark" placeholder="请输入术语说明" maxlength="120"></el-input>
 
+              <el-input v-model="data.mark" placeholder="请输入术语说明" maxlength="120" size="small"></el-input>
 
             </td>
 
           </tr>
 
         </table>
 
@@ -44,23 +45,24 @@
 
           <tr v-for="(item,index) in synonymous">
 
             <td class="ind">{{index+1}}</td>
 
             <td>
 
-              <el-input v-model="item.term" placeholder="请输入术语" maxlength="30"></el-input>
 
+              <el-input v-model="item.term" placeholder="请输入术语" maxlength="30" size="small"></el-input>
 
             </td>
 
             <td>
 
-              <el-select v-model="item.type" clearable placeholder="请选择">
 
+              <!-- <el-select v-model="item.type" clearable placeholder="请选择">
 
                 <el-option
 
                   v-for="item in data.typeList"
 
                   :key="item.key"
 
                   :label="item.name"
 
                   :value="item.key">
 
                 </el-option>
 
-              </el-select>
 
+              </el-select> -->
 
+              {{data.type}}
 
             </td>
 
             <td class="desc">
 
-              <el-input v-model="item.mark" placeholder="请输入术语说明" maxlength="120"></el-input>
 
+              <el-input v-model="item.mark" placeholder="请输入术语说明" maxlength="120" size="small"></el-input>
 
             </td>
 
             <td v-if="id">
 
-              <span @click="deleLine(index)">删除</span>
 
+              <span @click="deleLine(index)" class="delete">删除</span>
 
             </td>
 
           </tr>
 
           <tr @click="addSpan">
 
@@ -78,6 +80,7 @@
 
   </div>
 
 </template>
 
 <script type="text/javascript">
 
+import api from '@api/icss.js';
 
   export default {
 
     name:'AddMedicalName',
 
     data(){
 
@@ -87,25 +90,9 @@
 
           name:'',
 
           type:'',
 
           mark:'', 
-          type:'',
 
-          typeList:[
 
-            {
 
-              name:'类型1',
 
-              id:1,
 
-              key:1
 
-            },
 
-            {
 
-              name:'类型2',
 
-              id:2,
 
-              key:2
 
-            },
 
-            {
 
-              name:'类型3',
 
-              id:3,
 
-              key:3
 
-            },
 
-          ]
 
+          type:''
 
         },
 
+        typeList:[],
 
         id:null,
 
         synonymous:[//同义词
 
             {
 
@@ -127,18 +114,40 @@
 
               mark:''
 
             },
 
           ],
 
-        colspan:4
 
+        colspan:4,
 
+        currentPage:1,
 
+        pageSize:10
 
       }
 
     },
 
     created(){
 
+      this.getTypeList();
 
       const info = this.$route.params.info;
 
       if(info){
 
         this.minTitle = '医学术语命名维护-修改';
 
         this.id = info.id;
 
+        this.data.name = info.name;
 
+        this.data.type = info.type;
 
+        this.data.remark = info.remark;
 
         this.colspan = 5;
 
       }
 
     },
 
     methods:{
 
+      getTypeList(){
 
+        const param = {
 
+          current: this.currentPage,
 
+          size: this.pageSize
 
+        }
 
+        api.allKnowledgeType(param).then((res)=>{
 
+          const data = res.data;
 
+          if(data.code==0){
 
+            this.typeList = data.data.records;
 
+          }else{
 
+            console.log(res.msg);
 
+          }
 
+        }).catch((error) => {
 
+          console.log(error);
 
+        });
 
+      },
 
       handleInput(){//限制输入类型
 
 
       },
 
@@ -157,7 +166,7 @@
 
       },
 
       deleLine(index){
 
         this.synonymous.splice(index,1);
 
-        console.log(123,index,this.synonymous);
 
+        // console.log(123,index,this.synonymous);
 
       },
 
       comfirn(){

+ 1 - 1
src/components/icss/AddSimilarName.vue
Näytä tiedosto 

@@ -217,7 +217,7 @@
 
             this.$router.push({path:'LT-YXSJWH-BMWH'});
 
           }else{
 
             // console.log(result.msg);
 
-            this.$message.error("请选择标签");
 
+            this.$message.error("标签和拼音不能为空");
 
           }
 
         })
 
       },

+ 51 - 17
src/components/icss/MedicalName.vue
Näytä tiedosto 

@@ -3,7 +3,17 @@
 
         <crumbs title="医学术语命名维护">
 
             <el-form :inline="true" class="demo-form-inline">
 
                 <el-form-item label="术语：">
 
-                    <el-input size="mini" v-model="filter.proName" placeholder="输入术语"></el-input>
 
+                    <el-input size="mini" v-model="filter.term" placeholder="输入术语"></el-input>
 
+                </el-form-item>
 
+                <el-form-item label="术语类型：">
 
+                  <el-select v-model="filter.type" clearable filterable placeholder="请选择" size="mini">
 
+                    <el-option
 
+                      v-for="item in typeList"
 
+                      :key="item.id"
 
+                      :label="item.name"
 
+                      :value="item.name">
 
+                    </el-option>
 
+                  </el-select>
 
                 </el-form-item>
 
                 <el-form-item>
 
                     <el-button size="mini" @click="filterDatas">确认</el-button>
 
@@ -26,22 +36,22 @@
 
                         width="60">
 
                 </el-table-column>
 
                 <el-table-column
 
-                        prop="gmtOperate"
 
+                        prop="gmtCreated"
 
                         label="操作时间"
 
                         :show-overflow-tooltip="true">
 
                 </el-table-column>
 
                 <el-table-column
 
-                        prop="questionName"
 
+                        prop="name"
 
                         label="医学标准术语"
 
                         show-overflow-tooltip>
 
                 </el-table-column>
 
                 <el-table-column
 
-                        prop="retrievalSelfName"
 
+                        prop="synonymous"
 
                         label="其他术语"
 
                         show-overflow-tooltip>
 
                 </el-table-column>
 
                 <el-table-column
 
-                        prop="operatorName"
 
+                        prop="modifier"
 
                         label="操作人">
 
                 </el-table-column>
 
                 
@@ -79,19 +89,22 @@
 
         pageSize: 10,
 
         total: 0,
 
         filter: {
 
-          proName: ''
 
-        }
 
+          term:'',
 
+          type:''
 
+        },
 
+        typeList:[]
 
       }
 
     },
 
     created() {
 
       this.getDataList();
 
+      this.getTypeList();
 
     },
 
     methods: {
 
       toEditProduct(row){
 
-        // this.$router.push({
 
-        //   name:'AddSimilarName',
 
-        //   params: {id:row.questionId,name:row.questionName}
 
-        // })
 
+        this.$router.push({
 
+          name:'AddMedicalName',
 
+          params: {info:row}
 
+        })
 
       },
 
       filterDatas(){
 
         this.currentPage = 1;
 
@@ -99,7 +112,11 @@
 
       },
 
       getDataList() {
 
         const param = this.getFilterItems();
 
-        /*api.similarName(param).then((res) => {
 
+        // const param = {
 
+        //   current: this.currentPage,
 
+        //   size: this.pageSize
 
+        // }
 
+        api.knowledgeName(param).then((res) => {
 
           if (res.data.code == '0') {
 
             const data = res.data.data;
 
             this.list = data.records;
 
@@ -108,7 +125,23 @@
 
           }
 
         }).catch((error) => {
 
           console.log(error);
 
-        });*/
 
+        });
 
+      },
 
+      getTypeList(){
 
+        const param = {
 
+          current: this.currentPage,
 
+          size: this.pageSize
 
+        }
 
+        api.allKnowledgeType(param).then((res)=>{
 
+          const data = res.data;
 
+          if(data.code==0){
 
+            this.typeList = data.data.records;
 
+          }else{
 
+            console.log(res.msg);
 
+          }
 
+        }).catch((error) => {
 
+          console.log(error);
 
+        });
 
       },
 
       getDetailList(id) {
 
         const param = {'id': id,};
 
@@ -116,9 +149,10 @@
 
       },
 
       getFilterItems() {
 
         const param = {
 
-          questionName: this.filter.proName,
 
+          term: this.filter.term,
 
           current: this.currentPage,
 
-          size: this.pageSize
 
+          size: this.pageSize,
 
+          type:this.filter.type
 
         };
 
         return param;
 
       },
 
@@ -177,7 +211,7 @@
 
             'Content-Type': 'multipart/form-data'
 
           }
 
         }
 
-        api.uploadFile(formData,header).then((res)=>{
 
+        /*api.knowledgeUpload(formData,header).then((res)=>{
 
           if(res.data.code==0){
 
             this.$message({
 
               message: '上传成功',
 
@@ -188,7 +222,7 @@
 
           }
 
         })
 
         this.getDataList();
 
-        /*//解决上传相同文件不触发change
 
+        //解决上传相同文件不触发change
 
         let inp = document.getElementById("upFile");
 
         inp.value = "";
 
         */

+ 1 - 1
src/routes.js
Näytä tiedosto 

@@ -166,7 +166,6 @@ export default [
 
       {path:'LT-YXSJWH-DLLXBQWH',component:IndeptLabel,name:'IndeptLabel'},     //独立标签维护--详情
 
       {path:'LT-YXSJWH-TJDLBQ',component:AddIndeptLabel,name:'AddIndeptLabel'},     //独立标签维护--添加
 
       {path:'LT-YXSJWH-TSXXWH',component:PromptInfo,name:'PromptInfo'},         //提示信息维护
 
-      {path:'LT-YXSJWH-TJTSXX',component:AddPromptInfo,name:'AddPromptInfo'},         //提示信息维护
 
 	    {path:'LT-YXSJWH-BMWH',component:SimilarName,name:'SimilarName'},     //别名维护
 
       {path:'LT-YXSJWH-CJZZWH',component:CommonSymptom,name:'CommonSymptom'},  //常见症状维护
 
       {path:'LT-YXSJWH-TJCJZZ',component:AddCommonSymptom,name:'AddCommonSymptom'},  //常见症状维护--添加
 
@@ -178,6 +177,7 @@ export default [
 
       {path:'LT-YXSJWH-CTBQWH',component:PhysicalExamTemplate,name:'PhysicalExamTemplate'},     //查体模板维护
 
       {path:'LT-YXSJWH-TJCTMB',component:AddPhysicalExamTemp,name:'AddPhysicalExamTemp'},     //查体模板维护
 
       {path:'LT-YXSJWH-TJMBWH',component:TemplateMaintenanceWrap,name:'TemplateMaintenanceWrap'},     //模板维护-添加修改
 
+      {path:'LT-YXSJWH-TJTSXX',component:AddPromptInfo,name:'AddPromptInfo'},         //提示信息维护-添加
 
       {path:'LT-YXSJWH-TSXXXQ',component:PromptDetail,name:'PromptDetail'},         //提示信息维护详情
 
       {path:'LT-YXSYKWH-YXSYJTZSWH',component:MedicinePrompt,name:'MedicinePrompt'},         //医学术语提示信息维护
 
       {path:'LT-YXSYKWH-TJYXSYJTZS',component:AddMedicinePrompt,name:'AddMedicinePrompt'},         //医学术语提示信息维护添加