新分支

src/xt_pages/data/components/addDrugs.vue

                                 <el-checkbox label="注射类">注射类</el-checkbox>
                             </el-checkbox-group>
                         </el-form-item>
-                        <el-form-item label="限制说明 : " prop="limit_remark" style="width:100%;">
+                        <el-form-item label="药品追溯码 : " prop="limit_remark" style="width:100%;">
                             <el-input type="form.restrictions" :rows="2" placeholder="请输入内容"
                                       v-model="form.limit_remark"></el-input>
                         </el-form-item>

src/xt_pages/data/components/drugs.vue

           is_record: '',//是否备案
           agent: '',// 代理商
           drug_status: '',// 状态
-          limit_remark: '',//限制说明
+          limit_remark: '',//药品追溯码
           delivery_way: '',//默认给药途径
           execution_frequency: '',//默认执行频率
           single_dose: '',//默认单次用量

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                         </div>
                       </div>
 
-                      
+                      <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex" v-if="org_id == 0|| org_id ==10598">
+                        在线Kt/V监测：
+                        <div class="under_line" style="width: 30px; text-align: center">
+                           <check-box :checked="true"></check-box>
+                         </div>
+                      </div>
                       <div
                         class="row"
                         style="padding: 2px 0; line-height: 23px; display: flex"

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

             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10693){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '6:40'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            }else if (this.$store.getters.xt_user.org.id == 10551){
             var date = new Date()
             var year = date.getFullYear()

src/xt_pages/dialysis/details/index.vue

               <div class="signPrint" style="width: 360px;font-size:16px;">
                 <div  style="margin-left:50px;">姓名:
                   <span>{{main_collection.patient.name}} </span>
-                  （{{ main_collection.patient.dialysis_no }}，{{getNewAge(main_collection.patient.id_card_no)  }}岁）
+                  （{{ main_collection.patient.dialysis_no }}，{{getNewAge(main_collection.patient.id_card_no)  }}岁<span v-if="main_collection.patient.height>0">,{{ main_collection.patient.height }}cm</span>）
                 </div>
                 <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
                   <div style="">透析模式:

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                       </div>
                     </div>
 
+                  
+
                     <div class="inline_block" style="margin-left: 20px" v-if="org_id ==10683">
                       上机时间：
                       <div
                       </div>
                     </div>
                   </div>
+                  <div class="row" style="padding: 2px 0; line-height: 23px" v-if=" org_id == 0  || org_id == 10598">
+                    在线Kt/V监测：
+                    <div class="under_line" style="width: 30px; text-align: center">
+                      <check-box :checked="true"></check-box>
+                    </div>
+                  </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px" v-if=" org_id == 3877  || org_id == 9671">
                     <div

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

 
                 <div style="margin-left:50px;">姓名:
                   <span>{{ main_collection.patient.name }} </span>
-                  （{{ main_collection.patient.dialysis_no }}，{{ getNewAge(main_collection.patient.id_card_no) }}岁）
+                  （{{ main_collection.patient.dialysis_no }}，{{ getNewAge(main_collection.patient.id_card_no) }}岁<span v-if="main_collection.patient.height>0">,{{ main_collection.patient.height }}cm</span>）
                 </div>
                 <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
                   <div style="">透析模式:

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

                 //药品
                 for (let b = 0; b < prescription.advices.length; b++) {
                   console.log("prescription.advices[b].drug.drug_status.startsWith('停用')",prescription.advices[b].drug.drug_status.startsWith('停用'))
-                  if(prescription.advices[b].drug!=null && prescription.advices[b].drug.drug_status.startsWith('停用')  == false){
-                    let obj = {
-                    advice_id: prescription.advices[b].id,
-                    drug_name: prescription.advices[b].advice_name,
-                    single_dose: prescription.advices[b].single_dose,
-                    delivery_way: prescription.advices[b].delivery_way,
-                    execution_frequency: prescription.advices[b].execution_frequency,
-                    retail_price: prescription.advices[b].price.toString(),
-                    remark: prescription.advices[b].remark,
-                    day: prescription.advices[b].day,
-                    prescribing_number: prescription.advices[b].prescribing_number.toString(),
-                    single_dose_unit: prescription.advices[b].single_dose_unit,
-                    prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-                    medical_insurance_number: prescription.advices[b].med_list_codg,
-                    id: prescription.advices[b].drug_id,
-                    drug: prescription.advices[b].drug,
-                    groupno: prescription.advices[b].groupno,
-                    frequency_type: prescription.advices[b].frequency_type,
-                    day_count: prescription.advices[b].day_count,
-                    week_day: prescription.advices[b].week_day,
-                    number:  prescription.advices[b].drug.number
+                  //孝感原生堂做特殊处理
+                  if(this.org_id != 0 && this.org_id!=10598){
+                      if(prescription.advices[b].drug!=null && prescription.advices[b].drug.drug_status.startsWith('停用')  == false){
+                      let obj = {
+                      advice_id: prescription.advices[b].id,
+                      drug_name: prescription.advices[b].advice_name,
+                      single_dose: prescription.advices[b].single_dose,
+                      delivery_way: prescription.advices[b].delivery_way,
+                      execution_frequency: prescription.advices[b].execution_frequency,
+                      retail_price: prescription.advices[b].price.toString(),
+                      remark: prescription.advices[b].remark,
+                      day: prescription.advices[b].day,
+                      prescribing_number: prescription.advices[b].prescribing_number.toString(),
+                      single_dose_unit: prescription.advices[b].single_dose_unit,
+                      prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+                      medical_insurance_number: prescription.advices[b].med_list_codg,
+                      id: prescription.advices[b].drug_id,
+                      drug: prescription.advices[b].drug,
+                      groupno: prescription.advices[b].groupno,
+                      frequency_type: prescription.advices[b].frequency_type,
+                      day_count: prescription.advices[b].day_count,
+                      week_day: prescription.advices[b].week_day,
+                      number:  prescription.advices[b].drug.number
 
-                  }
-                  tempAdvice.push(obj)
+                    }
+                    tempAdvice.push(obj)
                   }
 
+                  }else{
+                    if(prescription.advices[b].drug!=null){
+                      let obj = {
+                      advice_id: prescription.advices[b].id,
+                      drug_name: prescription.advices[b].advice_name,
+                      single_dose: prescription.advices[b].single_dose,
+                      delivery_way: prescription.advices[b].delivery_way,
+                      execution_frequency: prescription.advices[b].execution_frequency,
+                      retail_price: prescription.advices[b].price.toString(),
+                      remark: prescription.advices[b].remark,
+                      day: prescription.advices[b].day,
+                      prescribing_number: prescription.advices[b].prescribing_number.toString(),
+                      single_dose_unit: prescription.advices[b].single_dose_unit,
+                      prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+                      medical_insurance_number: prescription.advices[b].med_list_codg,
+                      id: prescription.advices[b].drug_id,
+                      drug: prescription.advices[b].drug,
+                      groupno: prescription.advices[b].groupno,
+                      frequency_type: prescription.advices[b].frequency_type,
+                      day_count: prescription.advices[b].day_count,
+                      week_day: prescription.advices[b].week_day,
+                      number:  prescription.advices[b].drug.number
+
+                    }
+                    tempAdvice.push(obj)
+                  }
+                  }
+                
                 }
                 //项目
                 for (let b = 0; b < prescription.project.length; b++) {
                         }
                         tempProject.push(obj)
                     }
-                  }else if(prescription.project[b].type == 3 && prescription.project[b].good_info.good_status.startsWith('停用') == false){
-                    if (this.org_id == 10206 ) {
+                    //针对孝感原生堂
+                  }else if(prescription.project[b].type == 3){
+
+                    if(this.org_id!=0&&this.org_id!=10510 && prescription.project[b].good_info.good_status.startsWith('停用') == false){
+
+                      if (this.org_id == 10206 ) {
+                      let obj = {
+                        id: prescription.project[b].id,
+                        project_id: prescription.project[b].project_id,
+                        project_name: prescription.project[b].project.project_name,
+                        statistical_classification: prescription.project[b].project.statistical_classification,
+                        single_dose: prescription.project[b].single_dose,
+                        delivery_way: prescription.project[b].delivery_way,
+                        execution_frequency: prescription.project[b].execution_frequency,
+                        number_days: prescription.project[b].day,
+                        total: prescription.project[b].count.toString(),
+                        price: prescription.project[b].price,
+                        remark: prescription.project[b].remark,
+                        medical_code: prescription.project[b].project.medical_code,
+                        type: prescription.project[b].type,
+                        frequency_type: prescription.project[b].frequency_type,
+                        day_count: prescription.project[b].day_count,
+                        week_day: prescription.project[b].week_day,
+                        number_days:prescription.project[b].day
+
+
+                      }
+
+                      if (prescription.project[b].type == 2) {
+                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                        obj['medical_code'] = prescription.project[b].project.medical_code
+                        obj['project_name'] = prescription.project[b].project.project_name
+                        obj['project'] = prescription.project[b].project
+                        obj['unit'] = prescription.project[b].unit
+                        obj['number'] = ""
+
+
+                      } else if (prescription.project[b].type == 3) {
+                        obj['statistical_classification'] = ''
+                        obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                        obj['project_name'] = prescription.project[b].good_info.good_name
+                        obj['good_info'] = prescription.project[b].good_info
+                        obj['unit'] = prescription.project[b].good_info.packing_unit
+                        obj['number'] = prescription.project[b].good_info.good_number
+
+                      }
+                      tempProject.push(obj)
+                    }else{
+                        let obj = {
+                          id: prescription.project[b].id,
+                          project_id: prescription.project[b].project_id,
+                          project_name: prescription.project[b].project.project_name,
+                          statistical_classification: prescription.project[b].project.statistical_classification,
+                          single_dose: prescription.project[b].single_dose,
+                          delivery_way: prescription.project[b].delivery_way,
+                          execution_frequency: prescription.project[b].execution_frequency,
+                          number_days: prescription.project[b].day,
+                          total: prescription.project[b].count.toString(),
+                          price: prescription.project[b].price,
+                          remark: prescription.project[b].remark,
+                          medical_code: prescription.project[b].project.medical_code,
+                          type: prescription.project[b].type,
+                          frequency_type: prescription.project[b].frequency_type,
+                          day_count: prescription.project[b].day_count,
+                          week_day: prescription.project[b].week_day,
+                          number_days:prescription.project[b].day
+
+                        }
+
+                        if (prescription.project[b].type == 2) {
+                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['medical_code'] = prescription.project[b].project.medical_code
+                          obj['project_name'] = prescription.project[b].project.project_name
+                          obj['project'] = prescription.project[b].project
+                          obj['unit'] = prescription.project[b].unit
+                        } else if (prescription.project[b].type == 3) {
+                          obj['statistical_classification'] = ''
+                          obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] = prescription.project[b].good_info.good_name
+                          obj['good_info'] = prescription.project[b].good_info
+                          obj['unit'] = prescription.project[b].good_info.packing_unit
+                        }
+                        tempProject.push(obj)
+                      }
+
+                    }else{
+
+                      if (this.org_id == 10206 ) {
                       let obj = {
                         id: prescription.project[b].id,
                         project_id: prescription.project[b].project_id,
                         }
                         tempProject.push(obj)
                       }
+                    }
+
+
+               
                   }
                 }
                 // var preTime = nowTime

