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

src/xt_pages/outpatientDoctorStation/template/printFour.vue

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

src/xt_pages/outpatientDoctorStation/template/printOne.vue

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