新分支

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -187,36 +187,41 @@
                 <span>{{ scope.row.Name ? scope.row.Name : "" }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="单次用量" width="150" align="center">
+            <el-table-column label="规格" width="100" align="center">
+              <template slot-scope="scope">
+                <span>{{getSpecaiName(scope.row.DrugId)}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="单次用量" width="100" align="center">
               <template slot-scope="scope">
                 <span>{{
                   scope.row.SingleDosage ? scope.row.SingleDosage : ""
                 }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="用法" width="160" align="center">
+            <el-table-column label="用法" width="100" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Usage ? scope.row.Usage : "" }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="频率" width="160" align="center">
+            <el-table-column label="频率" width="100" align="center">
               <template slot-scope="scope">
                 <span>{{
                   scope.row.Frequency ? scope.row.Frequency : ""
                 }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="天数" width="140" align="center">
+            <el-table-column label="天数" width="100" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Days ? scope.row.Days : "" }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="总量" width="140" align="center">
+            <el-table-column label="总量" width="100" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Total ? scope.row.Total : "" }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="生产厂商" width="140" align="center">
+            <el-table-column label="生产厂商" width="100" align="center">
               <template slot-scope="scope">
                 <span>{{ getManutuer(scope.row.DrugId) }}</span>
               </template>
@@ -559,6 +564,7 @@ export default {
             this.tableData = []
             this.tableData = list
           }
+          console.log("tableDatawoowow",this.tableData)
         } else {
           this.$message.error(res.data.msg);
         }
@@ -733,6 +739,15 @@ export default {
          }
        }
        return manufacturer_name
+    },
+    getSpecaiName(drug_id){
+       var spc =""
+       for(let i=0;i<this.baseList.length;i++){
+         if(drug_id == this.baseList[i].id){
+           spc = this.baseList[i].dose + this.baseList[i].dose_unit +"*"+this.baseList[i].min_number+this.baseList[i].min_unit+"/"+this.baseList[i].max_unit
+         }
+       }
+       return spc
     }
   },
 };

src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue

@@ -782,7 +782,7 @@
                           class="under_line"
                           style="width: 130px; text-align: center"
                         >
-                          {{
+                         <span v-if="record.assessment_before_dislysis&&record.assessment_before_dislysis.symptom_before_dialysis!=''">{{
                             record.assessment_before_dislysis &&
                             record.assessment_before_dislysis
                               .symptom_before_dialysis
@@ -790,6 +790,19 @@
                                   .symptom_before_dialysis
                               : "/"
                           }}
+                          </span>
+                          <span v-if="record.assessment_before_dislysis&&record.assessment_before_dislysis.symptom_before_dialysis_other!=''">{{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis
+                              .symptom_before_dialysis_other
+                              ? record.assessment_before_dislysis
+                                  .symptom_before_dialysis_other
+                              : "/"
+                          }}
+                          </span>
+                          <span v-if="record.assessment_before_dislysis&&record.assessment_before_dislysis.symptom_before_dialysis=='' && record.assessment_before_dislysis&&record.assessment_before_dislysis.symptom_before_dialysis_other==''" >
+                             /
+                          </span>
                         </div>
                       </div>
 

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -970,7 +970,7 @@
                       <div class="inline_block" style="flex: 1">
                         透前体重：
                         <div
-                          v-if="org_id == 10580"
+                          v-if="org_id != 10580"
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
@@ -1834,7 +1834,7 @@
                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
-                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id == 0 || org_id ==10206">核对护士</td>
+                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id == 0 || org_id ==10206 || org_id == 10571 || org_id ==10600">核对护士</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
 
@@ -1942,7 +1942,7 @@
                                 getTime(advice[0].execution_time, " {h}:{i}")
                               }}</span>
                             </td>
