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

src/components/icss/AddCommonSymptom.vue

@@ -158,7 +158,8 @@
                 "deptId": this.form.department,
                 "tagName": this.searchVal,
                 "noIds": noIds,
-                "type": this.form.type
+                "type": this.form.type,
+                "notTagType": [8],
             }
             api.getSymptomList(param).then((res)=>{
                if(res.data.code === '0') {

src/components/icss/AddPhysicalExamTemp.vue

@@ -149,6 +149,7 @@
                 "tagName": this.searchVal,
                 "type": 4,
                 "notIds": notIds,
+                "notTagType": [8],
             }
             api.searchTagList(param).then((res) => {
                 if (res.data.code === '0') {

src/components/icss/PubIndeptTag.vue

@@ -178,7 +178,7 @@
                     label="正常值范围："
                     class="fix-inp"
                     prop="region13"
-                    v-if="form.region1==5 && form.region2==6"
+                    v-if="form.region1==5 && form.region2==6 || form.region2==7"
             >
                 <el-col :span="7">
                 <el-input v-model="form.minNormalVal"
@@ -278,6 +278,9 @@
           ],
           region9: [
             { required: true, message: '请输入最大年龄', trigger: 'change' }
+          ],
+           region13: [
+            { required: true, message: '请输入正常值范围', trigger: 'change' }
           ]
         },
         tmpSex: '通用',