Squashed commit of the following:

commit 647ce4ade2771c188de099dbc2153a67cf48344c
Author: liucf <liucf@zjlantone.com>
Date:   Thu Sep 26 17:26:38 2019 +0800

    bug2381

commit 427fa99523b358164ed4eecbf12722f7323f9c09
Merge: 1213d80 3c52f12
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Sep 23 16:46:40 2019 +0800

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

commit 1213d8059ec6cac459f6b0fc177fdef7ee3106a3
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Sep 23 16:45:54 2019 +0800

    回滚化验大小项和公表项维护新需求

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

src/components/icss/AddMedicalName.vue

@@ -347,7 +347,7 @@ import pinyin from '../../js/Convert_Pinyin.js';
               this.minAge = result.data.minAge;
               const type = result.data.type;
               if(type == '诊断'){
-                this.dioType = result.data.classify; //类型
+                this.dioType = result.data.classify || "Ⅰ"; //类型，默认展示Ⅰ类
                 const deptConptId = result.data.deptId;
                 this.getDioType(true);
                 this.getDdeptList(deptConptId);