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

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -177,7 +177,8 @@
             ref="table_01"
             :height="tableHeight"
             :data="tableData"
-            
+            :summary-method="getSummaries_t1"
+            show-summary
             border
             highlight-current-row
             style="width: 100%"
@@ -275,7 +276,8 @@
             ref="table_01"
             :height="tableHeight"
             :data="tableData"
-           
+            :summary-method="getSummaries_t2"
+            show-summary
             border
             highlight-current-row
             style="width: 100%"
@@ -377,10 +379,11 @@
             </el-table-column>
           </el-table>
         </div>
+
         <!-- <div style="background-color: #f5f7fa;display:flex;padding: 10px;justify-content:space-around;position:absolute;width:75.6%;margin-top: 27.5%;
 "><div style="width: 40%;padding-left:3%">合计 </div> <div style="width: 40%;display: flex;justify-content:center;padding-left: 37%">{{total}}</div></div> -->
-        <div style="margin-top: 25px" v-if="state == 1">
-          领药人：
+        <div style="margin-top: 25px; display: flex" v-if="state == 1">
+          <span style="line-height: 36px;">领药人：</span> 
           <el-select v-model="admin_user_id" placeholder="请选择">
             <el-option
               v-for="item in doctorList"
@@ -390,6 +393,11 @@
             >
             </el-option>
           </el-select>
+
+          <span
+            style="display: inline-block;padding-left: 30px;line-height: 36px;}"
+            >选中： {{ select_total }}</span
+          >
         </div>
       </div>
 
@@ -493,6 +501,7 @@ export default {
       routeofadministration: [],
       deliveryway: "全部", //给药途径
       total: "", //合计
+      select_total: "",
     };
   },
 
@@ -524,16 +533,51 @@ export default {
         }
       });
     },
+
+    // 单位去重
+    unique_unit(arr) {
+      return arr.filter(function (item, index, arr) {
+        //当前元素，在原始数组中的第一个索引==当前索引值，否则返回当前元素
+        return arr.indexOf(item, 0) === index;
+      });
+    },
+
     getSummaries_t1(param) {
       const { columns, data } = param;
       const sums = [];
+      let dose_unit = [];
+      let unit_1 = [];
+      let unit_2 = [];
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = "合计";
           return;
         }
         if (index === 7) {
-          sums[index] = this.total;
+          // 单位裁切
+          data.forEach((el, index) => {
+            dose_unit.push(el.total.substr(el.total.length - 1, 1));
+          });
+          dose_unit = this.unique_unit(dose_unit);
+          // 数据合计
+          data.forEach((el, index) => {
+            if (el.total.substr(el.total.length - 1, 1) === dose_unit[0]) {
+              unit_1.push(el.total.substr(0, el.total.length - 1));
+            }
+            if (el.total.substr(el.total.length - 1, 1) === dose_unit[1]) {
+              unit_2.push(el.total.substr(0, el.total.length - 1));
+            }
+          });
+          unit_1 = eval(unit_1.join("+"));
+          unit_2 = eval(unit_2.join("+"));
+
+          if (dose_unit[0] == undefined) {
+            sums[index] = "";
+          } else if (dose_unit[1] == undefined || unit_2 == undefined) {
+            sums[index] = `${unit_1}${dose_unit[0]}`;
+          } else {
+            sums[index] = `${unit_1}${dose_unit[0]}+${unit_2}${dose_unit[1]}`;
+          }
           return;
         }
       });
