Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/hospitalStation/template/printFive.vue

@@ -269,10 +269,11 @@ export default {
      },
 
      getDiagnosis(id){
+        let arr = id.split(',')
         var name = ""
         for(let i=0;i<this.diagnoses.length;i++){
-          if(id == this.diagnoses[i].id){
-             name = this.diagnoses[i].class_name
+          if(arr.indexOf(String(this.diagnoses[i].id)) > -1){
+             name += this.diagnoses[i].class_name + ' '
           }
         }
         return name

src/xt_pages/outpatientDoctorStation/template/printFive.vue

@@ -269,10 +269,11 @@ export default {
      },
 
      getDiagnosis(id){
+        let arr = id.split(',')
         var name = ""
         for(let i=0;i<this.diagnoses.length;i++){
-          if(id == this.diagnoses[i].id){
-             name = this.diagnoses[i].class_name
+          if(arr.indexOf(String(this.diagnoses[i].id)) > -1){
+             name += this.diagnoses[i].class_name + ' '
           }
         }
         return name