hah阿凡达

src/xt_pages/data/druguseTemplate.vue

@@ -2863,6 +2863,7 @@
                 obj.delivery_way = medicalList[i].delivery_way
                 obj.execution_frequency = medicalList[i].execution_frequency
                 obj.single_dose = medicalList[i].single_dose
+                obj.single_dose_unit  = medicalList[i].dose_unit
                 obj.prescribing_number = medicalList[i].prescribing_number
                 obj.type_id = medicalList[i].id
                 obj.type = 2
@@ -2900,6 +2901,7 @@
                 obj.delivery_way = base_drug_list[i].delivery_way
                 obj.execution_frequency = base_drug_list[i].execution_frequency
                 obj.single_dose = base_drug_list[i].single_dose
+                obj.single_dose_unit = base_drug_list[i].dose_unit
                 obj.prescribing_number = base_drug_list[i].prescribing_number
                 obj.type_id = base_drug_list[i].id
                 obj.type = 1
@@ -2917,6 +2919,7 @@
     changeDrugName(name){
        this.current_drug_name = name
        this.templateForm.advice_desc = ''
+       console.log("all_drug=============",this.all_drug)
       this.drugSpec = []
       for (let i = 0; i < this.all_drug.length; i++) {
         if (this.all_drug[i].drug_name == name) {
@@ -3031,15 +3034,15 @@
        return a.sort - b.sort
      },
      hangleSelectChange(val){
-        console.log("==val==",val)
+      console.log("==val==",val)
        var tmp = val.drug_specs[0]
        console.log("tmp",tmp)
        this.templateForm.advice_desc=this.drugSpec[0].drug_spec
-       this.templateForm.drug_spec_unit=this.drugSpec[0].min_unit
+       this.templateForm.drug_spec_unit= this.drugSpec[0].min_unit
        this.templateForm.prescribing_number=this.drugSpec[0].prescribing_number
        this.templateForm.prescribing_number_unit=this.drugSpec[0].prescribing_number_unit
-       this.templateForm.single_dose=this.drugSpec[0].single_dose
-       this.templateForm.single_dose_unit=this.drugSpec[0].min_unit
+       this.templateForm.single_dose= this.drugSpec[0].single_dose
+       this.templateForm.single_dose_unit= val.single_dose_unit
        this.templateForm.delivery_way=this.drugSpec[0].delivery_way
        this.templateForm.execution_frequency=this.drugSpec[0].execution_frequency
        this.templateForm.advice_desc=tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格

src/xt_pages/dialysis/PatientBox.vue

@@ -161,19 +161,41 @@
         </p>
 
 
-        <p v-if="$store.getters.xt_user.org.id!=9675 && $store.getters.xt_user.org.id!=10340">
+        <p v-if="$store.getters.xt_user.org.id!=9675 && $store.getters.xt_user.org.id!=10340 && $store.getters.xt_user.org.id!=0&& $store.getters.xt_user.org.id!=10742">
           透析器/灌流器:{{schedule.prescription? schedule.prescription.dialyzer_perfusion_apparatus: ""}}
           <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_dialyszers: ""}}</span>
           <span v-if="schedule.prescription != null &&schedule.prescription.dialysis_irrigation != ''">/</span>
           <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_irrigation: ""}}</span>
         </p>
+
+        <p v-if="$store.getters.xt_user.org.id ==0 ||  $store.getters.xt_user.org.id ==10742">
+          透析器/灌流器/滤过器:
+        
+          <span v-if="schedule.prescription != null">
+            <span v-if="schedule.prescription.id > 0">
+              {{schedule.prescription? schedule.prescription.dialysis_dialyszers: ""}}
+            </span>
+            <span v-if="schedule.prescription != null &&schedule.prescription.dialysis_irrigation != ''">/</span>
+            <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_irrigation: ""}}</span>
+          </span>
+
+          <span v-if="schedule.prescription== null && schedule.dialysis_solution!=null">
+             <span v-if="schedule.dialysis_solution.id>0">
+                {{ schedule.dialysis_solution.dialysis_dialyszers }} 
+               <span v-if="schedule.dialysis_solution.dialysis_dialyszers!=''"> {{ schedule.dialysis_solution.dialysis_irrigation }}</span>
+               <span v-if="schedule.dialysis_solution.dialysis_strainer!=''"> {{ schedule.dialysis_solution.dialysis_strainer }}</span>
+             </span>
+          </span>
+        
+        </p>
+
         <p v-if="$store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
              透析器/灌流器:
              <span v-if="schedule.dialysis_order!=null">{{schedule.dialysis_order.dialysis_dialyszers}}</span>
              <span v-if="schedule.dialysis_order!=null">{{schedule.dialysis_order.dialysis_irrigation}}</span>
              
         </p>
-        <p v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==10445">
+        <p v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==10445 ||  $store.getters.xt_user.org.id==10579 ">
            滤过器:
            <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_strainer: ""}}</span>
         </p>

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1749,7 +1749,7 @@ export default {
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551 || this.$store.getters.xt_user.org.id == 10679 || this.$store.getters.xt_user.org.id == 10693 ||  this.$store.getters.xt_user.org.id == 10694 || this.$store.getters.xt_user.org.id == 10702 || this.$store.getters.xt_user.org.id == 10495){
+      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551 || this.$store.getters.xt_user.org.id == 10679 || this.$store.getters.xt_user.org.id == 10693 ||  this.$store.getters.xt_user.org.id == 10694 || this.$store.getters.xt_user.org.id == 10702 || this.$store.getters.xt_user.org.id == 10495 || this.$store.getters.xt_user.org.id == 10742){
         var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -3064,6 +3064,29 @@ mu
               minites = '0' + minites
             }
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if(this.$store.getters.xt_user.org.id == 10742){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+
            }else if(this.$store.getters.xt_user.org.id == 10495){
 
             var date = new Date()