新分支

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -1549,6 +1549,61 @@
                           <tbody>
                             <tr>
                               <td width="70">抗凝方式:</td>
+                              <td width="80">
+                                  <label-box :isChecked="record.prescription.anticoagulant == '8' ? true : false" showValue="依诺肝素"></label-box>
+                              </td>
+                              <td width="80">
+                                  <label-box :isChecked="record.prescription.anticoagulant == '4' ? true : false" showValue="阿加曲班"></label-box>
+                              </td>
+                              <td width="80">
+                                  <label-box :isChecked="record.prescription.anticoagulant == '2' ? true : false" showValue="普通肝素"></label-box>
+                              </td>
+                              <td width="80">
+                                  <label-box :isChecked="record.prescription.anticoagulant == '1' ? true : false" showValue="无肝素"></label-box>
+                              </td>
+                              <td width="90">
+                                  <label-box :isChecked="(record.prescription.anticoagulant == '低分子肝素' || record.prescription.anticoagulant == '低分子肝素钙' || record.prescription.anticoagulant == '低分子肝素钠') ? true : false" showValue="低分子肝素"></label-box>
+                              </td>
+
+                              <td width="50">首剂量</td>
+                              <td width="60">
+                                {{record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : ""}}
+                                    <span v-if="record.prescription.anticoagulant == 5">iu</span>
+                                    <span v-if="record.prescription.anticoagulant == 6">iu</span>
+                                    <span v-if="record.prescription.anticoagulant == 7">iu</span>
+                                    <span v-if="record.prescription.anticoagulant == 8">iu</span>
+                                    <span v-if="record.prescription.anticoagulant == 4">mg</span>
+                                    <span v-if="record.prescription.anticoagulant == 3">iu</span>
+                                    <span v-if="record.prescription.anticoagulant == 2">mg</span>
+                                    <span v-if="record.prescription.anticoagulant == 1">mg</span>
+                              </td>
+
+                              <td width="30">维持</td>
+                              <td width="60">
+                                {{record.prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : ""}}
+                                <span v-if="record.prescription.anticoagulant == 6">iu</span>
+                                <span v-if="record.prescription.anticoagulant == 7">iu</span>
+                                <span v-if="record.prescription.anticoagulant == 8">iu</span>
+                                <span v-if="record.prescription.anticoagulant == 5">ml/h</span>
+                                <span v-if="record.prescription.anticoagulant == 4">mg/h</span>
+                                <span v-if="record.prescription.anticoagulant == 3">iu/h</span>
+                                <span v-if="record.prescription.anticoagulant == 2">mg/h</span>
+                                <span v-if="record.prescription.anticoagulant == 1">mg/h</span>
+                              </td>
+
+                              <td width="30">总量</td>
+                              <td width="60">
+                                {{record.prescription.anticoagulant_zongliang ?record.prescription.anticoagulant_zongliang : ""}}
+                                <span v-if="record.prescription.anticoagulant == 5">iu</span>
+                                  <span v-if="record.prescription.anticoagulant == 6">iu</span>
+                                  <span v-if="record.prescription.anticoagulant == 7">iu</span>
+                                  <span v-if="record.prescription.anticoagulant == 8">iu</span>
+                                  <span v-if="record.prescription.anticoagulant == 4">mg</span>
+                                  <span v-if="record.prescription.anticoagulant == 3">iu</span>
+                                  <span v-if="record.prescription.anticoagulant == 2">mg</span>
+                                  <span v-if="record.prescription.anticoagulant == 1">mg</span>
+                              </td>
+                              <!-- <td width="70">抗凝方式:</td>
                               <td width="120">
                                 <label-box
                                   :isChecked="(record.prescription.anticoagulant == 8)
@@ -1736,7 +1791,7 @@
                                   "
                                   showValue="无肝素"
                                 ></label-box>
-                              </td>
+                              </td> -->
                             </tr>
                           </tbody>
                         </table>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -668,10 +668,73 @@
                   <tbody>
                     <tr>
                       <td width="70">抗凝方式:</td>
