8月15日

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -82,7 +82,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249)">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395)">
                         <el-form-item label="目标超滤量(ml)：">
                             <el-input
                                     type="number"

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -167,10 +167,15 @@
             <!-- 统筹支付 -->
           统筹支付:{{list.order.hifp_pay?list.order.hifp_pay:'0.00'}}
         </div>
-        <div style="position: absolute;top:310px;left:480px">
+
+        <div style="position: absolute;top:310px;left:400px">
           现金支付:{{list.order.psn_cash_pay?list.order.psn_cash_pay:'0.00'}}
           <!-- 现金支付 -->
         </div>
+        <div style="position: absolute;top:310px;left:560px">
+          职工大额补助：{{list.order.hifob_pay?list.order.hifob_pay:'0.00'}}
+        </div>
+
         <div style="position: absolute;top:340px;left:40px">
           公务员补助:{{list.order.cvlserv_pay?list.order.cvlserv_pay:'0.00'}}
           <!-- 公务员补助 -->

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1611,7 +1611,9 @@
                 let tempAddition = []
                 //药品
                 for (let b = 0; b < prescription.advices.length; b++) {
-                  let obj = {
+                  console.log("prescription.advices[b].drug.drug_status.startsWith('停用')",prescription.advices[b].drug.drug_status.startsWith('停用'))
+                  if(prescription.advices[b].drug!=null && prescription.advices[b].drug.drug_status.startsWith('停用')  == false){
+                    let obj = {
                     advice_id: prescription.advices[b].id,
                     drug_name: prescription.advices[b].advice_name,
                     single_dose: prescription.advices[b].single_dose,
@@ -1633,10 +1635,15 @@
 
                   }
                   tempAdvice.push(obj)
+                  }
+                 
                 }
 
+
                 //项目
                 for (let b = 0; b < prescription.project.length; b++) {
+                  if(prescription.project!=null && (prescription.project[b].good_info.good_status.startsWith('停用') == false && prescription.project[b].project.medical_status!=1)){
+
                   let obj = {
                     id: prescription.project[b].id,
                     project_id: prescription.project[b].project_id,
@@ -1671,6 +1678,8 @@
                     obj['unit'] = prescription.project[b].good_info.packing_unit
                   }
                   tempProject.push(obj)
+                  }
+             
                 }
 
                 // var preTime = nowTime

src/xt_pages/user/components/PatientDetail.vue

@@ -805,7 +805,8 @@
 
        <el-col :span="6">
         <el-form-item label="医生 : ">
-           <el-select v-model="form.doctor">
+       
+           <el-select v-model="form.doctor"    disabled>
               <el-option
                 v-for="item in adminUserOptions"
                 :key="item.id"
@@ -1358,6 +1359,9 @@ export default {
             this.form.remind_cycle = patietInfo.remind_cycle;
             this.form.treatment_plan = patietInfo.treatment_plan;
             this.form.doctor = patietInfo.doctor
+            if(this.form.doctor == 0){
+              this.form.doctor = ""
+            }
             if (patietInfo.is_infectious == 1) {
               this.form.remind_cycle = 0;
             }

src/xt_pages/user/components/PatientForm.vue

@@ -1854,6 +1854,9 @@ export default {
             //   this.form.registrars = patietInfo.registrars_id;
             // }
             this.form.doctor = patietInfo.doctor
+            if(this.form.doctor == 0){
+              this.form.doctor = ""
+            }
             this.checkIdCardNo();
           } else {
             this.$notify.error({