新分支

src/xt_pages/Pharmacy/PatientDispensing.vue

         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {
+      }).then(() => {
           dispensingmedicine(params).then((res) => {
             if (res.data.state == 1) {
               this.$message.success("操作成功");
               this.tableData = null;
               this.fun4(tmp);
               this.state = 2;
-              // console.log("this.alreadmount_data",this.alreadmount_data)
-              // for (let i = 0;i < this.alreadmount_data.length;i++){
-              //   console.log("tmp = ",tmp)
-              //     if (this.alreadmount_data[i].PatientID == tmp){
-              //       console.log("i = ",i)
-              //       this.$refs.table02.setCurrentRow(this.alreadmount_data[i]);
-              //       this.handleCurrentChange(this.alreadmount_data[i])
-              //     }
-              // }
+           
             } else {
               this.$message.error(res.data.msg);
             }

src/xt_pages/dialysis/details/DialysisPrescription.vue

         <li v-if=" isShow('总量') && getValueStr('anticoagulant', 'anticoagulant') != 5 " >
           <label>总量: </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45">
+          <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45 && this.$store.getters.xt_user.template_info.org_id != 10600">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234 && this.$store.getters.xt_user.template_info.template_id != 65">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 ||  this.$store.getters.xt_user.template_info.template_id== 65)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234 && this.$store.getters.xt_user.template_info.template_id != 65  && this.$store.getters.xt_user.template_info.org_id != 10600">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 ||  this.$store.getters.xt_user.template_info.template_id== 65 || this.$store.getters.xt_user.template_info.org_id == 10600)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >
             
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.template_id!=0">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 65 ||  this.$store.getters.xt_user.template_info.template_id == 0)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.template_id!=0 && this.$store.getters.xt_user.template_info.org_id != 10600">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 65 ||  this.$store.getters.xt_user.template_info.template_id == 0 || this.$store.getters.xt_user.template_info.org_id == 10600)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
                  {{ anticoagulant_shouji != "0" ? "mg" : "" }}
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 65)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.org_id!=10600 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10600)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
               <span v-if="this.$store.getters.xt_user.template_info.org_id ==9671">
               {{ anticoagulant_weichi != "0" ? "mg/h" : "" }}

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

     import { uParseTime } from "@/utils/tools";
     import {getRemindPrintList,saveRemindPrint} from '@/api/schedule'
     import { getDataConfig } from '@/utils/data'
+    import print from "print-js";
     const moment = require('moment')
     import store from "@/store";
     export default {
                     if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf("导管")!=-1){
                          total_one ++
                     }
-                    if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf('内瘘')==-1){
+                    if(this.getBloodAccessOption(list[i].dialysis_prescription.blood_access).indexOf('内瘘')!=-1){
                         total_two ++
                     }
                   }

src/xt_pages/dialysis/newDoctorAdvice.vue

          if(nameOne == '全部'){
           nameOne = ""
         }
-      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id,keyword:this.keyword} });
+      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id,keyword:this.keyword,excution_way:this.excution_way} });
 
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

       return "";
     },
     getAge: function (val) {
-      if (val.birthday != 0) {
-        return jsGetAge(val.birth, "-");
-      } else {
-        return "";
+      // if (val.birthday != 0) {
+      //   return jsGetAge(val.birth, "-");
+      // } else {
+      //   return "";
+      // }
+      if (val.id_card_no) {
+        var thisLen = val.id_card_no.length
+
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + val.id_card_no.substr(6, 6)
+        } else {
+          birth = val.id_card_no.substr(6, 8)
+        }
+        var birthtwo =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+
+        var age = jsGetAge(birthtwo, '-')
+        return age
       }
     },
     newAdviceGroupObject: function () {

src/xt_pages/stock/drugs/drugStockOutOrder.vue

       });
     },
     toExport() {
-
+      
+      console.log("EXPORTLSOT",this.exportList)
       if (this.order_id == "") {
         this.$message.error("请勾选出库单");
         return;
       }
-     
+      
       for (let i = 0; i < this.exportList.length; i++) {
         this.exportList[i].retail_price_one = 0
         if(this.outInfoList.length!=null){
           for(let j=0;j<this.outInfoList.length;j++){
            if(this.exportList[i].warehouse_out_id == this.outInfoList[j].warehouse_out_id && this.exportList[i].drug_id == this.outInfoList[j].drug_id){
-            this.exportList[i].retail_price_one = this.outInfoList[j].price
+             this.exportList[i].retail_price_one = this.outInfoList[j].price
            }
         }
         }
             this.exportList[i].dealer = this.dealerList[z].dealer_name;
           }
         }
