Squashed commit of the following:

commit 7fbce7629539ffc23eabf79c9e3e78f2e61122f6
Author: liucf <liucf@zjlantone.com>
Date:   Mon Jun 10 14:41:50 2019 +0800

    术语命名维护，年龄为空提示优化

commit d64d3d02d247b9184d63c8486dc0b639949d8152
Author: liucf <liucf@zjlantone.com>
Date:   Thu Jun 6 15:10:05 2019 +0800

    术语命名维护年龄限制优化

commit 3d2950c164049aaa1edec12ed91a395789e0a102
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jun 5 12:16:25 2019 +0800

    合并dev分支

commit 62170106f2a459be51b4391abc7b8b3377df6cba
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jun 5 11:31:20 2019 +0800

    修改版本信息和术语命名维护的bug

commit 6c05a82539bb73f799f0068fe23824ff830f7775
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 28 15:57:47 2019 +0800

    合并dev分支

commit ff6aa028f1cbab847dfd7c0d4f0cc183efbb06db
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 24 17:07:30 2019 +0800

    合并dev分支

commit 6c083881b7554b3ad9b835cf695f7324f634030d
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 24 16:54:19 2019 +0800

    慢病指标值只能输入数字修改

commit e575cad7462b444170c12908aa9c48fb7ec2437a
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 22 11:11:49 2019 +0800

    慢病指标值关联维护不可输入负数1068

commit de8455b86c106eaf74168e08cc28a4c2acece420
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 22 10:10:49 2019 +0800

    合并dev分支

commit 2783ddd9504d11df0fd778ce8879af4ad67ab97c
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 21 17:33:52 2019 +0800

    术语关联维护去掉状态

commit 83dda5a82d73bee22a5853df59de64e89297d505
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 21 10:23:35 2019 +0800

    合并dev分支

commit d74975f1371e7c81f3bf2e6a5bc13cf4958967cf
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 20 15:43:47 2019 +0800

    输入限制；搜索去重；添加类型

commit f041b11e2915b7cbd0bed54a522957df996f7025
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 17 15:50:20 2019 +0800

    合并dev分支

commit f22d1696ff132969ad0ca4ed65e5990a8ce7c09c
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 17 15:08:04 2019 +0800

    化验子项和术语关联维护联调完成

commit 4e0ca46985b6835a252cde585e928b570e011d7a
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 15 16:53:37 2019 +0800

    医学术语枚举获取；免责声明接口调整

commit 3522504bbf0b0184581dddf0a0a5df825a150d18
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 15 10:33:39 2019 +0800

    化验子项，术语关联维护

commit 169e6da63ea0da5047c3eab6bab8646917c1013e
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 10:06:38 2019 +0800

    合并dev分支

commit 42d9caa7ccf59a8620a7978219f85addf90b6088
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 10:02:21 2019 +0800

    修改文案

commit 1c888406cf9074c8306750347cf8418fba1db0b4
Author: liucf <liucf@zjlantone.com>
Date:   Mon May 13 17:16:57 2019 +0800

    合并dev分支

commit cef77de3efd6a8a94d354ee68981bce29880dc41
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 8 15:55:24 2019 +0800

    合并

commit 0e4c4baade1f149d57a0073f6709064344221587
Author: liucf <liucf@zjlantone.com>
Date:   Tue Apr 23 16:54:19 2019 +0800

    添加别名页面归属处理

# Conflicts:
#	src/components/icss/AddMedicalName.vue

src/components/icss/AddMedicalName.vue

@@ -405,10 +405,10 @@ import pinyin from '../../js/Convert_Pinyin.js';
         }
         // 年龄为必填项--2019-6-5需求
         if(this.showMore == 1){
-          /*if(!this.minAge && this.minAge != 0 || !this.maxAge){
+          if(!this.minAge && this.minAge != 0 || !this.maxAge){
             this.warning('年龄不能为空，区间为0-200');
             return
-          }*/
+          }
           if(this.minAge < 0 || this.minAge > 200 || this.maxAge < 0 || this.maxAge > 200){
             this.warning('年龄必须是0-200');
             return