-                            <td height="35px" v-if="org_id == 10375 || org_id ==0||org_id ==10206">
+                            <td height="35px" v-if="org_id == 10375 || org_id ==0||org_id ==10206|| org_id == 10571 || org_id ==10600">
                               <span
                                 v-if="
                                   setAdminUserES(

src/xt_pages/dialysis/details/consumable/dialysisGather.vue

@@ -166,10 +166,26 @@
 
           <el-table-column align="center" label="抗凝剂(首剂)(维持)(总量)"  v-if="gatherSetting.anticoagulant==1">
              <template slot-scope="scope">
-               <span>{{getAnticoagualnt(scope.row.dialysis_prescription.anticoagulant)}}</span>
-               <span v-if="scope.row.dialysis_prescription.anticoagulant_shouji > 0">({{scope.row.dialysis_prescription.anticoagulant_shouji}})</span>
-               <span v-if="scope.row.dialysis_prescription.anticoagulant_weichi > 0">({{scope.row.dialysis_prescription.anticoagulant_weichi}})</span>
-               <span v-if="scope.row.dialysis_prescription.anticoagulant_zongliang > 0">({{scope.row.dialysis_prescription.anticoagulant_zongliang}})</span>
+              
+               <span v-if="scope.row.schedule_date == timenow">
+                <span>{{getAnticoagualnt(scope.row.dialysis_prescription.anticoagulant)}}</span>
+                <span v-if="scope.row.dialysis_prescription.anticoagulant_shouji > 0">({{scope.row.dialysis_prescription.anticoagulant_shouji}})</span>
+                <span v-if="scope.row.dialysis_prescription.anticoagulant_weichi > 0">({{scope.row.dialysis_prescription.anticoagulant_weichi}})</span>
+                <span v-if="scope.row.dialysis_prescription.anticoagulant_zongliang > 0">({{scope.row.dialysis_prescription.anticoagulant_zongliang}})</span>
+              </span>
+               <span v-if="scope.row.schedule_date<timenow">
+                <span>{{getAnticoagualnt(scope.row.dialysis_prescription.anticoagulant)}}</span>
+                <span v-if="scope.row.dialysis_prescription.anticoagulant_shouji > 0">({{scope.row.dialysis_prescription.anticoagulant_shouji}})</span>
+                <span v-if="scope.row.dialysis_prescription.anticoagulant_weichi > 0">({{scope.row.dialysis_prescription.anticoagulant_weichi}})</span>
+                <span v-if="scope.row.dialysis_prescription.anticoagulant_zongliang > 0">({{scope.row.dialysis_prescription.anticoagulant_zongliang}})</span>
+               </span>
+               <span v-if="scope.row.schedule_date>timenow">
+                <span>{{getAnticoagualnt(scope.row.dialysis_solution.anticoagulant)}}</span>
+                <span v-if="scope.row.dialysis_solution.anticoagulant_shouji > 0">({{scope.row.dialysis_solution.anticoagulant_shouji}})</span>
+                <span v-if="scope.row.dialysis_solution.anticoagulant_weichi > 0">({{scope.row.dialysis_solution.anticoagulant_weichi}})</span>
+                <span v-if="scope.row.dialysis_solution.anticoagulant_zongliang > 0">({{scope.row.dialysis_solution.anticoagulant_zongliang}})</span>
+
+               </span>
              </template>
           </el-table-column>
 

src/xt_pages/dialysis/details/consumable/dialysisGatherPrint.vue

@@ -118,10 +118,28 @@
                     <span v-if="(getBloodAccessOption(item.dialysis_prescription.blood_access)).indexOf('内瘘')!=-1">1</span>
                   </td>
                   <td width="100" v-if="gatherSetting.anticoagulant==1">
-                    <span>{{getAnticoagualnt(item.dialysis_prescription.anticoagulant)}}</span>
-                    <span v-if="item.dialysis_prescription.anticoagulant_shouji > 0">({{item.dialysis_prescription.anticoagulant_shouji}})</span>
-                    <span v-if="item.dialysis_prescription.anticoagulant_weichi > 0">({{item.dialysis_prescription.anticoagulant_weichi}})</span>
-                    <span v-if="item.dialysis_prescription.anticoagulant_zongliang > 0">({{item.dialysis_prescription.anticoagulant_zongliang}})</span>
+                  
+
+                    <span v-if="item.schedule_date == timenow">
+                      <span>{{getAnticoagualnt(item.dialysis_prescription.anticoagulant)}}</span>
+                      <span v-if="item.dialysis_prescription.anticoagulant_shouji > 0">({{item.dialysis_prescription.anticoagulant_shouji}})</span>
+                      <span v-if="item.dialysis_prescription.anticoagulant_weichi > 0">({{item.dialysis_prescription.anticoagulant_weichi}})</span>
+                      <span v-if="item.dialysis_prescription.anticoagulant_zongliang > 0">({{item.dialysis_prescription.anticoagulant_zongliang}})</span>
+                    </span>
+
+                    <span v-if="item.schedule_date < timenow">
+                      <span>{{getAnticoagualnt(item.dialysis_prescription.anticoagulant)}}</span>
+                      <span v-if="item.dialysis_prescription.anticoagulant_shouji > 0">({{item.dialysis_prescription.anticoagulant_shouji}})</span>
+                      <span v-if="item.dialysis_prescription.anticoagulant_weichi > 0">({{item.dialysis_prescription.anticoagulant_weichi}})</span>
+                      <span v-if="item.dialysis_prescription.anticoagulant_zongliang > 0">({{item.dialysis_prescription.anticoagulant_zongliang}})</span>
+                    </span>
+
+                    <span v-if="item.schedule_date > timenow">
+                      <span>{{getAnticoagualnt(item.dialysis_solution.anticoagulant)}}</span>
+                      <span v-if="item.dialysis_solution.anticoagulant_shouji > 0">({{item.dialysis_solution.anticoagulant_shouji}})</span>
+                      <span v-if="item.dialysis_solution.anticoagulant_weichi > 0">({{item.dialysis_solution.anticoagulant_weichi}})</span>
+                      <span v-if="item.dialysis_solution.anticoagulant_zongliang > 0">({{item.dialysis_solution.anticoagulant_zongliang}})</span>
+                    </span>
                  </td>
                   <td width="200" v-if="gatherSetting.tube==1">
                     <span v-if="getBloodAccessOption(item.dialysis_prescription.blood_access).indexOf('导管')!==-1">1</span>

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

@@ -1000,6 +1000,11 @@ export default {
       if (this.form.weight_after == '') {
         this.form.weight_loss = ''
       }
+
+      if(this.predialysis_evaluation!=null){
+         
+        this.form.additional_weight = this.predialysis_evaluation.additional_weight
+      }
       
     }
   },

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