+        if(this.exportList[i].retail_price ==0){
+           this.exportList[i].retail_price = (this.exportList[i].count * this.exportList[i].price).toFixed(2)
+        }
         this.exportList[i].ctime = this.getTime(this.exportList[i].ctime)
       }
 
       
 
         const data = this.formatJson(filterVal, this.exportList);
+        console.log("Datewoo2o2o2o",data)
+      
         excel.export_json_to_excel({
           header: tHeader,
           data,

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

             </template>
           </el-table-column>
 
+
+          <el-table-column label="使用患者"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择出库对象">
+                <el-option
+                  v-for="(option, index) in patients"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+
           <!-- <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>进货价</span>
       showCheck:false,
       showReturnCheck:false,
       warehouse_out_id:0,
+      patients:[],
     };
   },
   methods: {
             response.data.data.configlist.drug_storehouse_out;
           this.list = response.data.data.list;
           this.doctorList = response.data.data.doctorList;
-          
+          var obj ={id:0,name:"系统"}
+          this.patients =[]
+          this.patients.push(obj)
+          if(response.data.data.patients!=null){
+            for(let i=0;i<response.data.data.patients.length;i++){
+              this.patients.push(response.data.data.patients[i])
+            }
+          }
           // this.doctorList.push({index:999,user_name:"护士站", admin_user_id:999})
         
         }
       tempObj["max_unit_fisrt"] = 0;
       tempObj["min_unit_fisrt"] = 0;
       tempObj["total_price"] = 0;
+      tempObj["patient_id"] =0
+      tempObj["expiry_date"] = ""
+      tempObj["product_date"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
                 warehousingOutInfo[i].last_price = warehousingOutInfo[i].price
                 warehousingOutInfo[i].max_unit = warehousingOutInfo[i].count_unit
                 warehousingOutInfo[i].count = warehousingOutInfo[i].count.toString()
-
+                warehousingOutInfo[i].patient_id = warehousingOutInfo[i].patient_id
                 for(let z=0;z<drugTypeList.length;z++){
                    if(warehousingOutInfo[i].drug.drug_type == drugTypeList[z].value){
                       warehousingOutInfo[i].drug_type = drugTypeList[z].name
     tempObj["max_unit_fisrt"] = 0;
     tempObj["min_unit_fisrt"] = 0;
     tempObj["total_price"] = 0;
+    tempObj["patient_id"] = 0
+    tempObj["product_date"] = ""
+    tempObj["expiry_date"]=""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

             </template>
           </el-table-column>
 
+          <el-table-column label="使用患者" width="140" align="center">
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.patient_id"
+                filterable
+                placeholder="请选择使用患者"
+                :disabled="drug_show"
+              >
+                <el-option
+                  v-for="(option, index) in patients"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id"
+                >
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+
           <!-- <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>进货价</span>
       storehouse_id: "",
       is_check:0,
       order_id:0,
+      patients:[]
     };
   },
   methods: {
       tempObj["total_count"] = 0;
       tempObj["max_unit_fisrt"] = 0;
       tempObj["min_unit_fisrt"] = 0;
+      tempObj["patient_id"] =0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
               response.data.data.list[i].drug.min_unit +
               "/" +
               response.data.data.list[i].drug.max_unit;
-            // if(response.data.data.list[i].count%response.data.data.list[i].drug.min_number == 0){
-            //    response.data.data.list[i].count = response.data.data.list[i].count/response.data.data.list[i].drug.min_number
-            //    response.data.data.list[i].count_unit = response.data.data.list[i].drug.max_unit
-            // }
+          
             if (
               response.data.data.list[i].number == "0" ||
               response.data.data.list[i].number == 0
           );
           this.houstList = response.data.data.houstList;
           this.doctorList = response.data.data.doctorList;
+          var obj ={id:0,name:"系统"}
+          this.patients =[]
+          this.patients.push(obj)
+          if(response.data.data.patients!=null){
+            for(let i=0;i<response.data.data.patients.length;i++){
+              this.patients.push(response.data.data.patients[i])
+            }
+          }
         }
 
         if (this.recordInfo.recordData.length == 0) {

src/xt_pages/stock/stockOutOrderAdd.vue

                </el-select>
             </template>
           </el-table-column>
+
+
+          <el-table-column label="使用患者"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择出库对象">
+                <el-option
+                  v-for="(option, index) in patients"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
 <!--
           <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
       warehouseOut_id:0,
       is_check:0,
       loading:false,
+      patients:[]
     };
   },
   methods: {
           this.list = response.data.data.list
           this.storehouse_id = response.data.data.configlist.storehouse_out_info
           this.doctorList =  response.data.data.doctorList
+          var obj ={id:0,name:"系统"}
+          this.patients =[]
+          this.patients.push(obj)
+          if(response.data.data.patients!=null){
+            for(let i=0;i<response.data.data.patients.length;i++){
+              this.patients.push(response.data.data.patients[i])
+            }
+          }
+          
         }
       });
     },
       tempObj["stock_count"] = ""
       tempObj["id"] = 0
       tempObj['register_number'] = ''