@@ -544,13 +588,40 @@ export default {
     getSummaries_t2(param) {
       const { columns, data } = param;
       const sums = [];
+      let dose_unit = [];
+      let unit_1 = [];
+      let unit_2 = [];
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = "合计";
           return;
         }
         if (index === 6) {
-          sums[index] = this.total;
+          // 单位裁切
+          data.forEach((el, index) => {
+            dose_unit.push(el.total.substr(el.total.length - 1, 1));
+          });
+          dose_unit = this.unique_unit(dose_unit);
+          // 数据合计
+          data.forEach((el, index) => {
+            if (el.total.substr(el.total.length - 1, 1) === dose_unit[0]) {
+              unit_1.push(el.total.substr(0, el.total.length - 1));
+            }
+            if (el.total.substr(el.total.length - 1, 1) === dose_unit[1]) {
+              unit_2.push(el.total.substr(0, el.total.length - 1));
+            }
+          });
+          unit_1 = eval(unit_1.join("+"));
+          unit_2 = eval(unit_2.join("+"));
+
+          // sums[index] = unit_1+dose_unit[0]+ "+" +unit_2+dose_unit[1];
+          if (dose_unit[0] == undefined) {
+            sums[index] = "";
+          } else if (dose_unit[1] == undefined || unit_2 == undefined) {
+            sums[index] = `${unit_1}${dose_unit[0]}`;
+          } else {
+            sums[index] = `${unit_1}${dose_unit[0]}+${unit_2}${dose_unit[1]}`;
+          }
           return;
         }
       });
@@ -765,9 +836,47 @@ export default {
     formatJson(filterVal, jsonData) {
       return jsonData.map((v) => filterVal.map((j) => v[j]));
     },
-    //列表选择
+    //列表选择与合计
     handleSelectionChange(val) {
       this.multipleSelection = val;
+
+      let coculate = val;
+      let sums = "";
+      let dose_unit = [];
+      let unit_1 = [];
+      let unit_2 = [];
+
+      coculate.forEach((el, index) => {
+        dose_unit.push(el.total.substr(el.total.length - 1, 1));
+      });
+      dose_unit = this.unique_unit(dose_unit);
+
+      // 数据合计
+      coculate.forEach((el, index) => {
+        if (el.total.substr(el.total.length - 1, 1) === dose_unit[0]) {
+          unit_1.push(el.total.substr(0, el.total.length - 1));
+        }
+      });
+
+      coculate.forEach((el, index) => {
+        if (el.total.substr(el.total.length - 1, 1) === dose_unit[1]) {
+          console.log(el, "oooel");
+          unit_2.push(el.total.substr(0, el.total.length - 1));
+        }
+      });
+
+      unit_1 = eval(unit_1.join("+"));
+      unit_2 = eval(unit_2.join("+"));
+
+      if (dose_unit[0] == undefined) {
+        sums = "";
+      } else if (dose_unit[1] == undefined) {
+        sums = `${unit_1}${dose_unit[0]}`;
+      } else {
+        sums = `${unit_1}${dose_unit[0]}+${unit_2}${dose_unit[1]}`;
+      }
+      // sums = `${unit_1}${dose_unit[0]}+${unit_2}${dose_unit[1]}`;
+      this.select_total = sums;
     },
     //默认选中
     selectedbydefault() {
@@ -1033,15 +1142,15 @@ export default {
     this.getrouteofadministration();
     this.getgetpartitionlist();
   },
-  // updated() {
-  //   this.$nextTick(() => {
-  //     if (this.$refs["table_01"]) {
-  //       this.$refs["table_01"].doLayout();
-  //     } else if (this.$refs["table_02"]) {
-  //       this.$refs["table_02"].doLayout();
-  //     }
-  //   });
-  // },
+  updated() {
+    this.$nextTick(() => {
+      if (this.$refs["table_01"]) {
+        this.$refs["table_01"].doLayout();
+      } else if (this.$refs["table_02"]) {
+        this.$refs["table_02"].doLayout();
+      }
+    });
+  },
 };
 </script>
 

src/xt_pages/data/druguseTemplate.vue

@@ -889,7 +889,7 @@
                             v-for="item in unitsOption"
                             :key="item.id"
                             :label="item.name "
-                            :value="item.id"
+                            :value="item.name"
                           ></el-option>
                         </el-select>
                       </el-col>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1207,8 +1207,7 @@
                           <td width="60" v-if="org_id == 9836">体温(°C)</td>
                           <td
                             width="50"
-                            v-if="
-                              org_id != 10121 && org_id != 9675 && org_id != 0
+                            v-if=" org_id != 9538 && org_id != 10121 && org_id != 9675 && org_id != 0
                             "
                           >
                             电导度<br />(ms/cm)
@@ -1232,141 +1231,79 @@
                           >
                             置换量<br />(ml)
                           </td>
+
                           <td
                             width="50"
-                            v-if="
-                              org_id == 9919 || org_id == 9538 || org_id == 9675
-                            "
+                            v-if="org_id == 9919 || org_id == 9538 || org_id == 9675 || org_id == 9671 "
                           >
                             KT/V
                           </td>
                           <td
                             width="50"
-                            v-if="org_id == 9538 || org_id == 9675"
+                            v-if="org_id == 9538 || org_id == 9675 || org_id == 9671"
                           >
                             血容量<br />(L)
                           </td>
+
                           <td width="200">病情变化及处理</td>
                         </tr>
+
                         <tr
                           v-for="(monitor_record, j) in record.monitor_records"
                           :key="j"
                         >
                           <td>
-                            {{
-                              getTime(monitor_record.operate_time, "{h}:{i}")
-                            }}
+                            {{getTime(monitor_record.operate_time, "{h}:{i}")}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.systolic_blood_pressure
-                                ? monitor_record.systolic_blood_pressure + "/"
-                                : ""
-                            }}{{
-                              monitor_record.diastolic_blood_pressure
-                                ? monitor_record.diastolic_blood_pressure
-                                : ""
-                            }}
+                            {{ monitor_record.systolic_blood_pressure? monitor_record.systolic_blood_pressure + "/": ""}}
+                            {{ monitor_record.diastolic_blood_pressure? monitor_record.diastolic_blood_pressure: ""}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.pulse_frequency
-                                ? monitor_record.pulse_frequency
-                                : ""
-                            }}
+                            {{monitor_record.pulse_frequency? monitor_record.pulse_frequency: ""}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.breathing_rate
-                                ? monitor_record.breathing_rate
-                                : ""
-                            }}
+                            {{ monitor_record.breathing_rate ? monitor_record.breathing_rate: ""}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.blood_flow_volume
-                                ? monitor_record.blood_flow_volume
-                                : ""
-                            }}
+                            {{monitor_record.blood_flow_volume? monitor_record.blood_flow_volume: ""}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.venous_pressure
-                                ? monitor_record.venous_pressure
-                                : ""
-                            }}
+                            {{monitor_record.venous_pressure? monitor_record.venous_pressure: ""}}
                           </td>
                           <td>