@@ -2818,8 +2818,8 @@ mu
         } else {
           last_weight_after = this.last_record.weight_after
         }
-        console.log("last2323232323232332wode",this.predialysis)
-        console.log("lastwoowowow",last)
+        // console.log("last2323232323232332wode",this.predialysis)
+        // console.log("lastwoowowow",last)
         if(this.predialysis!=null && this.predialysis.id == 0){
             if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10600){
               this.dialysisPrescription.sodium = 138
@@ -2831,6 +2831,13 @@ mu
             if(this.$store.getters.xt_user.org.id == 10447 || this.$store.getters.xt_user.org.id == 10600){
               this.dialysisPrescription.dialysate_flow = 500
             }
+
+            if(this.$store.getters.xt_user.org.id == 10598){
+               if(this.dialysisPrescription.dialysis_duration_minute == ""){
+                 this.dialysisPrescription.dialysis_duration_minute =0
+
+               }
+            }
         }
         if (this.predialysis == null || this.predialysis.id == 0) {
 

src/xt_pages/dialysis/details/index.vue

@@ -2238,7 +2238,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587){
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0

src/xt_pages/dialysis/signPrint.vue

@@ -135,6 +135,7 @@ export default {
             execution_frequency:this.execution_frequency,
             patient_id:this.$route.query.patient_id,
             keyword:this.$route.query.keyword,
+            excution_way:this.excution_way
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
@@ -497,9 +498,49 @@ export default {
                   }
                   console.log("哈哈哈",schedules)
                    this.list = schedules.sort(this.compare('sort'))
+                   
+                   //未执行
+                   if(this.$route.query.excution_way == 2){
+                      if(this.list!=null){
+                        for(let i=0;i<this.list.length;i++){
+                            this.list[i].doctor_advice_map = []
+                          for(let j=0;j<this.list[i].parent_advice.length;j++){
+                              if(this.list[i].parent_advice[j].execution_state!=1){
+                                 this.list[i].doctor_advice_map.push(this.list[i].parent_advice[j])
+                              }
+                              
+                          }
+                          this.list[i].parent_advice= []
+                          if(this.list[i].doctor_advice_map!=null){
+                            this.list[i].parent_advice.push(...this.list[i].doctor_advice_map)
+                          }
+                          
+                        }
+                      }
+                   }
+
+                   if(this.$route.query.excution_way == 1){
+                     for(let i=0;i<this.list.length;i++){
+                            this.list[i].doctor_advice_map = []
+                          for(let j=0;j<this.list[i].parent_advice.length;j++){
+                              if(this.list[i].parent_advice[j].execution_state==1){
+                                 this.list[i].doctor_advice_map.push(this.list[i].parent_advice[j])
+                              }
+                              
+                          }
+                          this.list[i].parent_advice= []
+                          if(this.list[i].doctor_advice_map!=null){
+                            this.list[i].parent_advice.push(...this.list[i].doctor_advice_map)
+                          }
+                         
+                        }
+                   }
+                
                  
                    this.scheduleMap = scheduleMap  
                  }
+
+
                 console.log("this.list",this.list)
                 
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

@@ -758,11 +758,17 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
+                       <span v-if="predialysis&&predialysis.symptom_before_dialysis!=''">
                         {{
                           predialysis.symptom_before_dialysis
                             ? predialysis.symptom_before_dialysis
                             : "/"
                         }}
+                       </span> 
+                       <span v-if="predialysis&&predialysis.symptom_before_dialysis_other!=''">
+                         {{ predialysis.symptom_before_dialysis_other?predialysis.symptom_before_dialysis_other:"/" }}
+                       </span>
+                       <span v-if="predialysis&&predialysis.symptom_before_dialysis==''&&predialysis.symptom_before_dialysis_other==''">/</span>
                       </div>
                     </div>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -316,34 +316,69 @@
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
-                      v-if="org_id!=10580 && org_id !=0"
+                      v-if="(org_id == 10598 || org_id == 0) &&  predialysis.internal_fistula!=''"
                     >
                       穿刺方式：
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
-                        v-if="predialysis.puncture_way == ''"
+                        v-if="predialysis&&predialysis.puncture_way == ''"
                       >
                          /
                       </div>
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
-                        v-if="predialysis.puncture_way.indexOf('绳梯') > -1"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('绳梯') > -1"
                       >
                         绳梯
                       </div>
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
-                        v-if="predialysis.puncture_way.indexOf('扣眼') > -1"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('扣眼') > -1"
                       >
                         扣眼
                       </div>
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
-                        v-if="predialysis.puncture_way.indexOf('区域') > -1"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('区域') > -1"
+                      >
+                        区域
+                      </div>
+                    </div>
+                    <div
+                      class="inline_block"
+                      style="margin-left: 10px; flex: 1"
+                      v-if="org_id!=10580 && org_id !=0 && org_id!=10598"
+                    >
+                      穿刺方式：
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                        v-if="predialysis&&predialysis.puncture_way == ''"
+                      >
+                         /
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('绳梯') > -1"
+                      >
+                        绳梯
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('扣眼') > -1"
+                      >
+                        扣眼
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('区域') > -1"
                       >
                         区域
                       </div>
@@ -358,13 +393,37 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                         {{ dialysisOrder.puncture_way }}
+                         {{ dialysisOrder&&dialysisOrder.puncture_way }}
                       </div>
                       
                     </div>
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
+                      v-if="(org_id == 10598 || org_id == 0) &&  predialysis.internal_fistula!=''"
+                    >
+                      穿刺针：
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                      >
+                      <span v-if="org_id==10580 || org_id==0">
+                        {{ dialysisOrder.puncture_needle}}
+                      </span>
+                      <span v-if="org_id != 10580 && org_id!=0">
+                        {{
+                          predialysis.puncture_needle
+                            ? predialysis.puncture_needle
+                            : "/"
+                        }}
+                      </span>
+                       
+                      </div>
+                    </div>
+                    <div
+                      class="inline_block"
+                      style="margin-left: 10px; flex: 1"
+                      v-if="org_id != 10598"
                     >
                       穿刺针：
                       <div
@@ -750,6 +809,7 @@
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
+                      v-if="org_id==10598 && prescription.mode_id == 2"
                     >
                       置换方式：
                       <div
@@ -761,8 +821,25 @@
                         }}
                       </div>
                     </div>
