新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -970,6 +970,7 @@
                       <div class="inline_block" style="flex: 1">
                         透前体重：
                         <div
+                          v-if="org_id == 10580"
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
@@ -985,6 +986,18 @@
                               : "/"
                           }}
                         </div>
+                        <div
+                          v-if="org_id == 10580"
+                          class="under_line"
+                          style="width: 70px; text-align: center"
+                        >
+                          {{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis.weight_before
+                              ? parseFloat(record.assessment_before_dislysis.weight_before).toFixed(1)
+                              : "/"
+                          }}
+                        </div>
                         kg
                       </div>
                       <div class="inline_block" style="flex: 1" v-if=" org_id!=10469">

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

@@ -573,7 +573,8 @@
                 org_id!=10551 &&
                 template_id != 43 &&
                 template_id != 47 &&
-                org_id!=10558) ||
+                org_id!=10558 &&
+                org_id!=10517) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
@@ -605,7 +606,7 @@
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -24,8 +24,8 @@
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) && org_id!=10558" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410) || org_id == 10558" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27 && template_id != 60" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -986,7 +986,7 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                      <span v-if="org_id !=10447 && org_id != 9675">{{
+                      <span v-if="org_id !=10447 && org_id != 9675 && org_id!=10580">{{
                           predialysis.weight_before
                             ? parseFloat(
                                 predialysis.weight_before -
@@ -1005,6 +1005,11 @@
                             : "未称重"
                         }}
                        </span>
+                       <span v-if="org_id ==10580">
+                        {{
+                          predialysis.weight_before? parseFloat(predialysis.weight_before).toFixed(1): "未称重"
+                        }}
+                       </span>
                       </div>
                       kg
                     </div>

src/xt_pages/role/admin.vue

@@ -224,13 +224,13 @@
           style="float:left"
           @click="toAutoDrug">自动生成</el-button> -->
 
-
+<!-- 
          <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button> 
+          @click="toAutoDiagnose">自动脚本</el-button>  -->
      </div>
 
 

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -1570,7 +1570,21 @@ export default {
       getExportOutOrderDrugList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
-        
+          if(list!=null){
+            for(let i=0;i<list.length;i++){
+              list[i].count_one =0
+              if(list[i].count_unit == list[i].max_unit && list[i].max_unit!=list[i].min_unit){
+                 list[i].count_one = list[i].count * list[i].min_number
+              }
+              if(list[i].count_unit == list[i].min_unit && list[i].max_unit!=list[i].min_unit){
+                 list[i].count_one = list[i].count 
+              }
+
+              if(list[i].count_unit == list[i].max_unit && list[i].max_unit==list[i].min_unit){
+                 list[i].count_one = list[i].count 
+              }
+            }
+          }
           this.exportList = list;
           this.exportLoding = false
           this.manufacturerList = response.data.data.manufacturerList;
@@ -1631,9 +1645,9 @@ export default {
             this.exportList[i].dealer = this.dealerList[z].dealer_name;
           }
         }
-        if(this.exportList[i].retail_price ==0){
-           this.exportList[i].retail_price = (this.exportList[i].count * this.exportList[i].price).toFixed(2)
-        }
+       
+        this.exportList[i].retail_price = (this.exportList[i].count_one * this.exportList[i].min_price).toFixed(2)
+        
         this.exportList[i].ctime = this.getTime(this.exportList[i].ctime)
       }
 

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -1001,10 +1001,9 @@ export default {
               "{y}-{h}-{d}"
             );
 
-            response.data.data.list[i].stock_count =
-              response.data.data.list[i].stock_count;
-            response.data.data.list[i].last_price =
-              response.data.data.list[i].last_price;
+            response.data.data.list[i].stock_count = response.data.data.list[i].stock_count;
+            response.data.data.list[i].last_price = response.data.data.list[i].last_price;
+            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
             this.recordInfo.recordData.push(response.data.data.list[i]);
           }
 

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -913,6 +913,7 @@
             response.data.data.list[i].remark = response.data.data.list[i].remark
             response.data.data.list[i].buy_price = response.data.data.list[i].buy_price.toString()
             response.data.data.list[i].stock_count = response.data.data.list[i].stock_count.toString()
+            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
             if(response.data.data.list[i].dealer == 0){
                response.data.data.list[i].dealer = ""
             }