10月16日

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

@@ -1969,7 +1969,7 @@
           this.is_open = 0
         }
         
-        if(this.$store.getters.xt_user.org.id == 10101){
+        if(this.$store.getters.xt_user.org.id == 10101 || this.$store.getters.xt_user.org.id == 10233){
           if (this.predialysis.id > 0 && this.predialysis.created_time > 0) {
             var date = new Date(this.predialysis.created_time * 1000)
             var year = date.getFullYear()

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -179,7 +179,7 @@
             {{scope.row.count}}
           </template>
         </el-table-column>
-        <el-table-column label="总价5555" align="center">
+        <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             <!-- {{scope.row.price * scope.row.count}} -->
             {{scope.row.total_price}}
@@ -233,7 +233,6 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     var start_time = window.sessionStorage.getItem('start_out_time')
-    console.log("start",start)
      var end_time =  window.sessionStorage.getItem('end_out_time')
     if(start_time!=null){
        this.start_time = start_time   

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -148,7 +148,7 @@
           <span v-if="org_id!=9987" >
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus!=''">
                 <span v-if="org_id!=10131&& org_id !=10215">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
-                <span v-if="org_id==10131 || org_id == 10215">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
+                <span v-if="org_id==10131 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id,scope.row.mode_id,scope.row.solution)  }}</span>
               
               </span>
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span>
@@ -629,18 +629,18 @@ export default {
         }
        return name
     },
-     getDialysisDialyszerPerfusionOne(patient_id){
-        var name = ""
-        for(let i=0;i<this.scheduleData.length;i++){
-          if(patient_id == this.scheduleData[i].patient_id){
-            var arrLength = this.scheduleData[i].dialysissolution.length
-            if(arrLength > 0){
-               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialyzer_perfusion_apparatus
-            }
+    getDialysisDialyszerPerfusionOne(patient_id,mode_id,solution) {
+        var name = ''
+        for (let i = 0; i < solution.length; i++) {
+          if (mode_id == solution[i].mode_id) {
+         
+            name = solution[i].dialyzer_perfusion_apparatus
+            
           }
         }
-       return name
-    },
+        console.log('name', name)
+        return name
+      },
     changeZone(val){
       this.zone = val
       this.getNextScheduleWeekDay()

src/xt_pages/workforce/components/tableWeeks.vue

@@ -226,7 +226,7 @@
 
           <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 ">{{getDialysisDialyszerPerfusion(scope.row.patient_id)}}</span>
           </span>
-                    <span v-if="org_id==10131 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span>
+                    <span v-if="org_id==10131 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id,scope.row.mode_id,scope.row.solution)}}</span>
                     {{scope.row.prescription.dialysis_dialyszers}}
                     <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
                     <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
@@ -1503,17 +1503,14 @@
           }
         }
         return name
-      }
-      ,
-      getDialysisDialyszerPerfusionOne(patient_id) {
+      },
+      getDialysisDialyszerPerfusionOne(patient_id,mode_id,solution) {
         var name = ''
-        for (let i = 0; i < this.scheduleData.length; i++) {
-          if (patient_id == this.scheduleData[i].patient_id) {
-            // var arrLength = this.scheduleData[i].dialysissolution
-            // console.log('病人ID', patient_id, '数组', this.scheduleData[i].dialysissolution)
-            // if (arrLength > 0) {
-            name = this.scheduleData[i].dialysissolution.dialyzer_perfusion_apparatus
-            // }
+        for (let i = 0; i < solution.length; i++) {
+          if (mode_id == solution[i].mode_id) {
+         
+            name = solution[i].dialyzer_perfusion_apparatus
+            
           }
         }
         console.log('name', name)

src/xt_pages/workforce/next_remind_print.vue

@@ -64,7 +64,7 @@
                  <span v-if="org_id!=9987">
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''">
                         <span v-if="org_id!=10131 && org_id!=10215">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
-                         <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
+                         <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(main_collection.patient_id,main_collection.mode_id,main_collection.solution)  }}</span>
                      </span>
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span>
                   </span>
@@ -417,18 +417,18 @@
         }
        return name
      },
-     getDialysisDialyszerPerfusionOne(patient_id){
-        var name = ""
-        for(let i=0;i<this.scheduleData.length;i++){
-          if(patient_id == this.scheduleData[i].patient_id){
-            var arrLength = this.scheduleData[i].dialysissolution.length
-            if(arrLength > 0){
-               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialyzer_perfusion_apparatus
-            }
+     getDialysisDialyszerPerfusionOne(patient_id,mode_id,solution) {
+        var name = ''
+        for (let i = 0; i < solution.length; i++) {
+          if (mode_id == solution[i].mode_id) {
+         
+            name = solution[i].dialyzer_perfusion_apparatus
+            
           }
         }
-       return name
-     }
+        console.log('name', name)
+        return name
+      },
     }
   }
 </script>

src/xt_pages/workforce/remind_print.vue

@@ -65,7 +65,7 @@
                      <span > 
                        <span v-if="org_id!=10131 && org_id!=10215 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
                      
-                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
+                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(main_collection.patient_id,main_collection.mode_id,main_collection.solution)}}</span>
                       </span>
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
                   </span>
@@ -391,20 +391,18 @@
         }
        return name
      },
-
-     getDialysisDialyszerPerfusionOne(patient_id){
-        var name = ""
-        for(let i=0;i<this.scheduleData.length;i++){
-          if(patient_id == this.scheduleData[i].patient_id){
-            var arrLength = this.scheduleData[i].dialysissolution.length
-            if(arrLength > 0){
-               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialyzer_perfusion_apparatus
-            }
+    getDialysisDialyszerPerfusionOne(patient_id,mode_id,solution) {
+        var name = ''
+        for (let i = 0; i < solution.length; i++) {
+          if (mode_id == solution[i].mode_id) {
+         
+            name = solution[i].dialyzer_perfusion_apparatus
+            
           }
         }
-        console.log("name232333223",name)
-       return name
-     }
+        console.log('name', name)
+        return name
+      },
     },
   }
 </script>