+
                     <div
-                     
+                      class="inline_block"
+                      style="margin-left: 10px; flex: 1"
+                      v-if="org_id!=10598"
+                    >
+                      置换方式：
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                      >
+                        {{
+                          getDisplaceLiquiPart(prescription.displace_liqui_part)
+                        }}
+                      </div>
+                    </div>
+
+                    <div
+                      v-if="org_id==10598 && prescription.mode_id == 2"
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
                     >
@@ -786,6 +863,32 @@
                       </div>
                       L
                     </div>
+
+                    <div
+                      v-if="org_id!=10598"
+                      class="inline_block"
+                      style="margin-left: 10px; flex: 1"
+                    >
+                      置换量：
+                      <div
+                        class="under_line"
+                        style="width: 70px; text-align: center"
+                      >
+                      <span v-if="org_id ==10206"> {{
+                          prescription.replacement_total
+                            ? prescription.replacement_total
+                            : "/"
+                        }}
+                        </span> 
+                        <span v-if="org_id!=10206"> {{
+                          prescription.displace_liqui_value
+                            ? prescription.displace_liqui_value
+                            : "/"
+                        }}
+                        </span> 
+                      </div>
+                      L
+                      </div>
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
@@ -1089,7 +1192,7 @@
                       </div>
                       mmol/L
                     </div>