src/xt_pages/stock/drugs/drugStockOutOrder.vue

             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217  && org_id!=0 && org_id!=10088 && org_id!=10510">
-                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
+                    <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217  && org_id!=10088 && org_id!=10510 && org_id!=10402">
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}} </span>
                     <span v-if="is_sys == 0">
                       <!-- <span v-if="scope.row.child.length == 1">{{item.count * item.retail_price}} </span> 
                       <span v-if="scope.row.child.length > 1">{{item.count * item.price}} </span>  -->
                     </span>
                     </span>
 
-                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id==0 || org_id ==10088 || org_id ==10510">
+                    <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id ==10088 || org_id ==10510 || org_id ==10402">
                       <!-- {{(item.count * item.price).toFixed(2)}} -->
                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*scope.row.min_price).toFixed(2)}}</span>  
                      <span v-if="is_sys==0">
         return "spanClass";
       }
     },
+    getOutCountFive(warehouse_info_id,max_unit,min_unit,min_number,drug_id){
+      var arr = []
+      var total = 0
+      var max_str = ""
+      var min_str = ""
+
+      for(let j=0;j<this.outList.length;j++){
+        if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
+           arr.push(this.outList[j])
+        }
+      }
+      if(arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+           total +=arr[i].count
+        }
+      }
+     
+      if (total < min_number) {
+         min_str = total;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number)
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number)
+        }
+      }
+      return max_str + min_str;
+    },
     getOutCountSix(warehouse_info_id,max_unit,min_unit,min_number,drug_id){
       var arr = []
       var total = 0
       }
       return price
     },
-    getTotalPrice(warehouse_info_id,max_unit,min_unit,min_number){
+    getTotalPrice(warehouse_info_id,max_unit,min_unit,min_number,drug_id){
       
       var arr = []
       var total = 0
            arr.push(this.tabList[j])
         }
       }
-     
+       total = this.getOutCountFive(warehouse_info_id,max_unit,min_unit,min_number,drug_id)
+    
+      console.log("taolaa------",total,drug_id)
       if(arr.length > 0){
         for(let i=0;i<arr.length;i++){
-           total +=arr[i].count
            price = arr[0].price
         }
       }