-                            {{
-                              monitor_record.transmembrane_pressure
-                                ? monitor_record.transmembrane_pressure
-                                : ""
-                            }}
+                             {{monitor_record.transmembrane_pressure ? monitor_record.transmembrane_pressure: ""}}
                           </td>
                           <td v-if="org_id != 9836">
-                            {{
-                              monitor_record.dialysate_temperature
-                                ? monitor_record.dialysate_temperature
-                                : ""
-                            }}
+                            {{ monitor_record.dialysate_temperature? monitor_record.dialysate_temperature: ""}}
                           </td>
                           <td v-if="org_id == 9836">
-                            {{
-                              monitor_record.temperature
-                                ? monitor_record.temperature
-                                : ""
-                            }}
+                            {{monitor_record.temperature? monitor_record.temperature: ""}}
                           </td>
-                          <td
-                            v-if="
-                              org_id != 10121 && org_id != 9675 && org_id != 0
-                            "
-                          >
-                            {{
-                              monitor_record.conductivity
-                                ? monitor_record.conductivity
-                                : ""
-                            }}
-                          </td>
-                          <td
-                            v-if="
-                              org_id == 10121 || org_id == 9675 || org_id == 0
-                            "
-                          >
-                            {{
-                              monitor_record.blood_oxygen_saturation
-                                ? monitor_record.blood_oxygen_saturation
-                                : ""
-                            }}
-                          </td>
-                          <td
-                            v-if="
-                              org_id != 9538 &&
-                              org_id != 10121 &&
-                              org_id != 9675 &&
-                              org_id != 0
-                            "
-                          >
+
+                          <!-- <td v-if="org_id != 10121 && org_id != 9675 && org_id != 0">
+                            {{monitor_record.conductivity? monitor_record.conductivity : ""}}
+                          </td> -->
+                         <td v-if=" org_id != 9538 &&org_id != 10121 && org_id != 9675 &&org_id != 0">
                             {{
                               monitor_record.conductivity ? monitor_record.conductivity : ""
                             }}
                           </td>
 