-                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478">
+                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478 && org_id!=10598">
                       碳酸氢根：
                       <div
                         class="under_line"
@@ -1103,7 +1206,7 @@
                       </div>
                       mmol/L
                     </div>
-                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478">
+                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478&&org_id!=10598">
                       流量：
                       <div
                         class="under_line"
@@ -1508,6 +1611,7 @@
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>  
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
                         <td width="50" v-if="org_id == 10490 || org_id == 0">碳酸氢钠<br />(ml)</td>
+                        <td width="50" v-if="org_id == 10598 || org_id == 0">护士签名</td>
                         <td width="200">病情变化及处理</td>
                       </tr>
 
@@ -1640,6 +1744,35 @@
                         <td width="50" v-if="org_id ==10490 || org_id == 0">
                           {{ monitor.dicarbonate?monitor.dicarbonate:"" }}
                         </td>
+                        <td width="50" v-if="org_id == 10598 || org_id == 0">
+                          <span v-if="monitor.creator == 0">
+                            <span
+                            v-if="setAdminUserES(monitor.modify) == ''"
+                            >{{ getAdminUser(monitor.modify) }}</span
+                          >
+                          <img
+                            style="height: 30px"
+                            :src="setAdminUserES(monitor.modify)"
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                          </span>
+
+                          <span v-if="monitor.creator > 0">
+                            <span
+                            v-if="setAdminUserES(monitor.creator) == ''"
+                            >{{ getAdminUser(monitor.creator) }}</span
+                          >
+                          <img
+                            style="height: 30px"
+                            :src="setAdminUserES(monitor.creator)"
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                          </span>
+                        </td>
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -1704,6 +1837,7 @@
                         ></td>
                         <td v-if="org_id == 9919||org_id == 9538 || org_id == 9671"></td>
                         <td v-if="org_id == 9538"></td>
+                        <td v-if="org_id == 10598 || org_id == 0"></td>
                         <td v-if="org_id == 10490 || org_id == 0"></td>
                         <td style="line-height: 16px; padding: 0px">
                           <div
@@ -1768,7 +1902,7 @@
                         <td
                           style="font-size: 16px"
                           width="10%"
-                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
+                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375 || org_id ==10571 || org_id ==10600"
                         >
                           核对护士
                         </td>
@@ -1864,7 +1998,7 @@
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
                         </td>
-                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
+                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375 || org_id ==10571 || org_id ==10600">
                           <span v-if="advice!=null && advice.checker>0">
                             <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
                             <img

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/components/purchaseDrugQuery.vue

@@ -389,25 +389,33 @@ export default {
              }
             }
 