-                      <td width="120">
+                      <td width="80">
                           <label-box :isChecked="prescription.anticoagulant == '依诺肝素' ? true : false" showValue="依诺肝素"></label-box>
                       </td>
+                      <td width="80">
+                          <label-box :isChecked="prescription.anticoagulant == '阿加曲班' ? true : false" showValue="阿加曲班"></label-box>
+                      </td>
+                      <td width="80">
+                          <label-box :isChecked="prescription.anticoagulant == '普通肝素' ? true : false" showValue="普通肝素"></label-box>
+                      </td>
+                      <td width="80">
+                          <label-box :isChecked="prescription.anticoagulant == '无肝素' ? true : false" showValue="无肝素"></label-box>
+                      </td>
+                      <td width="90">
+                          <label-box :isChecked="(prescription.anticoagulant == '低分子肝素' || prescription.anticoagulant == '低分子肝素钙' || prescription.anticoagulant == '低分子肝素钠') ? true : false" showValue="低分子肝素"></label-box>
+                      </td>
+
+                      <td width="40">首剂量</td>
+                      <td width="60">
+                        {{prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : ""}}
+                        <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml</span>
+                        <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
+                        <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>
+                        <span v-if="prescription.anticoagulant == '依诺肝素'">iu</span>
+                        <span v-if="prescription.anticoagulant == '达肝素'">iu</span>
+                        <span v-if="prescription.anticoagulant == '体外抗凝'">iu</span>
+                        <span v-if="prescription.anticoagulant == '那屈肝素'">iu</span>
+                        <span v-if="prescription.anticoagulant == '那屈肝素钙'">iu</span>
+                        <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
+                        <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
+                        <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
+                        <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
+                      </td>
+
+                      <td width="30">维持</td>
                       <td width="60">
+                        {{prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : ""}}
+                        <span v-if="prescription.anticoagulant == '阿加曲班'">iu</span>
+                        <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
+                        <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
+                        <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml</span>
+                        <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
+                        <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>
+                        <span v-if="prescription.anticoagulant == '依诺肝素'">iu</span>
+                        <span v-if="prescription.anticoagulant == '达肝素'">iu</span>
+                        <span v-if="prescription.anticoagulant == '体外抗凝'">iu</span>
+                        <span v-if="prescription.anticoagulant == '那屈肝素'">iu</span>
+                        <span v-if="prescription.anticoagulant == '那屈肝素钙'">iu</span>
+                      </td>
+
+                      <td width="30">总量</td>
+                      <td width="60">
+                        {{prescription.anticoagulant_zongliang ?prescription.anticoagulant_zongliang : ""}}
+                        <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu/h</span>
+                        <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu/h</span>
+                        <span v-if="prescription.anticoagulant == '依诺肝素'">iu/h</span>
+                        <span v-if="prescription.anticoagulant == '达肝素'">iu/h</span>
+                        <span v-if="prescription.anticoagulant == '体外抗凝'">iu/h</span>
+                        <span v-if="prescription.anticoagulant == '那屈肝素'">iu/h</span>
+                        <span v-if="prescription.anticoagulant == '那屈肝素钙'">iu/h</span>
+                        <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml/h</span>
+                        <span v-if="prescription.anticoagulant == '阿加曲班'">mg/h</span>
+                        <span v-if="prescription.anticoagulant == '低分子肝素'">iu/h</span>
+                        <span v-if="prescription.anticoagulant == '普通肝素'">mg/h</span>
+                        <span v-if="prescription.anticoagulant == '无肝素'">mg/h</span>
+                      </td>
+
+                      <!-- <td width="60">
                           <div class="under-line">&nbsp;{{ prescription.anticoagulant == '依诺肝素' && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : ""}}</div>
                       </td>
                       <td width="10">iu</td>
