11

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -218,7 +218,7 @@
                             </el-button>
 
                               <el-select style="margin-right:5px;width:300px;"
-                                         v-model="item.diagnoses" multiple placeholder="诊断">
+                                         v-model="item.diagnoses" multiple placeholder="诊断" v-if="org_id == 10721">
                                 <el-option
                                   v-for="(item,index) in diagnoses"
                                   :key="index"

src/xt_pages/outpatientCharges/statementTemplate/printSeventheen.vue

@@ -45,6 +45,12 @@
         <div style="flex: 1;text-align: right;">账户余额:{{info.new_order.blac}}</div>
       </div>
 
+    <div style="width: 100%;display: flex;">
+      <div style="flex: 1;">基金支付总额:{{info.new_order.fund_pay_sumamt}}</div>
+    </div>
+
+
+
      <!-- <div style="border: 1px solid black;width: 100%;">
         <div style="border-bottom:1px solid black;display: flex;padding: 5px;">
             <div style="flex: 1;">姓名:{{info.patient.name}}</div>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3200,9 +3200,10 @@ export default {
               }
 
 
-
-              for(let i = 0; i < data.prescriptions.length; i++){
-                data.prescriptions[i]["diagnoses"] = data.prescriptions[i].diagnose.join(",")
+              if (this.org_id == 10721) {
+                for (let i = 0; i < data.prescriptions.length; i++) {
+                  data.prescriptions[i]["diagnoses"] = data.prescriptions[i].diagnose.join(",")
+                }
               }
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -2662,13 +2662,12 @@ export default {
                   }
                 }else{
                   if (this.org_id == 10721 || this.org_id == 0){
-
                     obj.med_type = 992102
                   }
 
                 }
                 obj.diagnose = []
-                if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+                if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                   // obj.diagnose = 2465
                   obj.diagnose.push(2465)
 
@@ -2730,7 +2729,7 @@ export default {
                 obj.med_type = 1
 
               }
-              if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+              if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                 // obj.diagnose = 2465
                 obj.diagnose.push(2465)
 
@@ -3295,7 +3294,7 @@ export default {
                         }
                       }
                       obj.diagnose = []
-                      if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+                      if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                         // obj.diagnose = 2465
                         obj.diagnose.push(2465)
 
@@ -3351,7 +3350,7 @@ export default {
                         obj.med_type = 992102
                       }
                     }
-                    if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+                    if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                       // obj.diagnose = 2465
                       obj.diagnose.push(2465)
 
@@ -3927,7 +3926,7 @@ export default {
                           obj.med_type = 992102
                         }
                       }
-                      if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+                      if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                         // obj.diagnose = 2465
                         obj.diagnose.push(2465)
 
@@ -3983,7 +3982,7 @@ export default {
                       }
                     }
 
-                    if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+                    if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                       // obj.diagnose = 2465
                       obj.diagnose.push(2465)
 
@@ -4549,7 +4548,7 @@ export default {
                         obj.med_type = 992102
                       }
                     }
-                    if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+                    if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                       obj.diagnose.push(2465)
 
                     }
@@ -4605,7 +4604,7 @@ export default {
                     }
                   }
 
-                  if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+                  if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                     obj.diagnose.push(2465)
                   }
 
@@ -5343,7 +5342,7 @@ export default {
 
                       obj.diagnose = []
 
-                      if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+                      if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                         obj.diagnose.push(2465)
 
                       }
@@ -5403,7 +5402,7 @@ export default {
                       obj.med_type = 1
                     }
                     obj.diagnose = []
-                    if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+                    if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                       obj.diagnose.push(2465)
                     }
                     this.prescriptions.push(obj)
@@ -6039,7 +6038,7 @@ export default {
                       }
 
                       obj.diagnose = []
-                      if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+                      if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                         obj.diagnose.push(2465)
                       }
                       console.log("111222222")
@@ -6108,7 +6107,7 @@ export default {
 
                     }
                     obj.diagnose = []
-                    if (parseInt(obj.med_type) == 992102 && (this.org_id == 10271 || this.org_id == 0)){
+                    if (parseInt(obj.med_type) == 992102 && (this.org_id == 10721 || this.org_id == 0)){
                       // obj.diagnose = 2465
                       obj.diagnose.push(2465)