-            console.log("list23323223322332232323322323wode",list)
+          
             for(let i=0;i<list.length;i++){
               list[i].last_price_in = 0
+              list[i].drugInOne = 0
+              list[i].drugAddOne =0
+              list[i].drugOutOne =0
               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].drugInOne = this.getDrugWarehouseInfoTwentyOne(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].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.drugAddInfoTwetyOne(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].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.getDrugOutTwetyOne(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].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].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].overDrug = this.getOverDrug(list[i].drugInOne,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
               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)
             }
+            console.log("我的世界搜哦对哦奥法",list)
             this.tableList = list;
             this.total = response.data.data.total
             this.manufacturerList = response.data.data.manufacturerList
@@ -525,10 +533,7 @@ export default {
       totalfive += arr5[i].count
      }
   }
-  // console.log("totalONE223323232323232",totalOne)
-  // console.log("totalTwo2oo2o32o3o32o23",totalTwo)
-  // console.log("totalfive",totalfive)
-  // console.log("00-------------------------")
+  
   total = totalOne - totalTwo + totalthree - totalfour + totalfive
   if (total < min_number) {
      min_str = total + min_unit;
@@ -554,6 +559,48 @@ export default {
   }
 
 
+  },
+
+  getDrugWarehouseInfoTwentyOne(arr,min_number,min_unit,max_unit,arr2,arr3,arr4,arr5){
+   var total = 0
+   var totalOne =0
+   var totalTwo = 0
+   var totalthree= 0
+   var totalfour = 0
+   var totalfive = 0
+   var max_str = "";
+   var min_str = "";
+   if(arr!=null && arr.length > 0){
+    for(let i=0;i<arr.length;i++){
+      totalOne += arr[i].count
+     }
+   }
+   if(arr2!=null && arr2.length > 0){
+    for(let i=0;i<arr2.length;i++){
+      totalTwo += arr2[i].count
+     }
+   }
+   if(arr3!=null && arr3.length > 0){
+    for(let i=0;i<arr3.length;i++){
+      totalthree += arr3[i].count
+     }
+   }
+  if(arr4!=null && arr4.length > 0){
+    for(let i=0;i<arr4.length;i++){
+      totalfour += arr4[i].count
+     }
+  }
+
+  if(arr5!=null && arr5.length > 0){
+    for(let i=0;i<arr5.length;i++){
+      totalfive += arr5[i].count
+     }
+  }
+  
+  total = totalOne - totalTwo + totalthree - totalfour + totalfive
+ 
+  
+   return total
   },
   getDrugWarehouseInfo(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
    var total = 0
@@ -1061,6 +1108,30 @@ export default {
     }
 
    },
+
+  drugAddInfoTwetyOne(arr,min_number,min_unit,max_unit,arr2){
+    var total = 0
+    var totalone = 0
+    var totaltwo = 0
+    var max_str = "";
+    var min_str = "";
+    if(arr!=null && arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        totalone += arr[i].count
+      }
+    }
+    if(arr2!=null && arr2.length >0){
+      for(let i=0;i<arr2.length;i++){
+        totaltwo += arr2[i].count
+      }
+    }
+    total = totalone + totaltwo
+
+    
+    
+    return total
+
+   },
    getdrugAddPrice(arr,min_number,min_unit,max_unit,arr2){
     var total = 0
     var totalone =0
@@ -1148,6 +1219,33 @@ export default {
     return max_str + min_str;
    }
 
+   },
+   getDrugOutTwetyOne(arr,min_number,min_unit,max_unit,arr2,arr3){
+    var total = 0
+    var totalone = 0
+    var totaltwo = 0
+    var totalthree = 0
+    var min_str = ""
+    var max_str = ""
+    if(arr!=null&&arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+         totalone +=arr[i].count
+      }
+    }
+    if(arr2!=null && arr2.length>0){
+      for(let i=0;i<arr2.length;i++){
+        totaltwo +=arr2[i].count
+      }
+    }
+    if(arr3!=null && arr3.length>0){
+      for(let i=0;i<arr3.length;i++){
+        totalthree +=arr3[i].count
+      }
+    }
+    total = totalone + totaltwo - totalthree
+     
+    return total
+
    },
    getDrugOutPrice(arr,min_number,min_unit,max_unit,arr2,arr3){
 
@@ -1263,6 +1361,30 @@ export default {
       }
       return dear_name
     },