+                          <td v-if="org_id == 10121 || org_id == 9675 || org_id == 0">
+                            {{monitor_record.blood_oxygen_saturation? monitor_record.blood_oxygen_saturation: ""}}
+                          </td>
+
+                        
+
                           <td v-if="org_id == 9538">
-                            {{
-                              monitor_record.sodium_concentration
-                                ? monitor_record.sodium_concentration
-                                : ""
-                            }}
+                            {{ monitor_record.sodium_concentration? monitor_record.sodium_concentration: ""}}
                           </td>
 
                           <td>
-                            <span v-if="monitor_record.operate_time">{{
-                              monitor_record.ultrafiltration_volume
-                                ? monitor_record.ultrafiltration_volume
-                                : ""
-                            }}</span>
+                            <span>{{monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: ""}}</span>
                           </td>
+
                           <td
                             v-if="
                               record.prescription.mode_id == 2 ||
@@ -1383,18 +1320,17 @@
                           </td>
                           <td
                             width="50"
-                            v-if="
-                              org_id == 9919 || org_id == 9538 || org_id == 9675
-                            "
+                            v-if="org_id == 9919 || org_id == 9538 || org_id == 9675  || org_id == 9671"
                           >
                             {{ monitor_record.ktv }}
                           </td>
                           <td
                             width="50"
-                            v-if="org_id == 9538 || org_id == 9675"
+                            v-if="org_id == 9538 || org_id == 9675 || org_id == 9671"
                           >
                             {{ monitor_record.accumulated_blood_volume }}
                           </td>
+
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="

src/xt_pages/dialysis/details/index.vue

@@ -333,7 +333,10 @@
                 
                 </div>
                 <div class="printCell" style="display:flex;justify-content: space-around;">
-                  <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}L</span>
+                  <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}
+                    <span v-if="this.$store.getters.xt_user.org.id == 10278">ml</span> 
+                    <span v-else>L</span>
+                  </span>
                   <span style="display: block;width: 50%;">
                     总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -180,19 +180,19 @@
                 showValue="低分子肝素钠:"
               ></label-box>
 
-              &nbsp;&nbsp;{{
+              &nbsp;&nbsp;<span v-if="org_id!=10090">{{
                 prescription.anticoagulant_zongliang &&
                 (prescription.anticoagulant == 3 ||
                   prescription.anticoagulant == 6 ||
                   prescription.anticoagulant == 7)
                   ? prescription.anticoagulant_zongliang
                   : ""
-              }}U；&nbsp;&nbsp;
+              }}U；</span>&nbsp;&nbsp;
               <label-box
                 :isChecked="prescription.anticoagulant == 2 ? true : false"
                 showValue="普通肝素:"
               ></label-box
-              >首剂 &nbsp;&nbsp;<span
+              ><span v-if="org_id!=10090">首剂 &nbsp;&nbsp;<span
                 ><span style="width: 35px; display: inline-block">
                   {{
                     prescription.anticoagulant_shouji &&
@@ -203,19 +203,24 @@
                   }}
                 </span></span
               >
