Merge branch 'bugfix' into test

# Conflicts:
#	src/components/preTreat/PubIndeptQa.vue

src/components/preTreat/PubSelect.vue

@@ -323,7 +323,7 @@ export default {
         tagName: this.searchVal.trim(),
         type: this.ascription,
         notIds: [],
-        notControlType: [], //组合填写单或非诊疗情况模版不能添加图片上传
+        notControlType: ['8'], //组合填写单或非诊疗情况模版不能添加图片上传
         sexType: this.sexType,
         tagType: ["1"] //qaType=2:组合填写单，qaType=3模板
       };