+    getOverDrug(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
+      var total = 0
+      total = totalone + totaltwo - totalthree
+      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;
+    }
+   }
   }
 }
 </script>

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

@@ -392,6 +392,8 @@ export default {
             console.log("list23323223322332232323322323wode",list)
             for(let i=0;i<list.length;i++){
               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)
@@ -400,12 +402,14 @@ export default {
               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 = "/"
@@ -414,7 +418,8 @@ export default {
             //   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)
-             list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
+            //  list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
+             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].overDrugPrice = "/"
              list[i].oveDrugSaleMoney = "/"
             }
@@ -815,12 +820,7 @@ export default {
    }
 
    total_price =(totalOne - totalTwo + total_three - total_four + totalFive).toFixed(2)
-   console.log("totalONE232332323323223322323wi",totalOne)
-   console.log("totalTwo99999999999999988888888",totalTwo)
-   console.log("total_three99999999999999988888888",total_three)
-   console.log("total_four99999999999999988888888",total_four)
-   console.log("totalFive99999999999999988888888",totalFive)
-   console.log("-------------------------------------------")
+ 
    if(total_price >0){
     return total_price
    }else{
@@ -1071,6 +1071,28 @@ export default {
       return max_str + min_str
     }
 
+   },
+   drugAddInfoOne(arr,min_number,min_unit,max_unit,arr2){
+    var total = 0
+    var totalone = 0
+    var totaltwo = 0
+    var max_str = "";
+    var min_str = "";
+    if(arr!=null && arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        totalone += arr[i].count
+      }
+    }
+    if(arr2!=null && arr2.length >0){
+      for(let i=0;i<arr2.length;i++){
+        totaltwo += arr2[i].count
+      }
+    }
+    total = totalone + totaltwo
+
+    
+    return total
+
    },
    getdrugAddPrice(arr,min_number,min_unit,max_unit,arr2){
     var total = 0
@@ -1162,6 +1184,33 @@ export default {
     return max_str + min_str;
    }
 
+   },
+   getDrugOutOne(arr,min_number,min_unit,max_unit,arr2,arr3){
+    var total = 0
+    var totalone = 0
+    var totaltwo = 0
+    var totalthree = 0
+    var min_str = ""
+    var max_str = ""
+    if(arr!=null&&arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+         totalone +=arr[i].count
+      }
+    }
+    if(arr2!=null && arr2.length>0){
+      for(let i=0;i<arr2.length;i++){
+        totaltwo +=arr2[i].count
+      }
+    }
+    if(arr3!=null && arr3.length>0){
+      for(let i=0;i<arr3.length;i++){
+        totalthree +=arr3[i].count
+      }
+    }
+    total = totalone + totaltwo - totalthree
+    
+    return total
+
    },
    getDrugOutPrice(arr,min_number,min_unit,max_unit,arr2,arr3){
 
@@ -1292,6 +1341,8 @@ export default {
             return max_str + min_str;
         }
     },
+
+  
     GetDrugEndFlow(total,min_number,min_unit,max_unit){
 
      var min_str = ""
@@ -1334,6 +1385,32 @@ export default {
       }
       return dear_name
     },
+    GetDrugOver(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
+      var total = 0
+      var min_str = ""
+      var max_str = ""  
+       total = totalone + totaltwo - totalthree
+        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;
+      }
+    }
   }
 }
 </script>

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

@@ -301,6 +301,9 @@ export default {
 
             for(let i=0;i<list.length;i++){
                 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)
@@ -309,12 +312,14 @@ export default {
                 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 = "/"
@@ -323,7 +328,8 @@ export default {
                 //   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)
-                list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
+                // list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
+                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].overDrugPrice = "/"
                 list[i].oveDrugSaleMoney = "/"
             }
@@ -957,6 +963,27 @@ export default {
       return max_str + min_str;
     }
 
+   },
+   drugAddInfoOne(arr,min_number,min_unit,max_unit,arr2){
+    var total = 0
+    var totalone = 0
+    var totaltwo = 0
+    var max_str = "";
+    var min_str = "";
+    if(arr!=null && arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        totalone += arr[i].count
+      }
+    }
+    if(arr2!=null && arr2.length >0){
+      for(let i=0;i<arr2.length;i++){
+        totaltwo += arr2[i].count
+      }
+    }
+    total = totalone + totaltwo
+
+    return total
+
    },
     getdrugAddPrice(arr,min_number,min_unit,max_unit,arr2){
     var total = 0
@@ -1046,7 +1073,34 @@ export default {
    }
 
    },
