Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/store/modules/globalConfig.js

@@ -554,6 +554,21 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
+      },
+      24: {
+        id: 24,
+        name: 'I-HDF',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
       }
     },
     anticoagulants_confit: { // 抗凝剂

src/xt_pages/data/prescription.vue

@@ -773,7 +773,22 @@ export default {
           sodium: 1,
           calcium: 1,
           bicarbonate: 1
-        }
+        },
+        {
+          id: 24,
+          name: 'I-HDF',
+          dialysis_duration: 1,
+          replacement_way: 1,
+          hemodialysis_machine: 2,
+          blood_filter: 1,
+          perfusion_apparatus: 2,
+          blood_flow_volume: 1,
+          dialysate_flow: 1,
+          kalium: 1,
+          sodium: 1,
+          calcium: 1,
+          bicarbonate: 1
+       }
       ],
       addPlan: {
         id: 0,

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -121,6 +121,7 @@
             <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
             <span v-if="scope.row.mode_id == 13">(CRRT)</span>
             <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
+            <span v-if="scope.row.mode_id == 24">I-HDF</span>
           </template>
         </el-table-column>
         <el-table-column  label="分区床位" width="100">
@@ -249,6 +250,7 @@
             <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
             <span v-if="scope.row.mode_id == 13">(CRRT)</span>
             <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
+            <span v-if="scope.row.mode_id == 24">I-HDF</span>
           </template>
         </el-table-column>
         <el-table-column prop="date" label="透析器" align="center" min-width="26px">

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -66,7 +66,7 @@
                             <span v-if="schedule.mode_id == 12">(HDF+HP)</span>
                             <span v-if="schedule.mode_id == 13">(CRRT)</span>
                             <span v-if="schedule.mode_id == 14">(腹水回输)</span>
-                                
+                            <span v-if="schedule.mode_id == 24">I-HDF</span>   
                             </td>
                             <td v-if="advice_index == 0" :rowspan="group.advices.length">
                             {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
@@ -177,7 +177,7 @@
                             <span v-if="schedule.mode_id == 12">(HDF+HP)</span>
                             <span v-if="schedule.mode_id == 13">(CRRT)</span>
                             <span v-if="schedule.mode_id == 14">(腹水回输)</span>
-                                
+                            <span v-if="schedule.mode_id == 24">I-HDF</span>   
                             </td>
                             <td v-if="advice_index == 0" :rowspan="group.advices.length">
                             {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

@@ -47,7 +47,7 @@
             <label-box :isChecked="prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>&nbsp;
             <label-box :isChecked="prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>&nbsp;
             <label-box :isChecked="prescription.mode_id == 4 ? true : false" showValue="HP"></label-box>&nbsp;
-            
+            <label-box :isChecked="prescription.mode_id == 24 ? true : false" showValue="I-HDF"></label-box>&nbsp;
           </td>
         </tr>
         <tr>
@@ -116,7 +116,7 @@
               {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : '/'}}kg
             </span>
           </td>
-          <td style="text-align:left;" colspan="1" rowspan="2">
+          <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
               透后体重:
               {{ afterdialysis.weight_after ? afterdialysis.weight_after : '/' }} kg
@@ -130,6 +130,13 @@
               {{ afterdialysis.weight_loss ? afterdialysis.weight_loss : "/" }}kg
             </span>
           </td>
+          <td style="text-align:left;" colspan="1">
+            <span style="display:inline-block;margin-left:15px;">
+              透析时长:
+              {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "0" }}h
+              {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "0" }}min
+            </span>
+          </td>
         </tr>
         <tr>
           <td style="text-align:left;" colspan="1">
@@ -151,7 +158,7 @@
           </td>
           <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
-                机温: {{ prescription.dialysate_temperature ? prescription.dialysate_temperature : "/" }} ℃
+                透析液温度: {{ prescription.dialysate_temperature ? prescription.dialysate_temperature : "/" }} ℃
             </span>
           </td>
           <td style="text-align:left;" colspan="1">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -330,12 +330,16 @@
                     </div>
                     ml/min
                   </div>
