合并带嘛

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -335,7 +335,7 @@
         })
 
       }, deleteDrug: function(index, row) {
-        if (this.prescription.order_status == 2) {
+        if (this.prescription.order_status == 2  || this.prescription.order_status == 4) {
           this.$message.error('该处方已经结算，无法删除')
           return
         }
@@ -406,7 +406,7 @@
         return name
       },
       deleteProject(row, i) {
-        if (this.prescription.order_status == 2) {
+        if (this.prescription.order_status == 2 || this.prescription.order_status == 4) {
           this.$message.error('该处方已经结算，无法删除')
           return
         }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -4359,13 +4359,14 @@ export default {
                 this.form.diagnosis = []
               } else {
                 for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
-                  this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
+                  if(parseInt(response.data.data.info.diagnosis.split(',')[i]) !== NaN){
+                    this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
+                  }
                 }
               }
-              console.log("~~~~~~")
-              console.log(this.form.diagnosis)
-              console.log(this.diagnoses)
-              console.log("~~~~~~")
+
+
+