@@ -702,7 +765,7 @@
                       <td width="100">
                           <label-box :isChecked="prescription.anticoagulant == '无肝素' ? true : false" showValue="无肝素"></label-box>
                       </td>
-                      <td></td>
+                      <td></td> -->
                     </tr>
                   </tbody>
                 </table>

src/xt_pages/outpatientDoctorStation/components/dialysishistory.vue

@@ -290,6 +290,12 @@ export default{
     }
   },
   methods:{
+    show(patient_id){
+   
+     this.queryParams.patient_id = 0
+     this.queryParams.patient_id = patient_id
+     this.getPatientDialysisRecords()
+    },
     changeSearch(){
 
     },
@@ -313,12 +319,13 @@ export default{
 
     },
     getPatientDialysisRecords() {
-      console.log("prams",this.queryParams)
+      console.log("prams--------------------",this.queryParams)
       getPatientDialysisRecords(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.total = response.data.data.total;
+          this.recordData = []
           this.recordData = response.data.data.records;
-          console.log("郭23232323232232323",this.recordData)
+         
         }
       });
     },
@@ -387,6 +394,7 @@ export default{
   },
   created(){
     this.modeOptions = this.$store.getters.treatment_mode;
+    console.log("patinetid----",this.patientid)
     this.queryParams.patient_id = this.patientid
     this.getPatientDialysisRecords()
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -190,7 +190,7 @@
         <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'
                         :dialysisShow="dialysisShow"></dialysis-index>
 
-        <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid'></dialysishistory>
+        <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid' ref="childOne"></dialysishistory>
       </div>
 
     </div>
@@ -568,6 +568,7 @@ export default {
       advices_template: [],
       sick: [],
       diagnoses: [],
+      diagnosis:[],
       additions: [],
       doctors: [],
       department: [],
@@ -2734,6 +2735,7 @@ export default {
                     //   }
                   }
                 }
+                console.log("jin2")
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
                 this.$refs.child.watchSign = 0
               }
@@ -3269,6 +3271,7 @@ export default {
                     // }
                   }
                 }
+                console.log("jin3")
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
                 this.$refs.child.watchSign = 0
               }
@@ -3792,13 +3795,18 @@ export default {
                   // }
                 }
               }
+              console.log("jin4")
               this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
               this.$refs.child.watchSign = 0
             }
           })
           this.$refs.child.watchSign = 0
         }
+      }else if(this.titleType == '透析历史'){
+        
+         this.$refs.childOne.show(this.patientid)
       } else {
+      
         this.patientid = val.id
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
@@ -4457,6 +4465,7 @@ export default {
                     // }
                   }
                 }
+                console.log("jin5")
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
               }
             })
@@ -5028,6 +5037,7 @@ export default {
 
                   }
                 }
+              
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
               }
             })
@@ -5146,6 +5156,7 @@ export default {
       }
     },
     currentChange(currentRow, oldCurrentRow) {
+
       if (oldCurrentRow) {
         this.newPatientId = oldCurrentRow.id
         this.patientid = oldCurrentRow.id

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">首拼</el-button> 
+          @click="toJiaBan">首拼</el-button>  -->
 
           
 

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

@@ -387,6 +387,49 @@ export default {
                 }
                }
              }