-                  <div class="inline_block" style="margin-left:10px;flex:1;">
+                  <div class="inline_block" style="margin-left:1px;flex:1;">
                     透析时间：
-                    <div class="under_line" style="width: 50px;text-align: center">
+                    <div class="under_line" style="width: 30px;text-align: center">
                       {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "/" }}
                     </div>
                     h
+                    <div class="under_line" style="width: 30px;text-align: center">
+                      {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "/" }}
+                    </div>
+                    min
                   </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -179,7 +179,10 @@
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺方式：
-                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == ''">
+                    <div class="under_line" style="width: 100px;text-align: center">
+                      {{ predialysis.puncture_way ? predialysis.puncture_way : '/' }}
+                    </div>
+                     <!-- <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == ''">
                       /
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('绳梯')>-1">
@@ -190,7 +193,7 @@
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('区域')>-1">
                       区域
-                    </div>
+                    </div> -->
                     <!-- <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
                       /
                     </div>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -557,7 +557,8 @@ export default {
         this.getInfo(this.paramsObj.order_id,this.paramsObj)
 
       },
-      deep:true
+      deep:true,
+      immediate:true
     }
   }
 

src/xt_pages/stock/drugs/drugPrint.vue

@@ -42,13 +42,13 @@
               </td>
             
               <td style="line-height: 50px">
-                  {{item.warehousing_count}}
+                  {{getCount(item.drug_id)}}
               </td>
               <td style="line-height:50px">
                   {{item.price}}
               </td>
               <td style="line-height:50px">
-                 {{(item.warehousing_count*item.price).toFixed(2)}}
+                 {{(getCount(item.drug_id)*item.price).toFixed(2)}}
               </td>
               <td style="line-height: 50px">
                  {{item.remark}}
@@ -89,7 +89,7 @@
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
-  import { getDrugIndetail,getDrugWarehouseInfoPrint} from "@/api/drug/drug_stock"
+  import { getDrugIndetail,getDrugWarehouseInfoPrint,getDrugCountList} from "@/api/drug/drug_stock"
   export default {
     name: 'dialysisPrintOrder',
     components: {
@@ -115,6 +115,7 @@
         limit:this.$route.query.limit,
         page:this.$route.query.page,
         cancelStockDate:[],
+        minCount:[],
       }
     },
     methods: {
@@ -207,7 +208,7 @@
               }
             }
           }
-          console.log("list666666666",list)
+          // console.log("list666666666",list)
           this.cancelStockDate = list
           var total = response.data.data.total
           this.total = total
@@ -218,7 +219,7 @@
       getTotal(){
         var total = 0
         for(let i=0;i<this.cancelStockDate.length;i++){
-           total += this.cancelStockDate[i].price*this.cancelStockDate[i].warehousing_count
+           total += this.cancelStockDate[i].price*this.getCount(this.cancelStockDate[i].drug_id)
         }
         return total
       },
@@ -238,7 +239,32 @@
         })
 
         
-      }
+      },
+      getCount(drug_id){
+        var total = 0
+        for(let i=0;i<this.minCount.length;i++){
+          if(drug_id == this.minCount[i].drug_id){
+            total += this.minCount[i].warehousing_count
+          }
+        }
+        return total
+      },
+      getDrugCountList(){
+         var params = {
+          keyword: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+         }
+         console.log("paramsw2ww",params)
+        getDrugCountList(params).then(response=>{
+          if(response.data.state == 1){
+            var minCount = response.data.data.minCount
+            console.log("minCount",minCount)
+            this.minCount = minCount
+
+          }
+        })
+      },
     },
     created() {
       var xtuser = this.$store.getters.xt_user
@@ -247,7 +273,7 @@
      
 
       this.getDrugWarehouseInfoPrint()
-      
+       this.getDrugCountList()
 
     }