新分支

src/store/modules/globalConfig.js

@@ -886,6 +886,36 @@ const global_config = {
         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      14: {
+        id: 14,
+        name: '肝素钙注射液',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
+      },
+      15: {
+        id: 15,
+        name: '甲磺酸萘莫司他',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
     },
     anticoagulants_set: {

src/xt_pages/device/airDisinfectTwo.vue

@@ -920,7 +920,8 @@
          { id: 2, name: "500mg/l含氯消毒剂" },
          { id: 3, name: "1000mg/l含氯消毒剂" },
          { id: 4, name: "1500mg/l含氯消毒剂" },
-         { id: 5, name: "消毒湿巾" }
+         { id: 5, name: "消毒湿巾" },
+         { id:6, name:"75%酒精"}
          ],
          DisinfectionMode: [
             { id: 1, name: "紫外线" },
@@ -1018,8 +1019,9 @@
             this.form.last_total_time =""
             this.form.last_total_time = last_total_time
             this.last_total_time = last_total_time
-            this.dialogFormVisible =  true
+           
           }
+          this.dialogFormVisible =  true
          }
         })
       },

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -22,7 +22,7 @@
           </div>
           <div style="float:right;margin-bottom:10px;">
             <el-button type="primary" @click="printCard">打印</el-button>
-            <el-button type="primary" @click="Add">新增</el-button>
+            <el-button type="primary" @click="dialogFormVisible = true">新增</el-button>
 
           </div>
           <div class="tab_air">
@@ -39,7 +39,8 @@
                 </el-table-column>
                 <el-table-column prop="fenopda" :label="'湿化瓶'+'\n'+'500mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.first_total_time?scope.row.first_total_time:""}}
+                        <!-- {{scope.row.first_total_time?scope.row.first_total_time:""}} -->
+                        {{ scope.row.first_disinfection_time }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="dwaiod" label="责任人" align="center" min-width="60">
@@ -52,7 +53,8 @@
 
                 <el-table-column prop="date" :label="'止血带'+'\n'+'500mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.sencond_total_time?scope.row.sencond_total_time:""}}
+                        <!-- {{scope.row.sencond_total_time?scope.row.sencond_total_time:""}} -->
+                        {{ scope.row.sencond_disinfection_time }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="责任人" align="center" min-width="60">
@@ -64,7 +66,8 @@
 
                 <el-table-column prop="province" :label="'医疗垃圾桶'+'\n'+'1000mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.third_total_time?scope.row.third_total_time:""}}
+                        <!-- {{scope.row.third_total_time?scope.row.third_total_time:""}} -->
+                        {{ scope.row.third_disinfection_time }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="60">
@@ -77,7 +80,8 @@
 
                 <el-table-column prop="name" :label="'体温计'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}}
+                        <!-- {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}} -->
+                        {{ scope.row.fourth_disinfection_time }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
@@ -90,7 +94,8 @@
 
                 <el-table-column prop="city" :label="'体温枪'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}}
+                        <!-- {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}} -->
+                        {{ scope.row.last_disinfection_time }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
@@ -989,7 +994,7 @@
 
                             <tr v-for="(item,index) in tableData" :key="index">
                                 <td>{{getTimes(item.record_date) }}</td>
-                                <td>{{item.first_total_time}}</td>
+                                <td>{{item.first_disinfection_time}}</td>
                                 <td>
                                 <span v-if="setAdminUserES(item.first_creator?item.last_creator:item.first_creator) == ''">
                                    {{getName(item.first_creator)}}
@@ -998,7 +1003,7 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.last_creator?item.last_creator:item.last_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
-                                <td>{{item.sencond_total_time}}</td>
+                                <td>{{item.sencond_disinfection_time}}</td>
                                 <td>
                                  <span v-if="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator) == ''">
                                    {{getName(item.sencond_creator)}}
@@ -1007,7 +1012,7 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
-                                <td>{{getTimes(item.third_total_time) }}</td>
+                                <td>{{item.third_disinfection_time }}</td>
                                 <td>
                                     <span v-if="setAdminUserES(item.third_creator?item.third_creator:item.third_creator) == ''">
                                    {{getName(item.third_creator)}}
@@ -1016,7 +1021,7 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.third_creator?item.third_creator:item.third_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
-                                <td>{{ getTimes(item.fourth_total_time) }}</td>
+                                <td>{{ item.fourth_disinfection_time }}</td>
                                 <td>
                                     <span v-if="setAdminUserES(item.fourth_creator?item.fourth_creator:item.fourth_creator) == ''">
                                    {{getName(item.fourth_creator)}}
@@ -1025,7 +1030,7 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.fourth_creator?item.fourth_creator:item.fourth_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
-                                <td>{{ getTimes(item.last_total_time) }}</td>
+                                <td>{{ item.last_disinfection_time}}</td>
                                 <td>
                                     <span v-if="setAdminUserES(item.last_creator?item.last_creator:item.last_creator) == ''">
                                    {{getName(item.last_creator)}}
@@ -1055,8 +1060,7 @@
         getObjectTableDisInfectList,
         getObjectTableDisInfectByIdList,
         updateObjectTableDisinfect, 
-        deleteObjectTableDisinfect,
-        getObjectTableDisinfectLongTime
+        deleteObjectTableDisinfect
     } from "@/api/device"
     import { uParseTime } from '@/utils/tools'
     const moment = require('moment')
@@ -1151,7 +1155,8 @@
          { id: 2, name: "500mg/l含氯消毒剂" },
          { id: 3, name: "1000mg/l含氯消毒剂" },
          { id: 4, name: "1500mg/l含氯消毒剂" },
-         { id: 5, name: "消毒湿巾" }
+         { id: 5, name: "消毒湿巾" },
+         {  id:6, name:"75%酒精"}
          ],
          DisinfectionMode: [
             { id: 1, name: "擦拭" },
@@ -1160,11 +1165,6 @@
          ],
          operators: [],
          operatorMaps:{},
-         first_total_time:0,
-         sencond_total_time:0,
-         third_total_time:0,
-         fourth_total_time:0,
-         last_total_time:0,
          
         }
       },
