Pārlūkot izejas kodu

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

yq1 4 mēnešus atpakaļ
vecāks
revīzija
4e73be7be7

+ 1 - 1
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Parādīt failu

@@ -3234,7 +3234,7 @@ mu
3234 3234
           }
3235 3235
         }
3236 3236
 
3237
-        if(this.$store.getters.xt_user.template_info.org_id ==10635 || this.$store.getters.xt_user.template_info.org_id ==0 || this.$store.getters.xt_user.template_info.org_id ==10702){
3237
+        if(this.$store.getters.xt_user.template_info.org_id ==10635 || this.$store.getters.xt_user.template_info.org_id ==0 || this.$store.getters.xt_user.template_info.org_id ==10702 ||  this.$store.getters.xt_user.template_info.org_id == 10727){
3238 3238
          
3239 3239
           if(this.dialysisPrescription.target_ultrafiltration == 0 || this.dialysisPrescription.target_ultrafiltration=="" || this.dialysisPrescription.target_ultrafiltration == "undefined" || this.dialysisPrescription.target_ultrafiltration == undefined){
3240 3240
           

+ 1 - 0
src/xt_pages/outpatientCharges/statementTemplate/printThree.vue Parādīt failu

@@ -140,6 +140,7 @@
140 140
 <!--                          </div>-->
141 141
                         <div style="display:flex;flez-wrap:wrap;font-size:16px;">
142 142
                           <div style="width:33%;">公务员医疗补助:{{info.new_order.cvlserv_pay?info.new_order.cvlserv_pay:0}}元</div>
143
+                          <div style="width:33%;">企业补充医疗保险基金支出:{{info.new_order.cvlserv_pay?info.new_order.cvlserv_pay:0}}元</div>
143 144
                         </div>
144 145
                       </td>
145 146
                       <td style="font-size:16px;">合计:{{info.new_order.medfee_sumamt}}元</td>