-              mg&nbsp;&nbsp;&nbsp; 追加&nbsp;&nbsp;<span>{{
+              mg&nbsp;&nbsp;&nbsp; </span> 
+              <span v-if="org_id!=10090"> 追加&nbsp;&nbsp;<span>{{
                 prescription.anticoagulant_weichi &&
                 prescription.anticoagulant == 2
                   ? prescription.anticoagulant_weichi
                   : ""
               }}</span
-              >&nbsp;&nbsp;mg/h&nbsp; 总量&nbsp;&nbsp;<span>{{
+              >&nbsp;&nbsp;mg/h&nbsp; </span>
+              <span v-if="org_id!=10090">
+                总量&nbsp;&nbsp;<span>{{
                 prescription.anticoagulant_zongliang &&
                 prescription.anticoagulant == 2
                   ? prescription.anticoagulant_zongliang
                   : ""
               }}</span
               >&nbsp;&nbsp;mg；
+              </span>
+             
               <label-box
                 :isChecked="prescription.anticoagulant == 1 ? true : false"
                 showValue="无肝素"

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -1731,21 +1731,15 @@
                   >
                     <span v-if="advice.parent_id > 0">---></span>
                     <span>{{ advice.advice_name }}</span>
+                    <span v-if="advice.project && advice.project.project_name">{{ advice.project.project_name }}</span>
                     <span v-if="advice && advice.advice_desc"
                       >({{ advice.advice_desc
                       }}{{ advice.drug_spec_unit }})</span
                     >
-                    <span v-if="advice.prescribing_number"
-                      >&nbsp;&nbsp; {{ advice.prescribing_number
-                      }}{{ advice.prescribing_number_unit }}</span
-                    >
-                    <span v-if="advice.single_dose != 0"
-                      >{{ advice.single_dose
-                      }}{{ advice.single_dose_unit }}</span
-                    >
-                    <span v-if="advice.parent_id == 0">{{
-                      advice.delivery_way
-                    }}</span>
+                    <span v-if="advice.prescribing_number" >&nbsp;&nbsp; {{ advice.prescribing_number}}{{ advice.prescribing_number_unit }}</span>
+                    <span v-if="advice.single_dose != 0" >{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                     <span v-if="advice.project && advice.project.unit">{{ advice.project.unit }}</span>
+                    <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
                     <span v-if="advice.parent_id == 0">{{
                       advice.execution_frequency
                     }}</span>
@@ -1771,6 +1765,16 @@
                       srcset=""
                       v-else
                     />
+                    <span v-if="setAdminUserES(advice.doctor) == ''">{{
+                      getAdminUser(advice.doctor)
+                    }}</span>
+                    <img
+                      style="height: 30px"
+                      :src="setAdminUserES(advice.doctor)"
+                      alt=""
+                      srcset=""
+                      v-else
+                    />
                   </td>
                   <!-- <td height="35px">
                   <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
@@ -3099,6 +3103,7 @@ export default {
         this.prescription = response.data.data.dialysisPrescription;
         console.log("透析处方", this.prescription);
         let project_arr = response.data.data.projects
+        console.log("project_Arr2332323232",project_arr)
         project_arr.forEach(o => {
           if(o.project.project_name && o.project.project_name!=""){
             this.project.push(o)
@@ -3251,8 +3256,7 @@ export default {
           this.advices.push(item);
         }
         this.loading = false;
-        this.doctor_advices =
-          response.data.data.advices == null ? [] : response.data.data.advices.concat(this.project);
+        this.doctor_advices = response.data.data.advices == null ? [] : response.data.data.advices.concat(this.project);
           // .concat(this.project)
           console.log( this.doctor_advices,' this.doctor_advices this.doctor_advices')
         for (let index = 0; index < this.doctor_advices.length; index++) {
@@ -3337,6 +3341,7 @@ export default {
         //    this.advice_groups.push(group)
         //   }
         // }
+        console.log("dotoreadvcie233232323223",this.doctor_advices)
         if (this.doctor_advices.length <= 6) {
           var nl = 6;
           this.print_length = 6;
@@ -3354,6 +3359,7 @@ export default {
         }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
+        console.log(" this.totollength", this.totollength)
         if (this.totollength > 18) {
           var temp_advice_length = 17 - this.monitors.length;
           var doctor_advices_1 = [];
@@ -3370,6 +3376,7 @@ export default {
           this.doctor_advices_2 = doctor_advices_2;
         }
         console.log(this.doctor_advices,'doctor_advices');
+        console.log(" this.doctor_advices_2",this.doctor_advices_2)
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1188,8 +1188,8 @@
                         </td>
                       </tr>
                       <tr>
-                        <td width="60">时间</td>
-                        <td width="60">血压<br />(mmHg)</td>
+                        <td width="50">时间</td>
+                        <td width="65">血压<br />(mmHg)</td>
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -437,7 +437,10 @@
                 
                 </div>
                 <div class="printCell" style="display:flex;justify-content: space-around;">
-                  <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}L</span>
+                  <span style="display: block;width: 50%;">处方脱水量：
+                    <span v-if="this.$store.getters.xt_user.org.id == 10278">ml</span> 
+                    <span v-else>L</span>
+                    </span>
                   <span style="display: block;width: 50%;">
                     总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -563,7 +563,7 @@ export default {
        console.log("hhh2323323232",this.DialysisData)
        import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','总数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','total_count']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','total_count']
 
         const data = this.formatJson(filterVal, this.DialysisData)
 

src/xt_pages/stock/drugs/query.vue

@@ -708,9 +708,8 @@ export default {
           this.tableList[i].min_unit,
           this.tableList[i].min_number
         );
-        if (this.end_time == 0) {
           this.tableList[i].outCount = this.getWarehouseOutInfo(
-            this.tableList[i].drug_warehouse_out,
+            this.tableList[i].drug_warehouse_info,
             this.tableList[i].max_unit,
             this.tableList[i].min_unit,
             this.tableList[i].min_number
@@ -721,16 +720,16 @@ export default {
             this.tableList[i].min_unit,
             this.tableList[i].min_number
           );
-        }
-        if (this.end_time != 0) {
-          this.tableList[i].outCount =
-            this.getOutCount(this.tableList[i].id) +
-            this.getAutoCount(this.tableList[i].id);
-          this.tableList[i].overplusCount =
-            this.getWarehoseInfo(this.tableList[i].drug_warehouse_info) -
-            this.getOutCount(this.tableList[i].id) -
-            this.getAutoCount(this.tableList[i].id);
-        }
+      
+        // if (this.end_time != 0) {
+        //   this.tableList[i].outCount =
+        //     this.getOutCount(this.tableList[i].id) +
+        //     this.getAutoCount(this.tableList[i].id);
+        //   this.tableList[i].overplusCount =
+        //     this.getWarehoseInfo(this.tableList[i].drug_warehouse_info) -
+        //     this.getOutCount(this.tableList[i].id) -
+        //     this.getAutoCount(this.tableList[i].id);
+        // }
       }
       import("@/vendor/Export2Excel").then((excel) => {
         const tHeader = [
@@ -1087,10 +1086,9 @@ export default {
       var max_str = "";
       var min_str = "";
       var total = 0;
-      var newarr = arr;
-      if (newarr.length > 0) {
-        for (let i = 0; i < newarr.length; i++) {
-          total += newarr[i].stock_max_number + newarr[i].stock_min_number;
+      if (arr!=null&&arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total += arr[i].stock_max_number + arr[i].stock_min_number;
         }
       }
       if (total < min_number) {
@@ -1113,13 +1111,21 @@ export default {
     getWarehouseOutInfo(arr, max_unit, min_unit, min_number) {
       var min_str = "";
       var max_str = "";
-      var total = 0;
-      if (arr.length > 0) {
+      var total_one = 0;
+      var total_two = 0
+      var total =0 
+      if (arr!=null&&arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total_one += parseInt(arr[i].warehousing_count);
+        }
+      }
+      if (arr!=null&&arr.length > 0) {
         for (let i = 0; i < arr.length; i++) {
-          total += parseInt(arr[i].count);
+          total_two += parseInt(arr[i].stock_max_number)+ parseInt(arr[i].stock_min_number);
         }
       }
 
+      total = total_one - total_two
       if (total < min_number) {
         min_str = total + min_unit;
       }

src/xt_pages/user/components/PatientDetail.vue

@@ -1000,7 +1000,7 @@
               <div class="proj">
                 <span class="proj_title">日期：</span>
                 <!-- {{ getTime(patientPrint.created_time) }} -->
-                <span v-if="org_id == 3907 || org_id == 9671|| org_id == 10138|| org_id == 9675">{{
+                <span v-if="org_id == 3907 || org_id == 9671|| org_id == 10138|| org_id == 9675 || org_id == 10394">{{
                   getTime(patientPrint.created_time)
                 }}</span>
                 <span v-else>{{ printDate }}</span>