Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

@@ -427,18 +427,25 @@
                       </div>
                       <div class="inline_block" style="flex: 1">
                         体重增加:
+                      
                         <div class="under_line" style="width: 70px; text-align: center">
-                          <span v-if="record.lastafterweight.weight_after>0">{{ record.assessment_before_dislysis.weight_before > 0 && record.lastafterweight.weight_after > 0 
+                          <span v-if="record.lastafterweight.weight_after>0">
+                            {{ record.assessment_before_dislysis.weight_before > 0 && record.lastafterweight.weight_after > 0 
                             ? parseFloat(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.additional_weight
                             - record.lastafterweight.weight_after).toFixed(2): "/" 
                           }}
                           </span> 
 
-                          <span v-if="record.lastafterweight.weight_after<=0">{{ record.assessment_before_dislysis.weight_before > 0 && record.assessment_after_dislysis.last_after_weight > 0 
+                          <span v-if="record.lastafterweight.weight_after<=0 && record.assessment_after_dislysis.last_after_weight>0">
+                            {{ record.assessment_before_dislysis.weight_before > 0 && record.assessment_after_dislysis.last_after_weight > 0 
                             ? parseFloat(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.additional_weight
                             - record.assessment_after_dislysis.last_after_weight).toFixed(2): "/" 
                           }}
                           </span> 
+
+                          <span v-if="record.lastafterweight.weight_after<=0 && record.assessment_after_dislysis.last_after_weight ==0">
+                              /
+                          </span> 
                         </div>
                         kg
                       </div>
@@ -446,8 +453,8 @@
                         超滤总量:
                         <div class="under_line" style="width: 100px; text-align: center">
                           {{
-                            record.prescription.target_ultrafiltration
-                              ? record.prescription.target_ultrafiltration
+                            record.prescription.prescription_water
+                              ? record.prescription.prescription_water
                               : "/"
                           }}
                         </div>

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -381,6 +381,8 @@
                       上次透后体重：
                       <div class="under_line" style="width: 50px; text-align: center">
                         <!-- {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}} -->
+                       
+                        
                         <span v-if="lastafterdialysis.weight_after>0">{{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}</span> 
                         <span v-if="lastafterdialysis.weight_after<=0">{{afterdialysis.last_after_weight?afterdialysis.last_after_weight:"未称重"}}</span> 
                       </div>
@@ -406,8 +408,15 @@
                       <div class="under_line" style="width: 70px; text-align: center">
                         <span>
                           <!-- {{ (predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2)}} -->
-                          <span v-if="lastafterdialysis.weight_after>0">{{ (predialysis.weight_before - predialysis.additional_weight - lastafterdialysis.weight_after).toFixed(2)}}</span> 
-                          <span v-if="lastafterdialysis.weight_after<=0">{{ (predialysis.weight_before - predialysis.additional_weight -afterdialysis.last_after_weight).toFixed(2)}}</span> 
+                          <span v-if="lastafterdialysis.weight_after>0"
+                            >{{ (predialysis.weight_before - predialysis.additional_weight - lastafterdialysis.weight_after).toFixed(2)}}
+                          </span> 
+                          <span v-if="lastafterdialysis.weight_after<=0 && afterdialysis.last_after_weight>0">
+                            {{ (predialysis.weight_before - predialysis.additional_weight -afterdialysis.last_after_weight).toFixed(2)}}
+                          </span> 
+                          <span v-if="lastafterdialysis.weight_after<=0 && afterdialysis.last_after_weight==0">
+                            /
+                          </span> 
                         </span>
                       </div>
                       kg
@@ -416,8 +425,8 @@
                       超滤总量：
                       <div class="under_line" style="width: 60px; text-align: center">
                         {{
-                          prescription.target_ultrafiltration
-                            ? prescription.target_ultrafiltration
+                          prescription.prescription_water
+                            ? prescription.prescription_water
                             : "/"
                         }}
                       </div>
@@ -1743,7 +1752,7 @@ export default {
       } if (this.predialysis.weight_before == 0) {
         const obj19 ='透前体重'
         checkDate.push(obj19)
-      } if (this.prescription.target_ultrafiltration == 0) {
+      } if (this.prescription.prescription_water == 0) {
         const obj20 ='超滤总量'
         checkDate.push(obj20)
       } if (this.prescription.calcium == 0) {

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.hifob_pay}}</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

@@ -2651,7 +2651,7 @@ export default {
 
 
                 if (obj.med_type == 0 || obj.med_type == '') {
-                  if (this.org_id != 10206 && this.org_id != 0) {
+                  if (this.org_id != 10206) {
                     obj.med_type = 14
                     if (this.org_id == 10721 || this.org_id == 0){
 
@@ -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)