-     getDrugOutPrice(arr,min_number,min_unit,max_unit,arr2,arr3){
+   getDrugOutOne(arr,min_number,min_unit,max_unit,arr2,arr3){
+    var total = 0
+    var totalone = 0
+    var totaltwo = 0
+    var totalthree = 0
+    var min_str = ""
+    var max_str = ""
+    if(arr!=null&&arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+         totalone +=arr[i].count
+      }
+    }
+    if(arr2!=null && arr2.length>0){
+      for(let i=0;i<arr2.length;i++){
+        totaltwo +=arr2[i].count
+      }
+    }
+    if(arr3!=null && arr3.length>0){
+      for(let i=0;i<arr3.length;i++){
+        totalthree +=arr3[i].count
+      }
+    }
+    total = totalone + totaltwo - totalthree
+    
+    return total
+
+   },
+   getDrugOutPrice(arr,min_number,min_unit,max_unit,arr2,arr3){
 
     var total_price = 0
     var total_one_price =0
@@ -1139,6 +1193,7 @@ export default {
             return max_str + min_str;
         }
     },
+
     GetDrugEndFlow(total,min_number,min_unit,max_unit){
 
      var min_str = ""
@@ -1173,6 +1228,32 @@ export default {
       }
       return dear_name
     },
+    GetDrugOver(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
+      var total = 0
+      var min_str = ""
+      var max_str = ""  
+       total = totalone + totaltwo - totalthree
+        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;
+      }
+    }
    },
     created(){
       this.org_id =  this.$store.getters.xt_user.org_id

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -286,7 +286,8 @@ export default {
               // 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)
-              list[i].overStock = list[i].GoodEndFlowInfo.over_count
+              // list[i].overStock = list[i].GoodEndFlowInfo.over_count
+              list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
               list[i].overPrice = "/"
               list[i].overMoney = "/"
              

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -188,7 +188,8 @@ export default {
                     // 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)
-                    list[i].overStock = list[i].GoodEndFlowInfo.over_count
+                    // list[i].overStock = list[i].GoodEndFlowInfo.over_count
+                    list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
                     list[i].overPrice = "/"
                     list[i].overMoney = "/"
                 

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -262,7 +262,9 @@ export default {
               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].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
+              // list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
+
+              list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
               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)
              

src/xt_pages/stock/query/purchaseStockQueryPrint.vue

@@ -172,7 +172,8 @@ export default {
                   list[i].stockOutprice = this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
                   list[i].saleOutMoney = this.saleOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
                   
-                  list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
+                  list[i].overStock = list[i].stockIn + list[i].stockAdd -list[i].outStock
+                  // 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)
                 

src/xt_pages/user/doctorAdvice.vue

@@ -199,7 +199,9 @@
           <template slot-scope="scope">
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
               <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
-                <span v-if="scope.row.frequency_type >0" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
+                <span v-if="scope.row.frequency_type ==1" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
+                <span v-if="scope.row.frequency_type ==2 && scope.row.day_count>0" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
+                <span v-if="scope.row.frequency_type ==3 && scope.row.week_day!=''" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
                 <span v-if="scope.row.frequency_type ==0"> {{ scope.row.advice_name}}</span>
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
@@ -4432,13 +4434,13 @@ export default {
       // this.sameRowArr = sameRowArr;
     },
     mergeSpan({ row, column, rowIndex, columnIndex }) {
-      console.log("row29292929",columnIndex)
-      console.log("conlumnindex",this.tempArr)
+      // console.log("row29292929",columnIndex)
+      // console.log("conlumnindex",this.tempArr)
       if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2) {
         const _row = this.tempArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
-        console.log("_row--------------",_row)
-        console.log("_col",_col)
+        // console.log("_row--------------",_row)
+        // console.log("_col",_col)
         return {
           rowspan: _row,
           colspan: _col