+
+
+            //  新版
+             if(list[i].new_drug_in_flow_info!=null && list[i].new_drug_in_flow_info.length>0){
+                for(let j=0;j<list[i].new_drug_in_flow_info.length;j++){
+                   if(list[i].max_unit == list[i].new_drug_in_flow_info[j].max_unit){
+                        list[i].new_drug_in_flow_info[j].count = list[i].new_drug_in_flow_info[j].count * list[i].min_number
+                   }
+                }
+             }
+
+             if(list[i].new_drug_cancel_flow_info!=null && list[i].new_drug_cancel_flow_info.length>0){
+                for(let j=0;j<list[i].new_drug_cancel_flow_info.length;j++){
+                   if(list[i].max_unit == list[i].new_drug_cancel_flow_info[j].max_unit){
+                        list[i].new_drug_cancel_flow_info[j].count = list[i].new_drug_cancel_flow_info[j].count * list[i].min_number
+                   }
+                }
+             }
+
+             if(list[i].new_drug_no_profit_flow_info!=null && list[i].new_drug_no_profit_flow_info.length>0){
+                for(let j=0;j<list[i].new_drug_no_profit_flow_info.length;j++){
+                   if(list[i].max_unit == list[i].new_drug_no_profit_flow_info[j].max_unit){
+                        list[i].new_drug_no_profit_flow_info[j].count = list[i].new_drug_no_profit_flow_info[j].count * list[i].min_number
+                   }
+                }
+             }
+
+             if(list[i].new_drug_out_flow_info!=null && list[i].new_drug_out_flow_info.length>0){
+                for(let j=0;j<list[i].new_drug_out_flow_info.length;j++){
+                   if(list[i].max_unit == list[i].new_drug_out_flow_info[j].max_unit){
+                        list[i].new_drug_out_flow_info[j].count = list[i].new_drug_out_flow_info[j].count * list[i].min_number
+                   }
+                }
+             }
+
+             if(list[i].new_drug_profit_flow_info!=null && list[i].new_drug_profit_flow_info.length>0){
+                for(let j=0;j<list[i].new_drug_profit_flow_info.length;j++){
+                   if(list[i].max_unit == list[i].new_drug_profit_flow_info[j].max_unit){
+                        list[i].new_drug_profit_flow_info[j].count = list[i].new_drug_profit_flow_info[j].count * list[i].min_number
+                   }
+                }
+             }
+
             }
 
             console.log("list23323223322332232323322323wode",list)
