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

src/components/preTreat/PubIndeptQa.vue

@@ -108,7 +108,7 @@
                 </span>
                 <span
                  class = "flagBox"
-                  v-if="qaType =='1' &&form.region1=='1'&&form.region2=='1'"
+                  v-if="qaType =='1' &&form.region1=='1'&&form.region2=='9'"
                 >
                    <el-checkbox v-model="form.specFlag" label="拼接到主诉" true-label="1" false-label="0"  @change="sendData"></el-checkbox>
                 </span>