新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1221,6 +1221,15 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 15"
+                          >mg</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 16"
+                          >mg</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 17"
+                          >mg</span
+                        >
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         维持：
@@ -1279,6 +1288,15 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg/h</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 15"
+                          >mg/h</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 16"
+                          >mg/h</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 17"
+                          >mg/h</span
+                        >
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         总量：
@@ -1317,6 +1335,15 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 15"
+                          >mg</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 16"
+                          >mg</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 17"
+                          >mg</span
+                        >
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         透析机号：

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -1599,6 +1599,9 @@
                                     <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>
+                                    <span v-if="record.prescription.anticoagulant == 15">mg</span>
+                                    <span v-if="record.prescription.anticoagulant == 16">mg</span>
+                                    <span v-if="record.prescription.anticoagulant == 17">mg</span>
                               </td>
 
                               <td width="30">维持</td>
@@ -1612,6 +1615,9 @@
                                 <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>
+                                <span v-if="record.prescription.anticoagulant == 15">mg/h</span>
+                                <span v-if="record.prescription.anticoagulant == 16">mg/h</span>
+                                <span v-if="record.prescription.anticoagulant == 17">mg/h</span>
                               </td>
 
                               <td width="30">总量</td>
@@ -1625,6 +1631,9 @@
                                   <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>
+                                  <span v-if="record.prescription.anticoagulant == 15">mg</span>
+                                  <span v-if="record.prescription.anticoagulant == 16">mg</span>
+                                  <span v-if="record.prescription.anticoagulant == 17">mg</span>
                               </td>
                               <!-- <td width="70">抗凝方式:</td>
                               <td width="120">

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -667,79 +667,7 @@
                 <table class="table-box">
                   <tbody>
                     <tr>
-                      <td width="70">抗凝方式:</td>
-                      <td width="220">
-                        <div class="under-line">
-                          &nbsp;{{ prescription.anticoagulant ? prescription.anticoagulant : ' ' }}
-                        </div>
-                      </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="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="100">
-                        {{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="100">
-                        {{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="100">
-                        {{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>
+                 d
 
                       <!-- <td width="60">
                           <div class="under-line">&nbsp;{{ prescription.anticoagulant == '依诺肝素' && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : ""}}</div>
@@ -841,7 +769,7 @@
 
                 <table class="table-box">
                   <tbody>
-                    <tr> 
+                    <tr>
                       <td width="80">透析液配方:</td>
                       <td width="100">
                           <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('普通透析液') > -1 ? true : false" showValue="普通透析液"></label-box>
@@ -1116,7 +1044,7 @@
                         <td width="140">
                           <div class="under-line">&nbsp;<span>{{ afterdialysis.transfusion_volume ? afterdialysis.transfusion_volume : '' }}</span></div>
                         </td>
-                        
+
                         <td></td>
                     </tr>
                   </tbody>
@@ -1562,7 +1490,7 @@ export default {
             }
         })
         }
-        
+
         if(num == 0){
           this.$message.success('核对完成')
         }
@@ -2493,9 +2421,9 @@ export default {
 
     const xtdate = this.$route.query && this.$route.query.xtdate
     const xtno = this.$route.query && this.$route.query.xtno
-    
+
     if (typeof xtdate === 'string' && xtdate.length > 0 && typeof xtno === 'string' && xtno.length > 0) {
-      
+
       this.queryParams.xtdate = xtdate
       this.queryParams.xtno = xtno
       this.getDialysisRecord()

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

@@ -438,9 +438,14 @@ 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) 
+              if(this.org_id ==10210 || this.org_id==0){
+                 list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
+              }else{
+                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].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 = "/"

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

@@ -347,9 +347,12 @@ 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.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)
+                if(this.org_id ==10210){
+                   list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
+                }else{
+                  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 = "/"

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -265,7 +265,7 @@ export default {
             this.loading = false
             for(let i=0;i<list.length;i++){
                
-              if(this.org_id == 10265 || this.org_id == 0){
+              if(this.org_id == 0 || this.org_id ==10210){
                 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)

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -169,7 +169,7 @@ export default {
                 for(let i=0;i<list.length;i++){
                     // list[i].stockIn = list[i].GoodStartFlowInfo.over_count
 
-                    if(this.org_id == 10265 || this.org_id == 0){
+                    if(this.org_id == 0 || this.org_id ==10210){
                        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)