@@ -394,34 +437,31 @@ export default {
               list[i].last_price_in = 0
               list[i].drugAddOne= 0
               list[i].drugOutOne =0
-              list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
-            //   list[i].drugIn = this.getDrugWarehouseInfoOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-            //   list[i].drugInMoney = this.getDrugInMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-            //   list[i].drugSaleMoney = this.getSaleMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
+              
+              // list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
+
+              list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
+              list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
               list[i].drugInMoney = list[i].last_price
               list[i].drugSaleMoney = "/"
 
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
               list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-            //   list[i].drugAddPrice = this.getdrugAddPrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-            //   list[i].drugAddSalePrice = this.drugAddSalePrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+           
               list[i].drugAddPrice = "/"
               list[i].drugAddSalePrice = "/"
 
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
               list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-            //   list[i].drugOutPrice = this.getDrugOutPrice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-            //   list[i].drugOutSalePrice = this.getDrugOutSaleprice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
+           
               list[i].drugOutPrice = "/"
               list[i].drugOutSalePrice = "/"
 
-            //   list[i].overDrug = this.getDrugWarehouseInfo(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-            //   list[i].overDrugPrice =  this.getDrugInMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-            //   list[i].oveDrugSaleMoney =  this.getSaleMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
+         
             if(this.org_id == 10265){
               list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
             }else{
-              list[i].overDrug = this.GetDrugOver(list[i].DrugStatFlow.over_count,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
+              list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
             }
             
              list[i].overDrugPrice = "/"
@@ -1395,9 +1435,9 @@ export default {
       var min_str = ""
       var max_str = ""  
        total = totalone + totaltwo - totalthree
-       console.log("totoalone---------------",totalone)
-       console.log("totaltwo------------",totaltwo)
-       console.log("totalthree----------",totalthree)
+      //  console.log("totoalone---------------",totalone)
+      //  console.log("totaltwo------------",totaltwo)
+      //  console.log("totalthree----------",totalthree)
         if (total < min_number) {
           min_str = total + min_unit;
         }
@@ -1418,6 +1458,118 @@ export default {
       }else{
         return max_str + min_str;
       }
+    },
+    GetInitStartFlow(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
+      var total_one =0
+      var total_two = 0
+      var total_three =0
+      var total_four =0
+      var total_five = 0
+      var total =0
+      var min_str = ""
+      var max_str = ""  
+      if(val1!=null && val1.length>0){
+         for(let i=0;i<val1.length;i++){
+           total_one +=val1[i].count
+         }
+      }  
+
+      if(val2!=null && val2.length>0){
+         for(let i=0;i<val2.length;i++){
+          total_two +=val2[i].count
+         }
+      }  
+    
+      console.log("val3",val3)
+      if(val3!=null && val3.length>0){
+         for(let i=0;i<val3.length;i++){
+          total_three +=val3[i].count
+         }
+      }  
+      if(val4!=null && val4.length>0){
+         for(let i=0;i<val4.length;i++){
+          total_four +=val4[i].count
+         }
+      }  
+
+      if(val5!=null && val5.length>0){
+         for(let i=0;i<val5.length;i++){
+          total_five +=val5[i].count
+         }
+      }  
+      console.log("入库",total_one)
+      console.log("盘盈",total_two)
+      console.log("出库",total_three)
+      console.log("盘亏",total_four)
+      console.log("退库",total_five)
+      var total = total_one + total_two -total_three-total_four + total_five
+      if (total < min_number) {
+          min_str = total + min_unit;
+        }
+        if (total == 0) {
+          min_str = "";
+          max_str = "";
+        }
+        if (total >= min_number) {
+          if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+          }
+          if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+          }
+      }
+      if(max_str == "" && min_str == ""){
+        return "0"
+      }else{
+        return max_str + min_str;
+      }
+    },
+    GetInitStartFlowOne(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
+      var total_one =0
+      var total_two = 0
+      var total_three =0
+      var total_four =0
+      var total_five = 0
+      var total =0
+      var min_str = ""
+      var max_str = ""  
+      if(val1!=null && val1.length>0){
+         for(let i=0;i<val1.length;i++){
+           total_one +=val1[i].count
+         }
+      }  
+
+      if(val2!=null && val2.length>0){
+         for(let i=0;i<val2.length;i++){
+          total_two +=val2[i].count
+         }
+      }  
+    
+      console.log("val3",val3)
+      if(val3!=null && val3.length>0){
+         for(let i=0;i<val3.length;i++){
+          total_three +=val3[i].count
+         }
+      }  
+      if(val4!=null && val4.length>0){
+         for(let i=0;i<val4.length;i++){
+          total_four +=val4[i].count
+         }
+      }  
+
+      if(val5!=null && val5.length>0){
+         for(let i=0;i<val5.length;i++){
+          total_five +=val5[i].count
+         }
+      }  
+      console.log("入库",total_one)
+      console.log("盘盈",total_two)
+      console.log("出库",total_three)
+      console.log("盘亏",total_four)
+      console.log("退库",total_five)
+      var total = total_one + total_two -total_three-total_four + total_five
+      
+      return total
     }
   }
 }

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

@@ -295,6 +295,49 @@ export default {
                 }
                }
              }