@@ -1547,13 +1547,7 @@
            // return ''
            // }
        },
-       Add(){
-        getObjectTableDisinfectLongTime().then(response=>{
-           if(response.data.state == 1){
-              this.dialogFormVisible = true
-           }
-        })
-       }  
+        
       }
     }
   </script>

src/xt_pages/dialysis/PatientBox.vue

@@ -136,6 +136,8 @@
                 <span v-if="schedule.prescription.anticoagulant == 11">那屈肝素</span>
                 <span v-if="schedule.prescription.anticoagulant == 12">无抗凝剂</span>
                 <span v-if="schedule.prescription.anticoagulant == 13">那屈肝素钙</span>
+                <span v-if="schedule.prescription.anticoagulant == 14">肝素钙注射液</span>
+                <span v-if="schedule.prescription.anticoagulant == 15">甲磺酸萘莫司他</span>
              </span>
           </span>
         </p>

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -2973,15 +2973,33 @@
           return record[key] == target_value;
         }
       },
+      // getAge: function (val) {
+      //   if (val.age == 0) {
+      //     if (val.birthday == 0) {
+      //       return "";
+      //     }
+      //     return jsGetAge(uParseTime(val.birthday, "{y}-{m}-{d}"), "-");
+      //   } else {
+      //     return val.age;
+      //   }
+      // },
       getAge: function (val) {
-        if (val.age == 0) {
-          if (val.birthday == 0) {
-            return "";
-          }
-          return jsGetAge(uParseTime(val.birthday, "{y}-{m}-{d}"), "-");
-        } else {
-          return val.age;
-        }
+            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 () {
         return Object.assign(

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyThree.vue

@@ -1546,16 +1546,34 @@ export default {
         return record[key] == target_value;
       }
     },
+    // getAge: function (val) {
+    //   if (val.age == 0) {
+    //     if (val.birthday == 0) {
+    //       return "";
+    //     }
+    //     return jsGetAge(uParseTime(val.birthday, "{y}-{m}-{d}"), "-");
+    //   } else {
+    //     return val.age;
+    //   }
+    // },
     getAge: function (val) {
-      if (val.age == 0) {
-        if (val.birthday == 0) {
-          return "";
-        }
-        return jsGetAge(uParseTime(val.birthday, "{y}-{m}-{d}"), "-");
-      } else {
-        return val.age;
-      }
-    },
+            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 () {
       return Object.assign(
         {},

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

@@ -27,7 +27,7 @@
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
     </div>
     <div class="cell clearfix" style="justify-content: space-between;">
-      <div style="display:flex;">
+      <!-- <div style="display:flex;">
         <label class="title"> <span class="name">分区</span> : </label>
         <div class="time">
           <ul class>
@@ -41,7 +41,16 @@
             </li>
           </ul>
         </div>
-      </div>
+      </div> -->
+      <label class="title"><span class="name">分区</span> : </label>
+      <el-select v-model="partition_id" multiple  placeholder="请选择分区" style="margin-left:-400px"  @change="selectPartitionType">
+        <el-option
+          v-for="item in partitionArrOne"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id">
+        </el-option>
+      </el-select>
       <div>
         <el-button size="small" icon="el-icon-printer" @click="toDialog" type="primary">设置</el-button>
         <el-button size="small" icon="el-icon-printer" @click="toSign" type="primary">标签打印</el-button>
@@ -81,6 +90,37 @@
             {{scope.row.patient.name}}
            </template>
         </el-table-column>
+        <el-table-column align="center" label="透析模式" v-if="dialysisSett.name==1">
+           <template slot-scope="scope">
+            <span v-if="scope.row.mode_id == 1">HD</span>
+            <span v-if="scope.row.mode_id == 2">HDF</span>
+            <span v-if="scope.row.mode_id == 3">HD+HP</span>
+            <span v-if="scope.row.mode_id == 4">HP</span>
+            <span v-if="scope.row.mode_id == 5">HF</span>
+            <span v-if="scope.row.mode_id == 6">SCUF</span>
+            <span v-if="scope.row.mode_id == 7">IUF</span>
+            <span v-if="scope.row.mode_id == 8">HFHD</span>
+            <span v-if="scope.row.mode_id == 9">HFHD+HP</span>
+            <span v-if="scope.row.mode_id == 10">PHF</span>
+            <span v-if="scope.row.mode_id == 11">HFR</span>
+            <span v-if="scope.row.mode_id == 12">HDF+HP</span>
+            <span v-if="scope.row.mode_id == 13">CRRT</span>
+            <span v-if="scope.row.mode_id == 19">IUF+HD</span>
+            <span v-if="scope.row.mode_id == 20">UF</span>
+            <span v-if="scope.row.mode_id == 21">HD+</span>
+            <span v-if="scope.row.mode_id == 22">血浆胆红素吸附+HDF</span>
+            <span v-if="scope.row.mode_id == 23">血浆胆红素吸附</span>
+            <span v-if="scope.row.mode_id == 24">I-HDF</span>
+            <span v-if="scope.row.mode_id == 25">HD高通F</span>
+            <span v-if="scope.row.mode_id == 26">CVVH</span>
+            <span v-if="scope.row.mode_id == 27">CVVHD</span>
+            <span v-if="scope.row.mode_id == 28">CVVHDF</span>
+            <span v-if="scope.row.mode_id == 29">PE</span>
+            <span v-if="scope.row.mode_id == 30">血浆胆红素吸附+HP</span>
+            <span v-if="scope.row.mode_id == 31">HPD</span>
+            <span v-if="scope.row.mode_id == 32">HDP</span>
+           </template>
+        </el-table-column>
         <el-table-column align="center" label="透析号" v-if="dialysisSett.dialysis_no==1">
            <template slot-scope="scope">
             {{scope.row.patient.dialysis_no}}
@@ -489,7 +529,7 @@
         partion_type:0,
         tableList:[],
         dialysisSett:{},
-
+        partitionArrOne:[],
         dialogVisibleOne: false,
         prescription_status: false,
         week: false,
@@ -526,6 +566,8 @@
             return v.getTime() < new Date().getTime() - 86400000;
           },
         },
+        partition_id:0,
+        zoneList:[],
       }
     },
     open(){
@@ -534,7 +576,7 @@
     created() {
        this.blood_access_option  = getDataConfig('hemodialysis', 'vascular_access_desc')
        this.displace_liqui_part_option = this.$store.getters.displace_liqui
-       console.log("志愿液",this.displace_liqui_part_option)
+    
        var filedList = store.getters.xt_user.fileds
        var newArr = [
         {value:999999,filed_name_cn:"姓名"},
@@ -550,8 +592,6 @@
         }
         this.predialysisConditionOptions = newArr
        }
-     
-      this.getAllZone()
       let date = uParseTime(new Date(), "{y}-{m}-{d}")
       var newDate = new Date();
       var y = newDate.getFullYear();
@@ -565,14 +605,40 @@
       this.query.schedule_type = 0
       this.query.partition_id = 0
       this.query.page = 1
-      this.getlist()
+      this.getAllZone()
+     
+     
      
     },
     methods: {
       getlist(){
+      
+        
+        var str = ""
+         if(this.partition_id==0){
+            console.log("进阿里232332")
+            console.log("wowoowowow",this.zoneList.join(","))
+            str = this.zoneList.join(",")
+         }
+
+         if(this.partition_id!=0){
+           str = this.partition_id.join(",")
+         }
+         this.query.partition_id = ""
+         this.query.partition_id = str 
+      
         getDialysisParameter(this.query).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.list
+              
+              if(list!=null &&list.length>0){
+                for(let i=0;i<list.length;i++){
+                  list[i].sort = 0
+                  list[i].sort = list[i].device_number.sort
+                }
+      
+              }
+              list.sort(this.compare('sort'))
               this.list = list
               this.total = response.data.data.total
               this.dialysisSett = response.data.data.dialysisSett
@@ -580,6 +646,13 @@
             }
         }) 
       },