+      tempObj['patient_id'] =0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
                     warehouseOutInfoList[i].name =  warehouseOutInfoList[i].GoodInfo.specification_name +"/"+ warehouseOutInfoList[i].GoodInfo.packing_unit
                     warehouseOutInfoList[i].expiry_date = this.getTimeOne(warehouseOutInfoList[i].expiry_date)
                     warehouseOutInfoList[i].product_date = this.getTimeOne(warehouseOutInfoList[i].product_date)
+                    warehouseOutInfoList[i].patient_id = warehouseOutInfoList[i].patient_id
 
                  }
                  this.recordInfo.recordData = warehouseOutInfoList
             this.recordInfo.recordData[i].stock_count = total_count
             this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].register_number = val.register_number
+            this.recordInfo.recordData[i].patient_id = 0
              
             if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.expiry_date >0){
               this.recordInfo.recordData[i].expiry_date = this.getTimeOne(val.first_xt_warehouse_info.expiry_date)
     tempObj["stock_count"] = ""
     tempObj["id"] = 0
     tempObj['register_number'] = ''
+    tempObj['patient_id'] = 0
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/stockOutOrderEdit.vue

             </template>
           </el-table-column>
 
+          
+          <el-table-column label="使用患者"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.patient_id" filterable placeholder="请选择使用患者">
+                <el-option
+                  v-for="(option, index) in patients"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+
           <el-table-column label="总价" width="150" align="center">
             <template slot-scope="scope">
               {{calculate(scope.row.price*scope.row.count)}}
         showCheck:false,
         showReturnCheck:false,
         loading:false,
+        patients:[],
       }
     },
     methods: {
         tempObj["buy_price"]= ""
         tempObj["stock_count"] = ""
         tempObj['register_number'] = ''
+        tempObj['patient_id'] =0
         this.recordInfo.recordData.push(tempObj)
       },
       handleDelete: function(index, row) {
             if(response.data.data.list[i].manufacturer ==0 ){
                response.data.data.list[i].manufacturer = ""
             }
+            response.data.data.list[i].patient_id = response.data.data.list[i].patient_id
             this.recordInfo.recordData.push(response.data.data.list[i])
           }
           this.storelist = response.data.data.storelist
           this.warehouse_out_time = this.getTime(response.data.data.out.warehouse_out_time,"{y}-{m}-{d}")
           this.storehouse_id = response.data.data.out.storehouse_id
+          var obj ={id:0,name:"系统"}
+          this.patients =[]
+          this.patients.push(obj)
+          if(response.data.data.patients!=null){
+            for(let i=0;i<response.data.data.patients.length;i++){
+              this.patients.push(response.data.data.patients[i])
+            }
+          }
           loading.close();
         }
       })

src/xt_pages/workforce/components/tableWeeks.vue

           }}</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant == 2">{{
             scope.row.dialysissolution.anticoagulant_zongliang
-              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
               : ''
           }}</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant == 3">{{

src/xt_pages/workforce/remind_print_setting.vue

                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
-                <div v-if="org_id!=10278">用法:静脉注射</div>
+                <div v-if="org_id!=10278 && org_id!=10600">用法:静脉注射</div>
                 <!-- 透析器灌流器 -->
                
                  <div>