+          
+              //  新版
+              if(list[i].new_drug_in_flow_info!=null && list[i].new_drug_in_flow_info.length>0){
+                for(let j=0;j<list[i].new_drug_in_flow_info.length;j++){
+                   if(list[i].max_unit == list[i].new_drug_in_flow_info[j].max_unit){
+                        list[i].new_drug_in_flow_info[j].count = list[i].new_drug_in_flow_info[j].count * list[i].min_number
+                   }
+                }
+             }
+
+             if(list[i].new_drug_cancel_flow_info!=null && list[i].new_drug_cancel_flow_info.length>0){
+                for(let j=0;j<list[i].new_drug_cancel_flow_info.length;j++){
+                   if(list[i].max_unit == list[i].new_drug_cancel_flow_info[j].max_unit){
+                        list[i].new_drug_cancel_flow_info[j].count = list[i].new_drug_cancel_flow_info[j].count * list[i].min_number
+                   }
+                }
+             }
+
+             if(list[i].new_drug_no_profit_flow_info!=null && list[i].new_drug_no_profit_flow_info.length>0){
+                for(let j=0;j<list[i].new_drug_no_profit_flow_info.length;j++){
+                   if(list[i].max_unit == list[i].new_drug_no_profit_flow_info[j].max_unit){
+                        list[i].new_drug_no_profit_flow_info[j].count = list[i].new_drug_no_profit_flow_info[j].count * list[i].min_number
+                   }
+                }
+             }
+
+             if(list[i].new_drug_out_flow_info!=null && list[i].new_drug_out_flow_info.length>0){
+                for(let j=0;j<list[i].new_drug_out_flow_info.length;j++){
+                   if(list[i].max_unit == list[i].new_drug_out_flow_info[j].max_unit){
+                        list[i].new_drug_out_flow_info[j].count = list[i].new_drug_out_flow_info[j].count * list[i].min_number
+                   }
+                }
+             }
+
+             if(list[i].new_drug_profit_flow_info!=null && list[i].new_drug_profit_flow_info.length>0){
+                for(let j=0;j<list[i].new_drug_profit_flow_info.length;j++){
+                   if(list[i].max_unit == list[i].new_drug_profit_flow_info[j].max_unit){
+                        list[i].new_drug_profit_flow_info[j].count = list[i].new_drug_profit_flow_info[j].count * list[i].min_number
+                   }
+                }
+             }
+
+
             }
 
 