+      compare(p) { //这是比较函数
+        return function (m, n) {
+          var a = m[p];
+          var b = n[p];
+          return a - b; //升序
+        }
+      },
       handleSizeChange(val) {
         this.query.limit = val;
         this.getlist();
@@ -636,7 +709,7 @@
 
       },
       selectPartitionType(partitionType) {
-        this.partitionType = partitionType
+        // this.partitionType = partitionType
         this.query.partition_id = partitionType
         this.query.page = 1
 
@@ -654,16 +727,27 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+           
+
+            for(let i=0;i<response.data.data.zone.length;i++){
+               this.partitionArrOne.push(response.data.data.zone[i])
+               this.zoneList.push(response.data.data.zone[i].id)
+            }
             this.partitionArr = response.data.data.zone
+           
+            console.log("全部中",this.partitionArrOne)
             this.partitionArr.unshift({ id: 0, name: '全部' })
+            this.getlist()
+            
           }
         })
       },
       statistics() {
          this.tableList = []
+       
          var params = {
           schedule_type:this.schedule_type,
-          partion_type:this.partion_type,
+          partion_type:this.partitionType,
           selected_date:this.query.schedule_date,
         }
         getDialysisParameterGoodList(params).then(response=>{

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

@@ -28,6 +28,7 @@
                 <td width="50">序号</td>
                 <td width="100"  v-if="dialysisSett.device_number==1">透析机号</td>
                 <td width="100"  v-if="dialysisSett.name==1">姓名</td>
+                <td width="100"  v-if="dialysisSett.name==1">透析模式</td>
                 <td width="100" v-if="dialysisSett.dialysis_no==1">透析号</td>
                 <td width="100" v-if="dialysisSett.admission_number==1">住院(门诊)号</td>
                 <td width="100"  v-if="dialysisSett.weight_befor==1">透前体重</td>
@@ -61,6 +62,36 @@
                 <td width="100"  v-if="dialysisSett.name==1">
                    {{item.patient.name}}
                 </td>
+                <td width="100">
+                  <span v-if="item.mode_id == 1">HD</span>
+                  <span v-if="item.mode_id == 2">HDF</span>
+                  <span v-if="item.mode_id == 3">HD+HP</span>
+                  <span v-if="item.mode_id == 4">HP</span>
+                  <span v-if="item.mode_id == 5">HF</span>
+                  <span v-if="item.mode_id == 6">SCUF</span>
+                  <span v-if="item.mode_id == 7">IUF</span>
+                  <span v-if="item.mode_id == 8">HFHD</span>
+                  <span v-if="item.mode_id == 9">HFHD+HP</span>
+                  <span v-if="item.mode_id == 10">PHF</span>
+                  <span v-if="item.mode_id == 11">HFR</span>
+                  <span v-if="item.mode_id == 12">HDF+HP</span>
+                  <span v-if="item.mode_id == 13">CRRT</span>
+                  <span v-if="item.mode_id == 19">IUF+HD</span>
+                  <span v-if="item.mode_id == 20">UF</span>
+                  <span v-if="item.mode_id == 21">HD+</span>
+                  <span v-if="item.mode_id == 22">血浆胆红素吸附+HDF</span>
+                  <span v-if="item.mode_id == 23">血浆胆红素吸附</span>
+                  <span v-if="item.mode_id == 24">I-HDF</span>
+                  <span v-if="item.mode_id == 25">HD高通F</span>
+                  <span v-if="item.mode_id == 26">CVVH</span>
+                  <span v-if="item.mode_id == 27">CVVHD</span>
+                  <span v-if="item.mode_id == 28">CVVHDF</span>
+                  <span v-if="item.mode_id == 29">PE</span>
+                  <span v-if="item.mode_id == 30">血浆胆红素吸附+HP</span>
+                  <span v-if="item.mode_id == 31">HPD</span>
+                  <span v-if="item.mode_id == 32">HDP</span>
+                 
+                </td>
                 <td width="100" v-if="dialysisSett.dialysis_no==1">
                    {{item.patient.dialysis_no}}
                 </td>
@@ -199,7 +230,7 @@
        var params = {
          schedule_date:this.$route.query.schedule_date,
          schedule_type:this.$route.query.schedule_type,
-         partion_id:this.$route.query.partion_id,
+         partition_id:this.$route.query.partion_id,
          page:this.$route.query.page,
          limit:this.$route.query.limit,
          ids:this.$route.query.ids,
@@ -208,6 +239,14 @@
       getDialysisParameter(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
+            if(list!=null &&list.length>0){
+                for(let i=0;i<list.length;i++){
+                  list[i].sort = 0
+                  list[i].sort = list[i].device_number.sort
+                }
+      
+              }
+              list.sort(this.compare('sort'))
             this.list = list
             this.dialysisSett = response.data.data.dialysisSett
             console.log("设置",this.dialysisSett)
@@ -292,7 +331,14 @@
          }
        }
        return name
-     }
+     },
+     compare(p) { //这是比较函数
+        return function (m, n) {
+          var a = m[p];
+          var b = n[p];
+          return a - b; //升序
+        }
+      },
     
     }
   }

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

@@ -9,7 +9,7 @@
                 class="newDialog"
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo">{{ patient.name }}</el-button>
-            <span style="position: absolute;left: 22%;top: 3%">
+            <!-- <span style="position: absolute;left: 22%;top: 3%">
               透前体重： --kg
             </span>
             <span style="position: absolute;left: 35%;top: 3%">
@@ -17,7 +17,7 @@
             </span>
             <span style="position: absolute;left: 48%;top: 3%">
               衣物重：--kg
-            </span>
+            </span> -->
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
                     ref="dialysisPrescription"
@@ -51,7 +51,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8" v-if="isShows('透析时长')">
-                        <el-form-item label="透析时长(min)： " prop="dialysis_duration_minute" :rules="isCheckmust('透析时长')">
+                        <el-form-item label="透析时长(min)： " prop="dialysis_duration_minute">
                             <el-input
                                     type="number"
                                     v-model="dialysisPrescription.dialysis_duration_minute"
@@ -2707,7 +2707,7 @@ mu
         if(moment().weekday() == 6){
            total_day ="周六"
         }
-        if(moment().weekday() == 7){
+        if(moment().weekday() == 0){
            total_day ="周日"
         }
         console.log("---------",this.targetAdvices)

src/xt_pages/dialysis/signPrint.vue

@@ -28,7 +28,7 @@
                             规格:{{getSpecialName(it.drug_id)}} 
                             
                             </div>  
-                            <div v-if="(org_id ==0 || org_id==10440) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                              
@@ -45,7 +45,7 @@
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
                         </div>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -3582,20 +3582,39 @@ export default {
       }
       return "";
     },