@@ -304,34 +347,31 @@ export default {
                 list[i].drugAddOne= 0
                 list[i].drugOutOne =0
                
-                list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
-                //   list[i].drugIn = this.getDrugWarehouseInfoOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-                //   list[i].drugInMoney = this.getDrugInMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-                //   list[i].drugSaleMoney = this.getSaleMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
+               // list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
+
+               list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
+               list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
+               
                 list[i].drugInMoney = "/"
                 list[i].drugSaleMoney = "/"
 
                 list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
                 list[i].drugAddOne= this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-                //   list[i].drugAddPrice = this.getdrugAddPrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-                //   list[i].drugAddSalePrice = this.drugAddSalePrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+               
                 list[i].drugAddPrice = "/"
                 list[i].drugAddSalePrice = "/"
 
                 list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
                 list[i].drugOutOne = this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-                //   list[i].drugOutPrice = this.getDrugOutPrice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-                //   list[i].drugOutSalePrice = this.getDrugOutSaleprice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
+                
                 list[i].drugOutPrice = "/"
                 list[i].drugOutSalePrice = "/"
 
-                //   list[i].overDrug = this.getDrugWarehouseInfo(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-                //   list[i].overDrugPrice =  this.getDrugInMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-                //   list[i].oveDrugSaleMoney =  this.getSaleMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-                if(this.org_id == 0 || this.org_id ==10265){
+               
+                if(this.org_id ==10265){
                   list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
                 }else{
-                  list[i].overDrug = this.GetDrugOver(list[i].DrugStatFlow.over_count,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
+                  list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
                 }
                 list[i].overDrugPrice = "/"
                 list[i].oveDrugSaleMoney = "/"
@@ -1256,6 +1296,111 @@ export default {
       }else{
         return max_str + min_str;
       }
+    },
+
+    GetInitStartFlow(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
+      var total_one =0
+      var total_two = 0
+      var total_three =0
+      var total_four =0
+      var total_five = 0
+      var total =0
+      var min_str = ""
+      var max_str = ""  
+      if(val1!=null && val1.length>0){
+         for(let i=0;i<val1.length;i++){
+           total_one +=val1[i].count
+         }
+      }  
+
+      if(val2!=null && val2.length>0){
+         for(let i=0;i<val2.length;i++){
+          total_two +=val2[i].count
+         }
+      }  
+    
+      console.log("val3",val3)
+      if(val3!=null && val3.length>0){
+         for(let i=0;i<val3.length;i++){
+          total_three +=val3[i].count
+         }
+      }  
+      if(val4!=null && val4.length>0){
+         for(let i=0;i<val4.length;i++){
+          total_four +=val4[i].count
+         }
+      }  
+
+      if(val5!=null && val5.length>0){
+         for(let i=0;i<val5.length;i++){
+          total_five +=val5[i].count
+         }
+      }  
+    
+      var total = total_one + total_two -total_three-total_four + total_five
+      if (total < min_number) {
+          min_str = total + min_unit;
+        }
+        if (total == 0) {
+          min_str = "";
+          max_str = "";
+        }
+        if (total >= min_number) {
+          if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+          }
+          if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+          }
+      }
+      if(max_str == "" && min_str == ""){
+        return "0"
+      }else{
+        return max_str + min_str;
+      }
+    },
+    GetInitStartFlowOne(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
+      var total_one =0
+      var total_two = 0
+      var total_three =0
+      var total_four =0
+      var total_five = 0
+      var total =0
+      var min_str = ""
+      var max_str = ""  
+      if(val1!=null && val1.length>0){
+         for(let i=0;i<val1.length;i++){
+           total_one +=val1[i].count
+         }
+      }  
+
+      if(val2!=null && val2.length>0){
+         for(let i=0;i<val2.length;i++){
+          total_two +=val2[i].count
+         }
+      }  
+    
+      console.log("val3",val3)
+      if(val3!=null && val3.length>0){
+         for(let i=0;i<val3.length;i++){
+          total_three +=val3[i].count
+         }
+      }  
+      if(val4!=null && val4.length>0){
+         for(let i=0;i<val4.length;i++){
+          total_four +=val4[i].count
+         }
+      }  
+
+      if(val5!=null && val5.length>0){
+         for(let i=0;i<val5.length;i++){
+          total_five +=val5[i].count
+         }
+      }  
+     
+      var total = total_one + total_two -total_three-total_four + total_five
+      
+      return total
     }
    },
     created(){

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -265,10 +265,12 @@ export default {
             this.loading = false
             for(let i=0;i<list.length;i++){
                
-             
-              list[i].stockIn = list[i].GoodStartFlowInfo.over_count
-
-              //list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty)
+              if(this.org_id == 10265 || this.org_id == 0){
+                list[i].stockIn = list[i].GoodStartFlowInfo.over_count
+              }else{
+                list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
+              }
+              //  list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                list[i].stock_in_price = "/"
                list[i].stockMoney = "/"
               
@@ -1015,7 +1017,7 @@ export default {
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
           this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
           this.tableList[i].specification_name_one = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
-          // this.tableList[i].stock_in_price = this.tableList[i].buy_price
+         
         }
         import('@/vendor/Export2Excel').then(excel => {
            const multiHeader = [['序号', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
@@ -1106,6 +1108,24 @@ export default {
          }
        }
        return count
+    },
+    getAllStockInFlow(val){
+      var count = 0
+      if(val!=null && val.length>0){
+        for(let i=0;i<val.length;i++){
+            count+= val[i].count
+        }
+      }
+      return count
+    },
+    getAllStockOutFlow(val){
+      var count = 0
+      if(val!=null && val.length>0){
+        for(let i=0;i<val.length;i++){
+            count+= val[i].count
+        }
+      }
+      return count
     } 
   },
 

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -167,27 +167,27 @@ export default {
                 var list = response.data.data.list
                 this.loading = false
                 for(let i=0;i<list.length;i++){
-                    list[i].stockIn = list[i].GoodStartFlowInfo.over_count
+                    // list[i].stockIn = list[i].GoodStartFlowInfo.over_count
+
+                    if(this.org_id == 10265 || this.org_id == 0){
+                       list[i].stockIn = list[i].GoodStartFlowInfo.over_count
+                    }else{
+                       list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
+                    }
                     list[i].stock_in_price = "/"
                     list[i].stockMoney = "/"
-                    // list[i].stockIn = this.getWarehouseInfoStart(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo) //期初结余
-                    // list[i].stock_in_price = this.getWarehouseInfoStartPrice(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
-                    // list[i].stockMoney = this.getWarehouseInfoStartMoney(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
+                   
                     
                     list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
-                    // list[i].addStockMoney = this.getAddStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
-                    // list[i].saleStockMoney = this.getSaleStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
+                   
                     list[i].addStockMoney = "/"
                     list[i].saleStockMoney = "/"
 
                     list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
-                    // list[i].stockOutprice = this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
-                    // list[i].saleOutMoney = this.getSaleStockMony(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
+                   
                     list[i].stockOutprice = "/"
                     list[i].saleOutprice = "/"
-                    // list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
-                    // list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
-                    // list[i].overMoney = this.getEndSalePrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
+                  
                     if(this.org_id ==0 || this.org_id ==10265){
                       list[i].overStock = list[i].GoodEndFlowInfo.over_count
                     }else{
@@ -724,6 +724,43 @@ export default {
      }
    },
 
+   getAllStockIn(val){
+       var count = 0
+      if(val!=null && val.length>0){
+        for(let i=0;i<val.length;i++){
+            count+= val[i].warehousing_count
+        }
+      }
+      return count
+    },
+    getAllOutStockIn(val){
+       var count = 0 
+       if(val!=null && val.length>0){
+         for(let i=0;i<val.length;i++){
+           count +=val[i].count
+         }
+       }
+       return count
+    },
+    getAllStockInFlow(val){
+      var count = 0
+      if(val!=null && val.length>0){
+        for(let i=0;i<val.length;i++){
+            count+= val[i].count
+        }
+      }
+      return count
+    },
+    getAllStockOutFlow(val){
+      var count = 0
+      if(val!=null && val.length>0){
+        for(let i=0;i<val.length;i++){
+            count+= val[i].count
+        }
+      }
+      return count
+    } 
+
    },
     created(){
       this.org_id =  this.$store.getters.xt_user.org_id

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -80,6 +80,24 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
                    </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 12">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 13">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 14">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 15">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 16">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 17">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
                  
                 </div>
                 <div class="printCell" v-if="org_id ==9671">
@@ -114,6 +132,25 @@
                   <span v-if="main_collection.prescription.anticoagulant == 11">
                     {{main_collection.prescription.anticoagulant_shouji}}iu
                    </span>
+                  
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 12">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 13">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 14">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 15">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 16">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 17">
+                    {{main_collection.prescription.anticoagulant_shouji}}iu
+                   </span>
                  
                 </div>
                 <div class="printCell" v-if="org_id!=9671">
@@ -151,6 +188,24 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                     iu/h
                    </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 12">
+                    iu/h
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 13">
+                    iu/h
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 14">
+                    iu/h
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 15">
+                    iu/h
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 16">
+                    iu/h
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 17">
+                    iu/h
+                   </span>
               
                 </div>
 
@@ -189,6 +244,24 @@
                   <span v-if="main_collection.prescription.anticoagulant == 11">
                     iu/h
                    </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 12">
+                    iu/h
+                   </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 13">
+                    iu/h
+                   </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 14">
+                    iu/h
+                   </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 15">
+                    iu/h
+                   </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 16">
+                    iu/h
+                   </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 17">
+                    iu/h
+                   </span>
               
                 </div>
                
@@ -227,6 +300,24 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                    iu
                    </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 12">
+                   iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 13">
+                   iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 14">
+                   iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 15">
+                   iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 16">
+                   iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 17">
+                   iu
+                   </span>
           
                 </div>
 
@@ -265,6 +356,24 @@
                   <span v-if="main_collection.prescription.anticoagulant == 11">
                    iu
                    </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 12">
+                   iu
+                   </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 13">
+                   iu
+                   </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 14">
+                   iu
+                   </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 15">
+                   iu
+                   </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 16">
+                   iu
+                   </span>
+                   <span v-if="main_collection.prescription.anticoagulant == 17">
+                   iu
+                   </span>
           
                 </div>
                 <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">