+    // getAge: function (val) {
+    //   if (
+    //     this.org_template_info.template_id == 2 ||
+    //     this.org_template_info.template_id == 0
+    //   ) {
+    //     if (val.age == 0) {
+    //       return jsGetAge(val.birth, "-");
+    //     } else {
+    //       return val.age;
+    //     }
+    //   } else {
+    //     return jsGetAge(val.birth, "-");
+    //   }
+    // },
     getAge: function (val) {
-      if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
-      ) {
-        if (val.age == 0) {
-          return jsGetAge(val.birth, "-");
-        } else {
-          return val.age;
-        }
-      } else {
-        return jsGetAge(val.birth, "-");
-      }
-    },
+            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 () {
       return Object.assign(
         {},

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -1244,7 +1244,7 @@
                       <div>
                         性别：{{ patientInfo_gender_1 == true ? "男" : "女" }}
                       </div>
-                      <div>年龄：{{ getoldAge() }}</div>
+                      <div>年龄：{{ getAge(patientInfo) }}</div>
                       <div>透析机号:&nbsp;{{ getNumber() }}</div>
                     </div>
                   </td>
@@ -1621,33 +1621,53 @@ export default {
       },
     };
   },
-  methods: {
+  methods: {   
+    getAge: function (val) {
+            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;
+      },
+
+
     // 获取当前年份，用于年龄计算
-    getoldAge() {
-      let date = new Date();
-      let year = date.getFullYear();
-      let year_d =
-        this.xtdate.split("-")[0] - this.patientInfo.birth.split("-")[0];
-      let year_m = this.xtdate.split("-")[1];
-      let birth_m = this.patientInfo.birth.split("-")[1];
-      let year_date = this.xtdate.split("-")[2];
-      let birth_date = this.patientInfo.birth.split("-")[2];
-      // console.log(year,'今年年月')
-      // console.log(this.xtdate.split('-'),'病人就诊年月')
-      console.log(this.patientInfo.birth, "病人生日");
-      // console.log(year_d,'year_d')
-      if (year_m < birth_m) {
-        return year_d - 1;
-      } else if (year_m == birth_m) {
-        if (year_date < birth_date) {
-          return year_d - 1;
-        } else {
-          return year_d;
-        }
-      } else {
-        return year_d;
-      }
-    },
+    // getoldAge() {
+      // let date = new Date();
+      // let year = date.getFullYear();
+      // let year_d =
+      //   this.xtdate.split("-")[0] - this.patientInfo.birth.split("-")[0];
+      // let year_m = this.xtdate.split("-")[1];
+      // let birth_m = this.patientInfo.birth.split("-")[1];
+      // let year_date = this.xtdate.split("-")[2];
+      // let birth_date = this.patientInfo.birth.split("-")[2];
+      // // console.log(year,'今年年月')
+      // // console.log(this.xtdate.split('-'),'病人就诊年月')
+      // console.log(this.patientInfo.birth, "病人生日");
+      // // console.log(year_d,'year_d')
+      // if (year_m < birth_m) {
+      //   return year_d - 1;
+      // } else if (year_m == birth_m) {
+      //   if (year_date < birth_date) {
+      //     return year_d - 1;
+      //   } else {
+      //     return year_d;
+      //   }
+      // } else {
+      //   return year_d;
+      // }
+    // },
     getAdminUser(id) {
       if (id == 0) {
         return "";

src/xt_pages/management/home.vue

@@ -4529,6 +4529,13 @@ export default {
         if (this.userform.user_total == ""){
           this.userform.user_total = 0
         }
+
+        if(this.userform.disinfection == ""){
+          this.userform.disinfection  = 0
+        }
+        if(this.userform.disinfection_status == ""){
+           this.userform.disinfection_status = 0
+        }
         this.userform.user_total = parseInt(this.userform.user_total)
 
         console.log("user_form",this.userform)

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

@@ -63,8 +63,8 @@
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:190px;left:50px"></div>
             <div style="position: absolute;top:190px;left:130px"></div>
-            <div style="position: absolute;top:190px;left:180px"></div>
-            <div style="position: absolute;top:190px;left:260px"></div>
+            <div style="position: absolute;top:190px;left:180px">诊察费</div>
+            <div style="position: absolute;top:190px;left:260px">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
             <div style="position: absolute;top:190px;left:340px">材料费</div>
             <div style="position: absolute;top:190px;left:420px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
             <div style="position: absolute;top:190px;left:480px"></div>
@@ -182,7 +182,7 @@ export default {
                 console.log('res',res)
                 this.list = res.data.data
                 this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
-                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal
                 if(this.totalPrice == 0){
 
                   this.totalPrice = this.list.medfee_sumamt

src/xt_pages/outpatientCharges/summary.vue

@@ -116,7 +116,7 @@
           <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
           <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_two">报表下载3</el-button>
 
-          <!--          <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
+<!--                    <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
 
 
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
@@ -124,13 +124,12 @@
           <!--          </el-button-->
           <!--          >-->
 
-                              <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
-          <!--          <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
-          <!--          <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-<!--                    <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
-<!--          <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
-
-          <!--          <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
+<!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
+          <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
 
         </div>
@@ -1215,7 +1214,7 @@ export default {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
-                month: "03",
+                month: "04",
                 code: data[b].code,
                 pric: data[b].total ,
                 item_name: data[b].name,

src/xt_pages/stock/detail/print.vue

@@ -51,10 +51,13 @@
               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
                 <span v-if="type == 2">
-                  <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span>
+                  <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583 || org_id == 0">
+                    <!-- {{getStockCount(item.good_id) }} -->
+                    {{getMySelfCount(item.good_id) }}
+                  </span>
                    <span  v-if="org_id == 10265 || org_id == 10215">{{getMySelfCount(item.good_id) }}</span>
                    <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{getWarehouseOut(item.good_id)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 &&org_id!=9679 &&org_id!=9675 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191">{{getStockCount(item.good_id) }}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 &&org_id!=9679 &&org_id!=9675 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191 && org_id!=0">{{getStockCount(item.good_id) }}</span>
                 </span>
 
                 <span v-if="type == 4"> {{ item.count }}</span>
@@ -75,8 +78,10 @@
               <td style="line-height:50px">
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id ==9919">
-                     {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}}
+                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 0">
+                    <!-- {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}} -->
+                     {{(getMySelfCount(item.good_id) * item.buy_price).toFixed(2)}}
+                     
                   </span>
                   <span v-if="org_id == 10265 || org_id == 10215  ">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
                    <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{(getWarehouseOut(item.good_id)*item.packing_price).toFixed(2)}}</span>
@@ -380,6 +385,7 @@
            var list = response.data.data.list
            console.log("新的",list)
            this.stockDatas = list
+           //自动出库数据
            var stockTotal = response.data.data.stockTotal
           this.stockTotal = stockTotal
 

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -834,7 +834,7 @@ export default {
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
 
-        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671){
+        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 0){
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
@@ -842,7 +842,7 @@ export default {
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
           console.log("out_count232233232332",this.tableOut[i].out_count)
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }