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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.5"
+  "version": "1.0.6"
 }

src/api/device.js

@@ -265,7 +265,7 @@ export function updateNewAirDisinfect(data){
   
   return request({
     url:"/api/manage/updatenewairdisinfect",
-    method:post,
+    method:"post",
     data:data,
   })
 }
@@ -322,4 +322,22 @@ export function deleteObjectTableDisinfect(id,params){
     method:"get",
     params:params
   })
+}
+
+export function getAirDisinfectLongTime(params){
+  
+  return request({
+    url:"/api/manage/getairdisinfectionlongtime",
+    method:"get",
+    params:params
+  })
+}
+
+export function getObjectTableDisinfectLongTime(params){
+  
+  return request({
+    url:"/api/manage/getobjcttabledisinfectlongtime",
+    method:"get",
+    params:params,
+  })
 }

src/api/inspection.js

@@ -3,9 +3,9 @@ import {
   fromTextArea
 } from 'codemirror'
 
-export function fetchInspectionReference(id) {
+export function fetchInspectionReference(id,type) {
   return request({
-    url: '/api/patient/inspection/reference?patient=' + id,
+    url: '/api/patient/inspection/reference?patient=' + id+"&type=" + type,
     method: 'get'
   })
 }
@@ -59,3 +59,25 @@ export function GetInitInspections(params) {
     params: params
   })
 }
+
+
+export function CreatePatientPICInspection(id, data) {
+  return request({
+    url: '/api/patient/pic_inspection/create?patient=' + id,
+    method: 'post',
+    data: data
+  })
+}
+
+export function editPatientPICInspection(id, data) {
+  return request({
+    url: '/api/patient/pic_inspection/edit?patient=' + id,
+    method: 'post',
+    data: data
+  })
+}
+
+
+
+
+

src/api/patient.js

@@ -509,7 +509,7 @@ export function getInspectionItemList(params) {
 }
 
 export function saveCreation(data) {
- 
+
   return request({
     url: '/api/patient/savecreationinspection',
     method: 'post',
@@ -652,3 +652,95 @@ export function deleteFirstDisease(params) {
     params: params
   })
 }
+
+export function createSickHistoryRecord(params) {
+  return request({
+    url: '/api/patient/sickhistory/create',
+    method: 'get',
+    params: params
+  })
+}
+
+
+export function deleteSickHistoryRecords(params) {
+  return request({
+    url: '/api/patient/sickhistory/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+ export function ModifySickHistoryRecord(params) {
+  return request({
+    url: '/api/patient/sickhistory/modify',
+    method: 'get',
+    params: params
+  })
+}
+
+export function GetSickHistoryRecords(params) {
+  return request({
+    url: '/api/patient/sickhistory',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+export function getPhysiqueCheckRecords(patient_id, start_time_ymd, end_time_ymd) {
+  var params = {
+    patient_id: patient_id,
+    start_time: start_time_ymd,
+    end_time: end_time_ymd
+  }
+  return request({
+    url: '/api/patient/physiquecheck',
+    method: 'get',
+    params: params
+  })
+}
+export function createPhysiqueCheckRecord(params) {
+  return request({
+    url: '/api/patient/physiquecheck/create',
+    method: 'get',
+    params: params
+  })
+}
+
+export function modifyPhysiqueCheckRecord(params) {
+  return request({
+    url: '/api/patient/physiquecheck/modify',
+    method: 'get',
+    params: params
+  })
+}
+
+
+export function deletePhysiqueCheckRecords(params) {
+  return request({
+    url: '/api/patient/physiquecheck/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+
+export function getPhysiqueCheckRecordsPrint(params) {
+  return request({
+    url: '/api/patient/physiquecheck/print',
+    method: 'get',
+    params: params
+  })
+}
+
+
+export function getSickhistoryCheckRecordsPrint(params) {
+  return request({
+    url: '/api/patient/sickhistory/print',
+    method: 'get',
+    params: params
+  })
+}
+
+

src/lang/en.js

@@ -78,6 +78,7 @@ export default {
     dialysisSolution: 'dialysisSolution',
     inspection: 'Inspection',
     home: 'home',
+    infor:'infor',
     weight: 'weight',
     dialysisRecord: 'dialysisRecord',
     scheduling: 'scheduling',

src/lang/zh.js

@@ -81,6 +81,7 @@ export default {
     template: '数据模版',
     druguse: '医嘱模版',
     watch: '透析监测',
+    flow:'透析流程',
     addAdmin: '新增用户',
     editAdmin: '编辑用户信息',
     setupPerview: '设置权限',
@@ -92,6 +93,7 @@ export default {
     dialysisSolution: '透析处方',
     inspection: '检验检查',
     home: '透析首页',
+    infor:'信息归档',
     weight: '干体重',
     dialysisRecord: '透析记录',
     scheduling: '排班信息',
@@ -102,6 +104,7 @@ export default {
     deviceManage: '院感管理',
     modemanagement: '型号配置',
     dialysisMachineManage: '设备管理',
+    
     workforce: '患者排班',
     appointment: '排班管理',
     sign: '治疗签到',
@@ -393,11 +396,12 @@ export default {
     config_value: '字段值',
     remark: '备注',
     course_disease: '病程',
+    sick_history: '病史',
     rescue_record: '抢救记录',
     manage_ment: '设备管理',
     nursing_record: '透析护理记录',
     special_record: '特殊记录',
-    template_summary: '治疗小结',
+    template_summary: '阶段小结',
     template_plan: '个性化方案',
     admitting_diagnosis: '入院诊断',
     discharge_diagnosis: '出院诊断',
@@ -413,6 +417,5 @@ export default {
     diagnostic_basis: '诊断依据',
     differential_diagnosis: '鉴别诊断',
     treatment_plan: '诊疗计划'
-
   }
 }

src/router/index.js

@@ -12,6 +12,7 @@ import role from './modules/role'
 import stock from './modules/stock'
 import weight_sign from './modules/weight_sign'
 import workforce from './modules/workforce'
+
 import service from './modules/service'
 import org from './modules/org'
 import systems from './modules/systems'
@@ -59,7 +60,7 @@ import bedManagement from './modules/bedManagement'
 import dictionaryManagement from './modules/dictionaryManagement'
 import templateManagement from './modules/templateManagement'
 import DepartManage from './modules/DepartManage'
-import basicConfig from './modules/basicConfig'
+import basicConfig from './modules/basicConfig' 
 
 Vue.use(Router)
 
@@ -119,6 +120,7 @@ var _constant_router_map = [{
     }
   }]
 },
+
 {
   path: '/kuyiShopping',
   component: Layout,
@@ -199,7 +201,8 @@ var _asy_router_map = [
   hisTool,
   integration,
   basicConfig,
-  supply
+  supply,
+ 
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/router/index_路由未分离前.js

@@ -40,6 +40,7 @@ export const xt_constantRouterMap = [
       meta: { title: 'home', icon: 'dashboard', noCache: true }
     }]
   },
+ 
   {
     path: '/service',
     component: Layout,
@@ -638,7 +639,7 @@ export const xt_asyncRouterMap = [
         meta: { title: 'inspection', noCache: true }
       },
       {
-        path: '/patients/course',
+        path: '/',
         component: () => import('@/xt_pages/user/courseOfDisease'),
         hidden: true,
         is_menu: false,
@@ -978,5 +979,5 @@ export const xt_asyncRouterMap = [
       { path: '/role/perview', component: () => import('@/xt_pages/role/EditPerview'), name: 'setupPerview', meta: { title: 'setupPerview', noCache: true }, hidden: true, is_menu: false },
       { path: '/role/admin/specialpermission', component: () => import('@/xt_pages/role/special_permission'), name: 'special_permission_manage', meta: { title: 'special_permission_manage' }}
     ]
-  }
+  },
 ]

src/router/modules/device.js

@@ -88,6 +88,19 @@ export default {
 
       }
     },
+
+
+    {
+      path: '/infor/index',
+      component: () => import('@/xt_pages/infor/index'),
+      name: 'infor',
+     
+      meta: {
+        title: 'infor',
+        noCache: true,
+      }
+    },
+
     {
       path: '/device/waterformprint',
       component: () => import('@/xt_pages/management/components/waterFormPrint'),
@@ -99,7 +112,9 @@ export default {
         noCache: true,
         
       }
-    }
+    },
+
+  
 
   ]
 }

src/router/modules/dialysis.js

@@ -815,5 +815,14 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/flow',
+      component: () => import('@/xt_pages/dialysis/dialysisFlow'),
+      name: 'flow',
+      meta: {
+        title: 'flow',
+        noCache: true
+      }
+    },
   ]
 }

src/router/modules/patient.js

@@ -181,7 +181,35 @@ export default {
       title: 'CourseOfDiseaseManage',
       noCache: true
     }
-  },
+  }, {
+      path: '/patients/sickhistory',
+      component: () => import('@/xt_pages/user/sickHistory'),
+      hidden: true,
+      is_menu: false,
+      name: 'sickHistory',
+      meta: { title: 'sickHistory', noCache: true }
+    }, {
+      path: '/patients/inspection_check',
+      component: () => import('@/xt_pages/user/inspectionCheck'),
+      hidden: true,
+      is_menu: false,
+      name: 'inspectionCheck',
+      meta: { title: 'inspectionCheck', noCache: true }
+    },{
+      path: '/patients/ktv',
+      component: () => import('@/xt_pages/user/ktv'),
+      hidden: true,
+      is_menu: false,
+      name: 'ktv',
+      meta: { title: 'ktv', noCache: true }
+    },{
+      path: '/patients/physicalexamination',
+      component: () => import('@/xt_pages/user/Physicalexamination'),
+      hidden: true,
+      is_menu: false,
+      name: 'physicalexamination',
+      meta: { title: 'physicalexamination', noCache: true }
+    },
   {
     path: '/patients/rescue',
     component: () => import('@/xt_pages/user/rescueRecord'),
@@ -205,7 +233,7 @@ export default {
     }
   },
   {
-    path: '/course/print',
+    path: '/course/print',//coursePrint
     component: () => import('@/xt_pages/user/coursePrint'),
     hidden: true,
     is_menu: false,
@@ -215,6 +243,28 @@ export default {
       noCache: true
     }
   },
+  {
+    path: '/sickhistory/print',
+    component: () => import('@/xt_pages/user/physiqueprinting'),
+    hidden: true,
+    is_menu: false,
+    name: 'physiquePrinting',
+    meta: {
+      title: 'physiquePrinting',
+      noCache: true
+    }
+  },
+    {
+      path: '/physique/print',
+      component: () => import('@/xt_pages/user/physiqueprintingtwo'),
+      hidden: true,
+      is_menu: false,
+      name: 'physiqueprintingtwo',
+      meta: {
+        title: 'physiqueprintingtwo',
+        noCache: true
+      }
+    },
   {
     path: '/patient/patient/templateSummary/print',
     component: () => import('@/xt_pages/user/templateSummaryPrint'),

src/store/getters.js

@@ -2,6 +2,7 @@ const getters = {
   sidebar: state => state.app.sidebar,
   language: state => state.app.language,
   device: state => state.app.device,
+  information:state => state.app.information,
   visitedViews: state => state.tagsView.visitedViews,
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,

src/store/modules/globalConfig.js

@@ -179,6 +179,14 @@ const global_config = {
       {
         id: 10,
         name: '无业'
+      },
+      {
+        id: 11,
+        name: '灵活就业人员'
+      },
+      {
+        id: 12,
+        name: '退休人员'
       }
     ],
     induction_options: [ // 诱导期
@@ -886,6 +894,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/data/components/addInspection.vue

@@ -79,6 +79,13 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="排序 : " prop="sort" style="width: 50%">
+          <el-input
+            v-model="form.sort"
+            placeholder=""
+            maxlength="30"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="备注 : " prop="name" style="width: 100%">
           <el-input
             type="textarea"
@@ -219,6 +226,7 @@ export default {
         remark: "",
         project_detail: "",
         number: "1",
+        sort:0,
       },
       options: [
         { value: 1, label: "是" },
@@ -306,6 +314,7 @@ export default {
           tube_color: this.form.tube_color,
           team_type: this.form.team_type,
           remark: this.form.remark,
+          sort:parseInt(this.form.sort),
         };
         let data = {
           info: this.tableData,
@@ -316,15 +325,16 @@ export default {
            
             this.$message.success("保存成功");
             this.visible = false;
-            (this.form.project_team = ""),
-              (this.form.price = ""),
-              (this.form.pinyin = ""),
-              (this.form.wubi = ""),
-              (this.form.tube_color = ""),
-              (this.form.team_type = ""),
-              (this.form.remark = "");
+            this.form.project_team = "",
+            this.form.price = "",
+            this.form.pinyin = "",
+            this.form.wubi = "",
+            this.form.tube_color = "",
+            this.form.team_type = "",
+            this.form.remark = "";
             this.tableData = [];
             this.form.number = "";
+            this.form.sort = ""
             this.$parent.getlist();
           } else {
             this.$message.error("项目组套名称已存在!");

src/xt_pages/data/components/diagnoseOther.vue

@@ -64,6 +64,12 @@
               </template>
             </el-table-column>
 
+            <el-table-column label="排序" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.sort }}
+              </template>
+            </el-table-column>
+
             <el-table-column label="备注" align="center">
               <template slot-scope="scope">
                 {{ scope.row.remark }}
@@ -164,7 +170,8 @@
             country_content_name: '',
             remark: '',
             pinyin: '',
-            wubi: ''
+            wubi: '',
+            sort:0,
 
           },
           resetForm: {
@@ -205,7 +212,7 @@
               response.data.data.sick.pinyin
             this.Dialog.formValue.wubi =
               response.data.data.sick.wubi
-
+            this.Dialog.formValue.sort = response.data.data.sick.sort
             this.Dialog.isCreated = 2
             this.$refs.dialog.show()
 
@@ -258,7 +265,8 @@
               response.data.data.sick.pinyin
             this.Dialog.formValue.wubi =
               response.data.data.sick.wubi
-
+            this.Dialog.formValue.sort =
+              response.data.data.sick.sort
             this.Dialog.isCreated = 3
             this.Dialog.isVisibility = true
           }
@@ -277,8 +285,8 @@
             remark: val.remark,
             id: this.editId,
             pinyin: val.pinyin,
-            wubi: val.wubi
-
+            wubi: val.wubi,
+            sort:parseInt(val.sort)
           }
           modifyDiagnose(params).then(response => {
             if (response.data.state == 0) {
@@ -301,6 +309,8 @@
                 response.data.data.sick.pinyin
               this.manufacturerData[this.editIndex].wubi =
                 response.data.data.sick.wubi
+              this.manufacturerData[this.editIndex].sort =
+                response.data.data.sick.sort
 
               this.$message.success('修改成功')
             }

src/xt_pages/data/components/diagnoseOtherDialog.vue

@@ -41,6 +41,12 @@
             <el-input v-model="formValue.country_content_name"></el-input>
           </el-form-item>
         </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="排序" prop="">
+            <el-input v-model="formValue.sort"></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <el-col>
@@ -78,7 +84,8 @@
           country_content_name: '',
           remark: '',
           pinyin: '',
-          wubi: ''
+          wubi: '',
+          sort:0,
 
         },
         resetForm: {

src/xt_pages/data/components/diagnosis.vue

@@ -72,6 +72,10 @@
                 {{ scope.row.country_content_name }}
               </template>
             </el-table-column>
+            
+           
+
+        
 
             <el-table-column label="备注" align="center">
               <template slot-scope="scope">

src/xt_pages/data/components/editInspection.vue

@@ -41,6 +41,13 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="排序 : " prop="sort" style="width: 50%">
+                  <el-input
+                    v-model="form.sort"
+                    placeholder=""
+                    maxlength="30"
+                  ></el-input>
+                </el-form-item>
                 <el-form-item label="备注 : " prop="name" style="width:100%;">
                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                 </el-form-item>
@@ -145,7 +152,8 @@
           remark: '',
           project_detail: '',
           number: '',
-          item_id: ''
+          item_id: '',
+          sort:'',
         },
         options: [{
           value: 1,
@@ -285,6 +293,7 @@
             this.form.pinyin = projectTeamDetail.pinyin
             this.form.wubi = projectTeamDetail.wubi
             this.form.tube_color = projectTeamDetail.tube_color
+            this.form.sort = projectTeamDetail.sort
             if (projectTeamDetail.tube_color == 0) {
               this.form.tube_color = ''
             }
@@ -316,7 +325,8 @@
               wubi: this.form.wubi,
               tube_color: this.form.tube_color,
               team_type: this.form.team_type,
-              remark: this.form.remark
+              remark: this.form.remark,
+              sort:parseInt(this.form.sort)
             }
             let data = {
               'info': arr
@@ -327,7 +337,7 @@
                 this.$message.success('保存成功')
                 this.visible = false
                 this.projectList = []
-                // this.$parent.getlist()
+                this.$parent.getlist()
               }
             })
           }

src/xt_pages/data/components/inspection.vue

@@ -42,6 +42,11 @@
                    {{scope.row.price}}
                 </template>
             </el-table-column>
+            <el-table-column label="排序" width="100" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.sort}}
+                </template>
+            </el-table-column>
             <el-table-column prop="date" label="备注" align="center">
                 <template slot-scope="scope">
                    {{scope.row.remark}}

src/xt_pages/data/components/templateTable.vue

@@ -91,7 +91,7 @@
           ></el-input>
         </el-form-item>
 
-        <el-form-item label="内容" v-if="type == 'course_disease'">
+        <el-form-item label="内容" v-if="type == 'course_disease' || type == 'sick_history'">
           <keep-alive>
             <editor
               ref="editor"
@@ -350,7 +350,7 @@ export default {
     },
     createData() {
       this.$refs["dataForm"].validate(valid => {
-        if (this.type == "course_disease") {
+        if (this.type == "course_disease" || this.type == "sick_history") {
           this.temp.content = this.$refs.editor.content;
         }
 

src/xt_pages/data/template.vue

@@ -62,6 +62,8 @@ export default {
         { label: this.$t("data_config.diagnostic_basis"), key:"diagnostic_basis"},
         { label: this.$t("data_config.differential_diagnosis"), key:"differential_diagnosis"},
         { label: this.$t("data_config.treatment_plan"), key:"treatment_plan"},
+        { label: this.$t("data_config.sick_history"), key:"sick_history"},
+
       ],
       activeName: "education",
       createdTimes: 0

src/xt_pages/device/airDisinfectTwo.vue

@@ -28,7 +28,7 @@
           </div>
           <div style="float:right;margin-bottom:10px;">
             <el-button type="primary" @click="printCard">打印</el-button>
-            <el-button type="primary" @click="dialogFormVisible = true">新增</el-button>
+            <el-button type="primary" @click="AddCard">新增</el-button>
 
           </div>
           <div class="tab_air">
@@ -44,7 +44,7 @@
                 </el-table-column>
                 <el-table-column prop="fenopda" label="透析室" align="center" min-width="70">
                     <template slot-scope="scope">
-                      {{ getTimeTwo(scope.row.first_start_time)}} - {{ getTimeTwo(scope.row.first_end_time) }}
+                      {{getTimeTwo(scope.row.first_start_time)}} - {{ getTimeTwo(scope.row.first_end_time) }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="dwaiod" label="累计时间" align="center" min-width="50">
@@ -54,7 +54,8 @@
                 </el-table-column>
                 <el-table-column prop="date" label="责任人" align="center" min-width="50">
                     <template slot-scope="scope">
-                      {{getName(scope.row.first_creator)}}
+                        {{getName(scope.row.first_creator)}}
+
                     </template>
                 </el-table-column>
 
@@ -70,7 +71,8 @@
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="50">
                     <template slot-scope="scope">
-                        {{getName(scope.row.first_creator)}}
+                        {{getName(scope.row.sencond_creator)}}
+                   
                    </template>
                 </el-table-column>
 
@@ -86,7 +88,8 @@
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="50">
                     <template slot-scope="scope">
-                        {{getName(scope.row.sencond_creator)}}
+                        {{getName(scope.row.third_creator)}}
+                    
                     </template>
                 </el-table-column>
 
@@ -97,7 +100,8 @@
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{getName(scope.row.third_creator)}}
+                        {{getName(scope.row.last_creator)}}
+                        
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="操作" align="center" min-width="150">
@@ -123,7 +127,7 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
           >
-           
+
           </el-pagination>
          </div>
 
@@ -146,13 +150,29 @@
                   </div>
                   <div class="form_title"><span >透析室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.first_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_water"></el-input> -->
+                      <el-select v-model="form.first_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.first_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.first_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.first_disinfection_time " ></el-input>
+                      <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间" label-width="110px">
                     <el-date-picker
@@ -161,6 +181,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_start_time"
+                        @change="firststartime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -171,6 +192,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_end_time"
+                        @change="firstendtime"
                         style="width:100%;"
                      ></el-date-picker>
                   </el-form-item>
@@ -204,24 +226,40 @@
                       </el-select>
                   </el-form-item>
 
-
                   <div class="form_title"><span >治疗室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_water"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_time " ></el-input>
+                      <el-input v-model="form.sencond_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间" label-width="110px">
                     <el-date-picker
                         type="datetime"
-                        format="yyyy-MM-dd HH:mm"
+                        format="yyyy-MM-dd HH:mm:ss"
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_start_time"
+                        @change="sencondstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -232,6 +270,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_end_time"
+                        @change="sencondendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -268,13 +307,29 @@
 
                   <div class="form_title"><span >水处理、库房</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.third_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_water"></el-input> -->
+                      <el-select v-model="form.third_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.third_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.third_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.third_disinfection_time " ></el-input>
+                      <el-input v-model="form.third_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -283,6 +338,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_start_time"
+                        @change="thirdstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -293,6 +349,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_end_time"
+                        @change="thirdendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -335,6 +392,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_start_time"
+                        @change="laststarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -345,6 +403,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_end_time"
+                        @change="lastendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -404,13 +463,29 @@
                   </div>
                   <div class="form_title"><span >透析室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.first_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_water"></el-input> -->
+                      <el-select v-model="form.first_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.first_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.first_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.first_disinfection_time " ></el-input>
+                      <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间" label-width="110px">
                     <el-date-picker
@@ -419,6 +494,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_start_time"
+                        @change="firststartime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -429,6 +505,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.first_end_time"
+                        @change="firstendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -461,15 +538,32 @@
                           </el-option>
                       </el-select>
                   </el-form-item>
+
                   <div class="form_title"><span >治疗室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_water"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_time " ></el-input>
+                      <el-input v-model="form.sencond_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间" required label-width="110px">
                     <el-date-picker
@@ -488,6 +582,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_end_time"
+                        @change="sencondendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -522,13 +617,29 @@
                   </el-form-item>
                   <div class="form_title"><span >水处理、库房</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.third_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_water"></el-input> -->
+                      <el-select v-model="form.third_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.third_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
-                      <el-input v-model="form.third_disinfection_time " ></el-input>
+                      <el-input v-model="form.third_disinfection_time " :disabled="true"></el-input>
                   </el-form-item>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -537,6 +648,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_start_time"
+                        @change="thirdstarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -547,6 +659,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.third_end_time"
+                         @change="thirdendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -579,6 +692,7 @@
                           </el-option>
                       </el-select>
                   </el-form-item>
+
                   <div class="form_title"><span >通风</span></div>
                   <el-form-item label="开始时间"  label-width="110px">
                     <el-date-picker
@@ -587,6 +701,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_start_time"
+                        @change="laststarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -597,6 +712,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_end_time"
+                        @change="lastendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -649,12 +765,12 @@
                                     <span style="position: absolute; right: 10px; top: 10px; font-size: 12px;">名称</span>
 
                                     <span style="position: absolute; display: block; top: 0; left: 46px; width: 100px;
-                                    border-bottom:1px solid black ;transform: rotate(52deg); 
+                                    border-bottom:1px solid black ;transform: rotate(52deg);
                                     transform-origin: top left;"></span>
 
                                     <span style="position: absolute; right: 45px; top: 23px;font-size: 12px;">消毒 <br/>时间</span>
                                     <span style="position: absolute; display: block; top: 46px; left: 0; width: 113px;
-                                    border-bottom:1px solid black ;transform: rotate(17deg); 
+                                    border-bottom:1px solid black ;transform: rotate(17deg);
                                     transform-origin: top left;"></span>
                                     <span style="position: absolute; left: 6px; bottom: 6px;font-size: 12px;">日期</span>
                                 </td>
@@ -671,18 +787,46 @@
                                 <td>负责人</td>
                             </tr>
                             <tr v-for="(item,index) in tableData" :key="index">
-                               <td>{{getTimes(item.record_date) }}</td> 
+                               <td>{{getTimes(item.record_date) }}</td>
                                <td>{{ getTimeTwo(item.first_start_time)}} - {{ getTimeTwo(item.first_end_time) }}</td>
                                <td>{{item.first_total_time }}</td>
-                               <td>{{getName(item.first_creator)}}</td>
+                               <td>
+                                <span v-if="setAdminUserES(item.first_creator?item.last_creator:item.first_creator) == ''">
+                                   {{getName(item.first_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.last_creator?item.last_creator:item.last_creator)" alt="" srcset="">
+                                </span>
+                               </td>
                                <td>{{ getTimeTwo(item.sencond_start_time)}} - {{ getTimeTwo(item.sencond_end_time) }}</td>
                                <td>{{item.sencond_total_time }}</td>
-                               <td>{{getName(item.sencond_creator)}}</td>
+                               <td>
+                                <span v-if="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator) == ''">
+                                   {{getName(item.sencond_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator)" alt="" srcset="">
+                                </span>
+                               </td>
                                <td>{{getTimeTwo(item.last_start_time)}} - {{ getTimeTwo(item.last_end_time) }}</td>
                                <td>{{item.third_total_time }}</td>
-                               <td>{{getName(item.third_creator)}}</td>
+                               <td>
+                                <span v-if="setAdminUserES(item.third_creator?item.third_creator:item.third_creator) == ''">
+                                   {{getName(item.third_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.third_creator?item.third_creator:item.third_creator)" alt="" srcset="">
+                                </span>
+                              </td>
                                <td> {{getTimeTwo(item.last_start_time)}} - {{ getTimeTwo(item.last_end_time) }}</td>
-                               <td>{{getName(item.last_creator)}}</td>
+                               <td>
+                                <span v-if="setAdminUserES(item.last_creator?item.last_creator:item.last_creator) == ''">
+                                   {{getName(item.last_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.last_creator?item.last_creator:item.last_creator)" alt="" srcset="">
+                                </span>
+                               </td>
                             </tr>
                         </table>
                     </div>
@@ -696,7 +840,7 @@
   <script>
     import print from "print-js";
     import BreadCrumb from '@/xt_pages/components/bread-crumb'
-    import { getAllDoctorList,saveNewAirDisinfect,getNewAirDisinfectList,getNewAirDisinfectByIdList,updateAirDisinfect,deleteNewAirDisInfect} from "@/api/device"
+    import { getAllDoctorList,saveNewAirDisinfect,getNewAirDisinfectList,getNewAirDisinfectByIdList,updateNewAirDisinfect,deleteNewAirDisInfect,getAirDisinfectLongTime} from "@/api/device"
     import { uParseTime } from '@/utils/tools'
     const moment = require('moment')
     export default {
@@ -720,9 +864,9 @@
             record_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"), //创建日期
             first_disinfection_water:"",// 消毒液
             first_disinfection_methods:"",//消毒方式
-            first_disinfection_time:"",//消毒时长
-            first_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            first_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            first_disinfection_time:'',//消毒时长
+            first_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            first_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
             first_total_time:"",//累计时间
             first_is_check:"1",//检验合格
             first_modifications:"",//修改标志
@@ -731,8 +875,8 @@
             sencond_disinfection_water:"",// 消毒液
             sencond_disinfection_methods:"",//消毒方式
             sencond_disinfection_time:"",//消毒时长
-            sencond_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            sencond_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            sencond_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            sencond_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
             sencond_total_time:"",//累计时间
             sencond_is_check:"1",//检验合格
             sencond_modifications:"",//修改标志
@@ -740,16 +884,17 @@
 
             third_disinfection_water:"",// 消毒液
             third_disinfection_methods:"",//消毒方式
-            third_disinfection_time:"",//消毒时长
-            third_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            third_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            third_disinfection_time:'',//消毒时长
+            third_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            third_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
             third_total_time:"",//累计时间
             third_is_check:"1",//检验合格
             third_modifications:"",//修改标志
             third_creator:this.$store.getters.xt_user.user.id,//第一责任人
 
-            last_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            last_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            last_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            last_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
+            last_disinfection_time:"",//消毒时长
             last_total_time:"",//累计时间
             last_is_check:"1",//检验合格
             last_modifications:"",//修改标志
@@ -765,19 +910,121 @@
           start_time:[{required:true,message:"请选择开始时间",trigger:"blur"}],
           end_time:[{required:true,message:"请选择结束时间",trigger:"blur"}]
          },
-         limit:20,
+         limit:10,
          page:1,
          total:0,
          tableData: [],
          hiddenShow:false,
+         disInfectionWaterList:[
+         { id: 1, name: "0.22%季铵盐" },
+         { id: 2, name: "500mg/l含氯消毒剂" },
+         { id: 3, name: "1000mg/l含氯消毒剂" },
+         { id: 4, name: "1500mg/l含氯消毒剂" },
+         { id: 5, name: "消毒湿巾" },
+         { id:6, name:"75%酒精"}
+         ],
+         DisinfectionMode: [
+            { id: 1, name: "紫外线" },
+            { id: 2, name: "等离子" },
+            { id: 3, name: "臭氧" },
+            {id:4,name:"含氯剂喷洒500mg/L"},
+            {id:5,name:"含氯剂喷洒1000mg/L"},
+            {id:6,name:"通风"}
+         ],
+         operators: [],
+         operatorMaps:{},
+         firststart:'',
+         firstend:'',
+
+         first_total_time:0,
+         sencond_total_time:0,
+         third_total_time:0,
+         last_total_time:0,
         }
       },
       created(){
         console.log("00000000000000000",this.$store.getters.xt_user.user.id)
         this.getAllDoctorList()
         this.getNewAirDisinfectList()
+        var time=moment(this.form.first_start_time).format("HH:mm");
+        console.log('sdfgsdfsdsddf',time,this.form.first_start_time);
+
+      },
+      computed:{
+        firstdisinfection_time (){
+            let firststart= Date.parse(new Date(this.form.first_start_time))
+            console.log('开始时间',firststart);
+            let firstend= Date.parse(new Date(this.form.first_end_time))
+            console.log('结束时间',firstend);
+            let time_interval = ((firstend - firststart)/(60*60*1000)).toFixed(1)
+            console.log('结束时间',((firstend - firststart)/(60*60*1000)).toFixed(1));
+            return time_interval
+        },
+        senconddisinfection_time (){
+            const sencondstart= Date.parse(new Date(this.form.sencond_start_time))
+            console.log('开始时间',sencondstart);
+            const sencondend= Date.parse(new Date(this.form.sencond_end_time))
+            console.log('结束时间',sencondstart);
+            const time_interval = ((sencondend - sencondstart)/(60*60*1000)).toFixed(1)
+            console.log('结束时间',time_interval);
+            return time_interval
+        },
+        thirddisinfection_time (){
+            const thirdstart= Date.parse(new Date(this.form.third_start_time))
+            console.log('开始时间',thirdstart);
+            const thirdend= Date.parse(new Date(this.form.third_end_time))
+            console.log('结束时间',thirdend);
+            const time_interval = ((thirdend - thirdstart)/(60*60*1000)).toFixed(1)
+            console.log('结束时间',time_interval);
+            return time_interval
+        },
+        lastdisinfection_time(){
+            const lasttart= Date.parse(new Date(this.form.last_start_time))
+            console.log('开始时间',lasttart);
+            const lastend= Date.parse(new Date(this.form.last_end_time))
+            console.log('结束时间',lastend);
+            const time_interval = ((lastend - lasttart)/(60*60*1000)).toFixed(1)
+            console.log('结束时间',time_interval);
+            return time_interval    
+        }
       },
       methods:{
+      AddCard(){
+        getAirDisinfectLongTime().then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("累计2323322323我",list)
+            var first_total_time = 0
+            var sencond_total_time = 0
+            var third_total_time = 0
+            var last_total_time = 0
+            if(list!=null && list.length>0){
+               for(let i=0;i<list.length;i++){
+                 first_total_time += parseFloat(list[i].first_total_time)
+                 sencond_total_time +=parseFloat(list[i].sencond_total_time)
+                 third_total_time +=parseFloat(list[i].third_total_time)
+                 last_total_time +=parseFloat(list[i].last_total_time)
+               }
+            
+           
+            this.form.first_total_time = ""
+            this.form.first_total_time = first_total_time
+            this.first_total_time = first_total_time
+            this.form.sencond_total_time = ""
+            this.form.sencond_total_time = sencond_total_time
+            this.sencond_total_time = sencond_total_time
+            this.form.third_total_time =""
+            this.form.third_total_time = third_total_time
+            this.third_total_time = third_total_time
+            this.form.last_total_time =""
+            this.form.last_total_time = last_total_time
+            this.last_total_time = last_total_time
+           
+          }
+          this.dialogFormVisible =  true
+         }
+        })
+      },
       handleSizeChange(val) {
         this.limit = val;
         this.getNewAirDisinfectList()
@@ -787,7 +1034,6 @@
         this.getNewAirDisinfectList()
       },
         changeStartime(val){
-          
           this.getNewAirDisinfectList()
         },
         changeEndtime(){
@@ -799,8 +1045,19 @@
                var list = response.data.data.list
                console.log("list222222",list)
                this.docList = list
+               this.operators = response.data.data.operators
+            if (this.operators.length > 0) {
+                var operatorsLen = this.operators.length
+                for (var index = 0; index < operatorsLen; index++) {
+                this.$set(
+                    this.operatorMaps,
+                    this.operators[index].id,
+                    this.operators[index]
+                )
+                }
             }
-          })  
+           }
+          })
         },
         saveNewAirDisinfect(formName){
           this.$refs[formName].validate((valid)=>{
@@ -810,13 +1067,13 @@
                 }else{
                   this.form.first_is_check = 0
                 }
-                
+
                 if( this.form.sencond_is_check!=""){
                     this.form.sencond_is_check = parseInt(this.form.sencond_is_check)
                 }else{
                     this.form.sencond_is_check = ""
                 }
-                
+
                 if( this.form.third_is_check!=""){
                    this.form.third_is_check = parseInt(this.form.third_is_check)
                 }else{
@@ -827,34 +1084,35 @@
                 }else{
                   this.form.last_is_check = 0
                 }
-                
+
                 if(this.form.first_modifications!=""){
                   this.form.first_modifications = parseInt(this.form.first_modifications)
                 }else{
-                    this.form.first_modifications =0  
+                    this.form.first_modifications =0
                 }
 
                 if(this.form.sencond_modifications!=""){
-                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications)  
+                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications)
                 }else{
                     this.form.sencond_modifications =0
                 }
-                
+
                 if(this.form.third_modifications!=""){
                    this.form.third_modifications = parseInt(this.form.third_modifications)
                 }else{
-                    this.form.third_modifications= 0   
+                    this.form.third_modifications= 0
                 }
-                
+
                 if(this.form.last_modifications!=""){
                     this.form.last_modifications = parseInt(this.form.last_modifications)
                 }else{
                     this.form.last_modifications= 0
                 }
-            
-            
-            
-              
+
+                this.form.first_total_time = this.form.first_total_time.toString()
+                this.form.sencond_total_time =this.form.sencond_total_time.toString()
+                this.form.third_total_time = this.form.third_total_time.toString()
+                this.form.last_total_time = this.form.last_total_time.toString()
               console.log("this232322323",this.form)
               saveNewAirDisinfect(this.form).then(response=>{
                  if(response.data.state == 1 ){
@@ -862,9 +1120,11 @@
                    this.$message.success("保存成功！")
                    this.dialogFormVisible = false
                    this.getNewAirDisinfectList()
+                   this.$refs[formName].resetFields();
                  }
               })
             }
+
           })
 
         },
@@ -944,12 +1204,12 @@
               this.form.last_modifications = list.last_modifications?list.last_modifications:""
               this.form.last_creator = list.last_creator
               this.editDialogFormVisible = true
-             
+
             }
          })
        },
        updateAirDisinfect(formName){
-        
+
          this.$refs[formName].validate((valid)=>{
             if(valid){
                 if(this.form.first_is_check!=""){
@@ -957,13 +1217,13 @@
                 }else{
                   this.form.first_is_check = 0
                 }
-                
+
                 if( this.form.sencond_is_check!=""){
                     this.form.sencond_is_check = parseInt(this.form.sencond_is_check)
                 }else{
                     this.form.sencond_is_check = ""
                 }
-                
+
                 if( this.form.third_is_check!=""){
                    this.form.third_is_check = parseInt(this.form.third_is_check)
                 }else{
@@ -974,41 +1234,43 @@
                 }else{
                   this.form.last_is_check = 0
                 }
-                
+
                 if(this.form.first_modifications!=""){
                   this.form.first_modifications = parseInt(this.form.first_modifications)
                 }else{
-                    this.form.first_modifications =0  
+                    this.form.first_modifications =0
                 }
 
                 if(this.form.sencond_modifications!=""){
-                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications)  
+                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications)
                 }else{
                     this.form.sencond_modifications =0
                 }
-                
+
                 if(this.form.third_modifications!=""){
                    this.form.third_modifications = parseInt(this.form.third_modifications)
                 }else{
-                    this.form.third_modifications= 0   
+                    this.form.third_modifications= 0
                 }
-                
+
                 if(this.form.last_modifications!=""){
                     this.form.last_modifications = parseInt(this.form.last_modifications)
                 }else{
                     this.form.last_modifications= 0
                 }
-            
-              updateAirDisinfect(this.form).then(response=>{
+
+                updateNewAirDisinfect(this.form).then(response=>{
                 if(response.data.state == 1){
                   var disinfect =  response.data.data.disinfect
                   this.editDialogFormVisible = false
                   this.getNewAirDisinfectList()
+                  this.$refs[formName].resetFields()
                 }
              })
             }
-           
+
          })
+
        },
        handleDelete(id){
          deleteNewAirDisInfect(id).then(response=>{
@@ -1037,7 +1299,73 @@
               });
             }, 1);
          },
-      }
+         setAdminUserES(id) {
+           
+            if (id === 0) {
+            return ''
+            }
+            var user_name = ""
+            for(let i=0;i<this.operators.length;i++){
+               if(id == this.operators[i].admin_user_id){
+                  user_name = this.operators[i].url
+               }
+            }
+            return user_name
+            // if (id in this.operatorMaps) {
+
+            // return this.operatorMaps[id].url
+
+            // } else {
+            // return ''
+            // }
+        },
+      
+        
+        firststartime(val){
+            this.form.first_start_time = val
+            this.form.first_disinfection_time = this.firstdisinfection_time
+           
+        },
+        firstendtime(val){
+            this.form.first_disinfection_time = this.firstdisinfection_time
+            this.form.first_end_time = val
+           
+            this.form.first_total_time = parseFloat(this.first_total_time ) + parseFloat(this.form.first_disinfection_time)
+        },
+        sencondstarttime(val){
+            this.form.sencond_start_time = val
+            this.form.sencond_disinfection_time = this.senconddisinfection_time
+        },
+         sencondendtime(val){
+            this.form.sencond_end_time = val
+            this.form.sencond_disinfection_time = this.senconddisinfection_time
+
+            this.form.sencond_total_time = parseFloat(this.sencond_total_time ) + parseFloat(this.form.sencond_disinfection_time)
+        },
+        thirdstarttime(val){
+            this.form.third_start_time = val
+            this.form.third_disinfection_time = this.thirddisinfection_time
+
+          
+        },
+        thirdendtime(val){
+            this.form.third_end_time = val
+            this.form.third_disinfection_time = this.thirddisinfection_time
+            this.form.third_total_time = parseFloat(this.third_total_time ) + parseFloat(this.form.third_disinfection_time)
+        },
+        laststarttime(val){
+          this.form.last_start_time = val
+          this.form.last_disinfection_time = this.lastdisinfection_time
+        },
+        lastendtime(val){
+          this.form.last_end_time = val
+          this.form.last_disinfection_time = this.lastdisinfection_time   
+
+          this.form.last_total_time = parseFloat(this.last_total_time ) + parseFloat(this.form.last_disinfection_time)
+        }
+
+      },
+
     }
   </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

@@ -2397,7 +2397,7 @@
                             v-if="!record.check"
                           ></div>
                         </div> -->
-                        <div class="inline_block" style="flex: 1">
+                        <!-- <div class="inline_block" style="flex: 1">
                           下机护士：
                           <div
                             class="under_line"
@@ -2436,12 +2436,12 @@
                               style="height: 40px"
                             />
                           </div>
-                        </div>
-                          <!-- <div class="inline_block" style="flex: 1">
+                        </div> -->
+                          <div class="inline_block" style="flex: 1">
                           患者签名：
                           <div
                             class="under_line"
-                            style="width: 80px; text-align: center"
+                            style="width: 70px; text-align: center"
                           >
                            
                             <img
@@ -2453,7 +2453,7 @@
                               style="height: 40px"
                             />
                           </div>
-                        </div> -->
+                        </div>
                         <div class="inline_block" style="flex: 1">
                           治疗医生：
                           <div
@@ -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

@@ -204,43 +204,37 @@
                       colspan="2"
                     >
                       治疗方式:
-                      <label-box
-                        :isChecked="record&&record.prescription.mode_id == 1 ? true : false"
-                        showValue="HD"
+                     
+                      <check-box
+                        text="HD" 
+                        :checked="record&&record.prescription.mode_id == 1"
                       >
-                      </label-box>
-                      <label-box
-                        :isChecked="record&&record.prescription.mode_id == 2 ? true : false"
-                        showValue="HDF"
-                      ></label-box>
-                      (<label-box
-                        :isChecked="
-                          record&&record.prescription.mode_id == 2 &&
-                          record&&record.prescription.displace_liqui_part == 1
-                            ? true
-                            : false
-                        "
-                        showValue="前稀释"
-                      ></label-box>
-                      <label-box
-                        :isChecked="
-                          record&&record.prescription.mode_id == 2 &&
-                          record&&record.prescription.displace_liqui_part == 2
-                            ? true
-                            : false
-                        "
-                        showValue="后稀释"
-                      ></label-box>
+                     
+                      </check-box>
+
+                      <check-box
+                       :checked="record&&record.prescription.mode_id == 2"
+                        text="HDF"
+                      ></check-box>
+
+                      (<check-box
+                      :checked="record&&record.prescription.mode_id == 2 &&  record&&record.prescription.displace_liqui_part == 1"
+                        text="前稀释"
+                      ></check-box>
+                      <check-box
+                      :checked="record&&record.prescription.mode_id == 2 &&  record&&record.prescription.displace_liqui_part == 2"
+                        text="后稀释"
+                      ></check-box>
                       ， 置换量：&nbsp;{{
                         record&&record.prescription.displace_liqui_value
                           ? record&&record.prescription.displace_liqui_value
                           : "/"
                       }}L&nbsp; )
 
-                      <label-box
-                        :isChecked="record&&record.prescription.mode_id > 2 ? true : false"
-                        showValue="其他:"
-                      ></label-box>
+                      <check-box
+                       :checked="record&&record.prescription.mode_id > 2" 
+                        text="其他"
+                      ></check-box>
                       &nbsp;
                       <span v-if="record&&record.prescription.mode_id > 2">
                         {{ record&&record.prescription.mode }}
@@ -264,27 +258,22 @@
 
                     <td colspan="12" style="padding-left: 10px">
                       治疗抗凝:
-                      <label-box
-                        v-if="record&&record.prescription.anticoagulant == 3"
-                        :isChecked="
-                          record&&record.prescription.anticoagulant == 3 ? true : false
-                        "
-                        showValue="低分子肝素:"
-                      ></label-box>
-                      <label-box
+                      <check-box
+                       :checked="record&&record.prescription.anticoagulant == 3" 
+                        text="低分子肝素"
+                      ></check-box>
+                     
+                      <check-box
                         v-if="record&&record.prescription.anticoagulant == 6"
-                        :isChecked="
-                          record&&record.prescription.anticoagulant == 6 ? true : false
-                        "
-                        showValue="低分子肝素钙:"
-                      ></label-box>
-                      <label-box
+                        :checked="record&&record.prescription.anticoagulant == 6" 
+                        text="低分子肝素钙:"
+                      ></check-box>
+                  
+                      <check-box
                         v-if="record&&record.prescription.anticoagulant == 7"
-                        :isChecked="
-                          record&&record.prescription.anticoagulant == 7 ? true : false
-                        "
-                        showValue="低分子肝素钠:"
-                      ></label-box>
+                        :checked="record&&record.prescription.anticoagulant == 7" 
+                        text="低分子肝素钠:"
+                      ></check-box>
 
                       &nbsp;&nbsp;{{
                         record&&record.prescription.anticoagulant_zongliang &&
@@ -294,13 +283,13 @@
                           ? record&&record.prescription.anticoagulant_zongliang
                           : ""
                       }}iu；&nbsp;&nbsp;
-                      <label-box
-                        :isChecked="
-                          record&&record.prescription.anticoagulant == 2 ? true : false
-                        "
-                        showValue="普通肝素:"
-                      ></label-box
-                      >首剂 &nbsp;&nbsp;<span
+                    
+                      <check-box
+                        v-if="record&&record.prescription.anticoagulant == 2"
+                        :checked="record&&record.prescription.anticoagulant == 2" 
+                        text="普通肝素:"
+                      ></check-box>
+                      首剂 &nbsp;&nbsp;<span
                         ><span style="width: 35px; display: inline-block">
                           {{
                             record&&record.prescription.anticoagulant_shouji &&
@@ -309,8 +298,7 @@
                               ? record&&record.prescription.anticoagulant_shouji
                               : ""
                           }}
-                        </span></span
-                      >
+                        </span></span>
                       &nbsp;mg&nbsp;&nbsp;&nbsp; 追加&nbsp;&nbsp;<span>{{
                         record&&record.prescription.anticoagulant_weichi &&
                         record&&record.prescription.anticoagulant == 2
@@ -324,26 +312,23 @@
                           : ""
                       }}</span
                       >&nbsp;&nbsp;mg；
-                      <label-box
-                        :isChecked="
-                          record&&record.prescription.anticoagulant == 1 ? true : false
-                        "
-                        showValue="无肝素"
-                      ></label-box
-                      >&nbsp;&nbsp;
-                      <label-box
-                        :isChecked="
-                          record&&record.prescription.anticoagulant != 1 &&
-                          record&&record.prescription.anticoagulant != 2 &&
-                          record&&record.prescription.anticoagulant != 3 &&
-                          record&&record.prescription.anticoagulant != 6 &&
-                          record&&record.prescription.anticoagulant != 7 &&
-                          record&&record.prescription.anticoagulant != 0
-                            ? true
-                            : false
-                        "
-                        showValue="其他"
-                      ></label-box>
+                    
+                      <check-box
+                        v-if="record&&record.prescription.anticoagulant == 1"
+                        :checked="record&&record.prescription.anticoagulant == 1" 
+                        text="无肝素"
+                      ></check-box>&nbsp;&nbsp;
+                      <check-box
+                        v-if="record&&record.prescription.anticoagulant == 1"
+                        :checked=" record&&record.prescription.anticoagulant != 1 && 
+                        record&&record.prescription.anticoagulant != 2 &&
+                        record&&record.prescription.anticoagulant != 3 &&
+                        record&&record.prescription.anticoagulant != 6&&
+                        record&&record.prescription.anticoagulant != 7 &&
+                        record&&record.prescription.anticoagulant != 0" 
+                        text="其他"
+                      ></check-box>&nbsp;&nbsp;
+                     
                       <span style="padding-left: 10px">
                         <span
                           style="
@@ -488,96 +473,60 @@
                       <div style="display: flex; justify-content: flex-start">
                         <div style="width: 100%">
                           血管通路: &nbsp;
-                          <label-box
-                            :isChecked="
-                              record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '自体内瘘'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="自体内瘘"
-                          ></label-box>
+                        
+
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('自体内瘘') > -1" 
+                            text="自体内瘘"
+                          ></check-box>
                           &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '人造血管'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="人造血管"
-                          ></label-box>
-                          &nbsp; &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '直穿'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="直穿"
-                          ></label-box>
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('人造血管') > -1" 
+                            text="人造血管"
+                          ></check-box>
                           &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '颈内静脉'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="颈内静脉"
-                          ></label-box>
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('直穿') > -1" 
+                            text="直穿"
+                          ></check-box>
                           &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '股静脉'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="股静脉"
-                          ></label-box>
+
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('颈内静脉') > -1" 
+                            text="颈内静脉"
+                          ></check-box>
                           &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '锁骨下'
-                              ) > -1
-                                ? true
-                                : false
-                            "
-                            showValue="锁骨下"
-                          ></label-box>
+                       
+
+                          
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('股静脉') > -1" 
+                            text="股静脉"
+                          ></check-box>
                           &nbsp;
-                          <label-box
-                            :isChecked="
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '锁骨下'
-                              ) == -1 &&
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '股静脉'
-                              ) == -1 &&
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '颈内静脉'
-                              ) == -1 &&
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '人造血管'
-                              ) == -1 &&
-                               record&&record.assessment_before_dislysis.blood_access_part_id.indexOf(
-                                '自体内瘘'
-                              ) == -1 &&
-                               record&&record.assessment_before_dislysis.blood_access_part_id != ''
-                                ? true
-                                : false
-                            "
-                            showValue="其他"
-                          ></label-box>
-                          <span style="padding-left: 20px">
+
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('锁骨下') > -1" 
+                            text="锁骨下"
+                          ></check-box>
+                          &nbsp;
+
+
+                          
+                          <check-box
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('锁骨下') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('股静脉') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('颈内静脉') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('人造血管') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('自体内瘘') == -1
+                            " 
+                             
+                             text="其他"
+                          ></check-box>
+                          &nbsp;
+                         
+                    
+                          <span style="padding-left:10px">
                             <span
                               style="
                                 display: inline-block;
@@ -828,177 +777,173 @@
             </tr>
             <tr style="transform: translateY(4px)">
                 <td colspan="11">
-                <table  class="inside_table" border="1" style="text-align: center">
-                    <tr>
-                    <td style="height: 20px" width="60">
-                        <p style="height: 20px; line-height: 20px">时间</p>
+                  <table  class="inside_table" border="1" style="text-align: center">
+                      <tr>
+                      <td style="height: 20px" width="60">
+                          <p style="height: 20px; line-height: 20px">时间</p>
+                      </td>
+                    
+                      <td style="height: 20px" width="344">
+                          <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
+                      </td>
+                  
+                  
+                      <td style="height: 20px" width="90">
+                          <p style="height: 20px; line-height: 20px">执行</p>
+                      </td>
+                      <td style="height: 20px" width="90">
+                          <p style="height: 20px; line-height: 20px">核对</p>
+                      </td>
+                      <td style="height: 20px" width="144">
+                          <p style="height: 20px; line-height: 20px">上次透后体重</p>
+                      </td>
+                      <td style="height: 20px" width="60">
+                          {{
+                          record.patient.total_dialysis +
+                              record.patient.user_sys_before_count >
+                          0
+                              ? record.assessment_after_dislysis.weight_after
+                              : "/"
+                          }}kg
+                      </td>
+                      </tr>
+                      <tr v-for="(advice, advice_index) in record.advices" :key="advice_index" style="transform: translateY(3px)">
+            
+                    <td width="60">
+                     <span v-if="advice[0]!=undefined">{{ getTime(advice[0].start_time, "{h}:{i}") }}</span>  
                     </td>
-                   
-                    <td style="height: 20px" width="344">
-                        <p style="height: 20px; line-height: 20px">医嘱执行记录</p>
+                  
+                    <td style="text-align: left; padding-left: 5px" width="340">
+                      <span v-if="advice[0]&&advice[0].parent_id > 0">---></span>
+                      <span>{{advice[0]&& advice[0].advice_name }}</span>
+                      <span v-if="advice[0] && advice[0].advice_desc"
+                        >({{ advice[0]&&advice[0].advice_desc
+                        }}{{advice[0]&& advice[0].drug_spec_unit }})</span
+                      >
+                      <span v-if="advice[0]&&advice[0].prescribing_number"
+                        >&nbsp;&nbsp; {{advice[0]&& advice[0].prescribing_number
+                        }}{{advice[0]&& advice[0].prescribing_number_unit }}</span
+                      >
+                      <span v-if="advice[0]&&advice[0].single_dose != 0"
+                        >{{advice[0]&& advice[0].single_dose
+                        }}{{advice[0]&& advice[0].single_dose_unit }}</span
+                      >
+
+                      <span v-if="advice[0]&&advice[0].parent_id == 0">{{
+                        advice[0]&&advice[0].delivery_way
+                      }}</span>
+                      <span v-if="advice[0]&&advice[0].parent_id == 0">{{
+                        advice[0]&&advice[0].execution_frequency
+                      }}</span>
+                      <span>{{advice[0]&&advice[0].remark }}</span>
                     </td>
-                 
                 
-                    <td style="height: 20px" width="90">
-                        <p style="height: 20px; line-height: 20px">执行</p>
+                  
+                    <td style="line-height: 10px" width="90">
+                      <span v-if="setAdminUserES(advice[0]&&advice[0].execution_staff) == ''">{{
+                        getAdminUser(advice[0]&&advice[0].execution_staff)
+                      }}</span>
+                      <img
+                        style="height: 30px"
+                        :src="setAdminUserES(advice[0]&&advice[0].execution_staff)"
+                        alt=""
+                        srcset=""
+                      />
                     </td>
-                    <td style="height: 20px" width="90">
-                        <p style="height: 20px; line-height: 20px">核对</p>
+                    <td style="line-height: 30px" width="90">
+                      <span v-if="setAdminUserES(advice[0]&&advice[0].checker) == ''">{{
+                        getAdminUser(advice[0]&&advice[0].checker)
+                      }}</span>
+                      <img
+                        style="height: 30px"
+                        :src="setAdminUserES(advice[0]&&advice[0].checker)"
+                        alt=""
+                        srcset=""
+                        v-else
+                      />
                     </td>
-                    <td style="height: 20px" width="144">
-                        <p style="height: 20px; line-height: 20px">上次透后体重</p>
+
+                    <td v-if="advice_index === 0" width="145">透前体重:</td>
+                    <td v-if="advice_index === 0" width="60">
+                      {{record.patient.total_dialysis +record.patient.user_sys_before_count>0? record.assessment_before_dislysis.weight_before: "/"}}kg
                     </td>
-                    <td style="height: 20px" width="60">
-                        {{
+                    <td v-if="advice_index === 1" width="145">体重增加量:</td>
+                    <td v-if="advice_index === 1" width="60">
+                      {{
+                        record.assessment_after_dislysis.weight_after == 0 ||
+                        record.assessment_before_dislysis.weight_before == 0
+                          ? 0
+                          : (
+                              record.assessment_before_dislysis.weight_before -
+                              record.assessment_after_dislysis.weight_after
+                            ).toFixed(2)
+                      }}kg
+                    </td>
+                    <td v-if="advice_index === 2" width="145">干体重(DW):</td>
+                    <td v-if="advice_index === 2" width="60">
+                      {{
                         record.patient.total_dialysis +
-                            record.patient.user_sys_before_count >
+                          record.patient.user_sys_before_count >
                         0
-                            ? record.assessment_after_dislysis.weight_after
-                            : "/"
-                        }}kg
+                          ? record.assessment_before_dislysis.dry_weight
+                          : "/"
+                      }}kg
                     </td>
-                    </tr>
-                    
-                </table>
+                    <td v-if="advice_index === 3" width="145">较干体重增加量:</td>
+                    <td v-if="advice_index === 3" width="60">
+                      {{
+                        record.patient.total_dialysis +
+                          record.patient.user_sys_before_count >
+                          0 && record.assessment_after_dislysis.weight_after != 0
+                          ? (
+                              record.assessment_after_dislysis.weight_after - record.assessment_before_dislysis.dry_weight
+                            ).toFixed(2)
+                          : 0
+                      }}kg
+                    </td>
+                    <td v-if="advice_index === 4" width="145">机器显示脱水量:</td>
+                    <td v-if="advice_index === 4" width="60">
+                      {{
+                        record.patient.total_dialysis +
+                          record.patient.user_sys_before_count >
+                        0
+                          ? record.assessment_after_dislysis.actual_ultrafiltration
+                          : "/"
+                      }}ml
+                    </td>
+                    <td v-if="advice_index === 5" width="145">透后体重:</td>
+                    <td v-if="advice_index === 5" width="60">
+                      {{
+                        record.patient.total_dialysis +
+                          record.patient.user_sys_before_count >
+                        0
+                          ? record.assessment_after_dislysis.weight_after
+                          : "/"
+                      }}kg
+                    </td>
+                    <td v-if="advice_index === 6" width="145">
+                      本次透析体重下降量:
+                    </td>
+                    <td v-if="advice_index === 6" width="60">
+                      {{
+                        record.assessment_after_dislysis.weight_after == 0 ||
+                        record.assessment_before_dislysis.weight_before == 0
+                          ? 0
+                          : (
+                              record.assessment_before_dislysis.weight_before -
+                              record.assessment_after_dislysis.weight_after
+                            ).toFixed(2)
+                      }}kg
+                    </td>
+                    <td v-if="advice_index > 6" width="145"></td>
+                    <td v-if="advice_index > 6" width="60"></td>
+                
+                  </tr>
+                  </table>
                 </td>
             </tr>
          
-          <tr v-for="(advice, advice_index) in record.advices" :key="advice_index" style="transform: translateY(3px)">
-            <td colspan="11">
-              <table class="inside_table" border="1">
-                <tr>
-                  <td width="60">
-                    {{ getTime(advice[0].start_time, "{h}:{i}") }}
-                  </td>
-                
-                  <td style="text-align: left; padding-left: 5px" width="340">
-                    <span v-if="advice[0].parent_id > 0">---></span>
-                    <span>{{ advice[0].advice_name }}</span>
-                    <span v-if="advice && advice[0].advice_desc"
-                      >({{ advice[0].advice_desc
-                      }}{{ advice[0].drug_spec_unit }})</span
-                    >
-                    <span v-if="advice[0].prescribing_number"
-                      >&nbsp;&nbsp; {{ advice[0].prescribing_number
-                      }}{{ advice[0].prescribing_number_unit }}</span
-                    >
-                    <span v-if="advice[0].single_dose != 0"
-                      >{{ advice[0].single_dose
-                      }}{{ advice[0].single_dose_unit }}</span
-                    >
-
-                    <span v-if="advice[0].parent_id == 0">{{
-                      advice[0].delivery_way
-                    }}</span>
-                    <span v-if="advice[0].parent_id == 0">{{
-                      advice[0].execution_frequency
-                    }}</span>
-                    <span>{{ advice[0].remark }}</span>
-                  </td>
-              
-                
-                  <td style="line-height: 10px" width="90">
-                    <span v-if="setAdminUserES(advice[0].execution_staff) == ''">{{
-                      getAdminUser(advice[0].execution_staff)
-                    }}</span>
-                    <img
-                      style="height: 30px"
-                      :src="setAdminUserES(advice[0].execution_staff)"
-                      alt=""
-                      srcset=""
-                    />
-                  </td>
-                  <td style="line-height: 30px" width="90">
-                    <span v-if="setAdminUserES(advice[0].checker) == ''">{{
-                      getAdminUser(advice[0].checker)
-                    }}</span>
-                    <img
-                      style="height: 30px"
-                      :src="setAdminUserES(advice[0].checker)"
-                      alt=""
-                      srcset=""
-                      v-else
-                    />
-                  </td>
-
-                  <td v-if="advice_index === 0" width="145">透前体重:</td>
-                  <td v-if="advice_index === 0" width="60">
-                    {{record.patient.total_dialysis +record.patient.user_sys_before_count>0? record.assessment_before_dislysis.weight_before: "/"}}kg
-                  </td>
-                  <td v-if="advice_index === 1" width="145">体重增加量:</td>
-                  <td v-if="advice_index === 1" width="60">
-                    {{
-                      record.assessment_after_dislysis.weight_after == 0 ||
-                      record.assessment_before_dislysis.weight_before == 0
-                        ? 0
-                        : (
-                            record.assessment_before_dislysis.weight_before -
-                            record.assessment_after_dislysis.weight_after
-                          ).toFixed(2)
-                    }}kg
-                  </td>
-                  <td v-if="advice_index === 2" width="145">干体重(DW):</td>
-                  <td v-if="advice_index === 2" width="60">
-                    {{
-                      record.patient.total_dialysis +
-                        record.patient.user_sys_before_count >
-                      0
-                        ? record.assessment_before_dislysis.dry_weight
-                        : "/"
-                    }}kg
-                  </td>
-                  <td v-if="advice_index === 3" width="145">较干体重增加量:</td>
-                  <td v-if="advice_index === 3" width="60">
-                    {{
-                      record.patient.total_dialysis +
-                        record.patient.user_sys_before_count >
-                        0 && record.assessment_after_dislysis.weight_after != 0
-                        ? (
-                            record.assessment_after_dislysis.weight_after - record.assessment_before_dislysis.dry_weight
-                          ).toFixed(2)
-                        : 0
-                    }}kg
-                  </td>
-                  <td v-if="advice_index === 4" width="145">机器显示脱水量:</td>
-                  <td v-if="advice_index === 4" width="60">
-                    {{
-                      record.patient.total_dialysis +
-                        record.patient.user_sys_before_count >
-                      0
-                        ? record.assessment_after_dislysis.actual_ultrafiltration
-                        : "/"
-                    }}ml
-                  </td>
-                  <td v-if="advice_index === 5" width="145">透后体重:</td>
-                  <td v-if="advice_index === 5" width="60">
-                    {{
-                      record.patient.total_dialysis +
-                        record.patient.user_sys_before_count >
-                      0
-                        ? record.assessment_after_dislysis.weight_after
-                        : "/"
-                    }}kg
-                  </td>
-                  <td v-if="advice_index === 6" width="145">
-                    本次透析体重下降量:
-                  </td>
-                  <td v-if="advice_index === 6" width="60">
-                    {{
-                      record.assessment_after_dislysis.weight_after == 0 ||
-                      record.assessment_before_dislysis.weight_before == 0
-                        ? 0
-                        : (
-                            record.assessment_before_dislysis.weight_before -
-                            record.assessment_after_dislysis.weight_after
-                          ).toFixed(2)
-                    }}kg
-                  </td>
-                  <td v-if="advice_index > 6" width="145"></td>
-                  <td v-if="advice_index > 6" width="60"></td>
-                </tr>
-              </table>
-            </td>
-          </tr>
+      
         <tr style="transform: translateY(1px)">
             <td colspan="11">  
             <table class="inside_table" border="1">
@@ -1009,7 +954,7 @@
                     }}
                 </td>
                 </tr>
-                <tr style="height: 50px; text-align: left" v-if="org_id==10430||org_id==9675">
+                <tr style="height: 50px; text-align: left" v-if="org_id==10430||org_id==9675 || org_id == 0">
                 <td style="padding-left: 5px; border-bottom: none;border-top: none;">
                     透析护理记录：{{
                     record.summer&&record.summer.nursing_record ? record.summer&&record.summer.nursing_record : ""
@@ -1131,7 +1076,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
 export default {
-  name: "BatchPrintOrderSix",
+  name: "BatchPrintOrderFiftyThree",
   components: {
     CheckBox,
     BreadCrumb,
@@ -1167,6 +1112,7 @@ export default {
       loading: false,
       orgname: "",
       bloodAccessParOpera: {},
+      bloodAccessParOperaList:[],
       anticoagulantsConfit: {},
       dialysateFormulationOptions: {},
       operatorMaps: {},
@@ -1197,6 +1143,11 @@ export default {
       "hemodialysis",
       "vascular_access_desc"
     );
+    this.bloodAccessParOperaList = getDataConfig(
+      "hemodialysis",
+      "vascular_access_desc"
+    );
+    console.log("z=============",this.bloodAccessParOperaList)
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");
     this.appetite_arr = getDataConfig("hemodialysis", "appetite");
@@ -1260,6 +1211,14 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           this.records = this.records.concat(resp.data.schedules);
+          console.log("记录233333333333333333",this.records)
+          for(let i = 0 ; i < this.records.length ; i++){
+            console.log("进来",this.records[i].assessment_before_dislysis.blood_access_part_opera_id)
+            this.records[i].assessment_before_dislysis.blood_access_part_opera_name = ""
+            this.records[i].assessment_before_dislysis.blood_access_part_opera_name = this.bloodAccessParOperaName(this.records[i].assessment_before_dislysis.blood_access_part_opera_id)
+            console.log("232332",this.records[i].assessment_before_dislysis.blood_access_part_opera_name)
+          }
+          console.log("中uo",this.records)
           var tempmonitorflag = true;
           for(let i=0;i<this.records.length;i++){
             for(let j=0;j<this.records[i].monitor_records.length;j++){
@@ -1453,7 +1412,6 @@ export default {
         scanStyles: false,
       });
     },
-
     complicationsOther: function (record) {
       if (record == null || typeof record === "undefined") {
         return "";
@@ -1490,11 +1448,17 @@ export default {
       return "";
     },
     bloodAccessParOperaName(id) {
-      console.log(tihs.records, "hhh");
-      if (id in this.bloodAccessParOpera) {
-        return this.bloodAccessParOpera[id].name;
+     console.log("233333333333333",id)
+      // if (id in this.bloodAccessParOpera) {
+      //   return this.bloodAccessParOpera[id].name;
+      // }
+      var name = ""
+      for(let i=0;i<this.bloodAccessParOperaList.length;i++){
+        if(id== this.bloodAccessParOperaList[i].id){
+           name = this.bloodAccessParOperaList[i].name
+        }
       }
-      return "";
+      return name;
     },
     isBbloodAccessParOperaCheck(key, value) {
       if (key == null || typeof key === "undefined") {
@@ -1602,16 +1566,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/batch_print/batch_print_order_six.vue

@@ -894,7 +894,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id !=0">
+                        v-if="org_id!=10440 && org_id!=0 && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -918,6 +918,21 @@
                         </div>
                         kg
                       </div>
+
+                      <div class="inline_block" style="flex: 1"
+                        v-if="org_id==10440 && org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495">
+                        上次透后体重：
+                        <div
+                          class="under_line"
+                          style="width: 100px; text-align: center"
+                        >
+                          <span>{{
+                            record.lastafterweight.weight_after
+                          }}</span>
+                       
+                        </div>
+                        kg
+                      </div>
                       <div class="inline_block" style="flex: 1">
                         透前体重：
                         <div
@@ -938,7 +953,7 @@
                         </div>
                         kg
                       </div>
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1" v-if="org_id!=0 && org_id!=10469">
                         计划超滤量：
                         <div
                           class="under_line"
@@ -954,6 +969,22 @@
                          <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">ml</span> 
                          <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471">L</span>
                       </div>
+
+                      <div class="inline_block" style="flex: 1" v-if="org_id==0 || org_id == 10469">
+                        处方脱水量：
+                        <div
+                          class="under_line"
+                          style="width: 100px; text-align: center"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.prescription_water
+                              ? record.prescription.prescription_water
+                              : "/"
+                          }}
+                        </div>
+                        ml
+                      </div>
                       <div class="inline_block" style="flex: 1">
                         干体重：
                         <div
@@ -1295,11 +1326,19 @@
                           <td
                             width="50"
                             v-if="
-                              org_id == 10121 || org_id == 9675 || org_id == 0
+                              org_id == 10121 || org_id == 9675 
                             "
                           >
                             SpO₂<br />(%)
                           </td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 0 || org_id ==  10469
+                            "
+                          >
+                            钠浓度<br />(mmol/L)
+                          </td>
                           <td width="50" v-if="org_id != 0 && org_id != 3877 && org_id != 10449">超滤量<br />(ml)</td>
                           <td width="50" v-if="org_id ==0 || org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
@@ -1414,8 +1453,9 @@
                             v-if="
                               org_id != 9538 &&
                               org_id != 10121 &&
-                              org_id != 9675 &&
-                              org_id != 0
+                              org_id != 9675 && 
+                              org_id!=0
+                             
                             "
                           >
                             {{
@@ -1427,7 +1467,7 @@
 
                           <td
                             v-if="
-                              org_id == 10121 || org_id == 9675 || org_id == 0
+                              org_id == 10121 || org_id == 9675 
                             "
                           >
                             {{
@@ -1437,6 +1477,18 @@
                             }}
                           </td>
 
+                          <td
+                            v-if="
+                              org_id == 0 || org_id == 10469 
+                            "
+                          >
+                            {{
+                              monitor_record.sodium_concentration
+                                ? monitor_record.sodium_concentration
+                                : ""
+                            }}
+                          </td>
+
                           <td v-if="org_id == 9538">
                             {{
                               monitor_record.sodium_concentration

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -1374,24 +1374,64 @@
                     核对护士
                     <span
                       style="display: inline-block;width:100px;text-align: left;"
+                    >
+                      &nbsp;
+
+                      <span
+                            v-if="
+                              !record.advices ||
+                                typeof record.advices[0] == 'undefined' ||
+                                typeof record.advices[0][0] == 'undefined'
+                            "
+                          ></span>
+                          <span
+                            v-else-if="
+                              setAdminUserES(
+                                record.advices[0][0],
+                                'checker'
+                              ) == ''
+                            "
+                            >{{
+                              getAdminUser(
+                                record.advices[0][0],
+                                "checker"
+                              )
+                            }}</span
+                          >
+                          <img
+                             style="height: 30px;"
+                            :src="
+                              setAdminUserES(
+                                record.advices[0][0],
+                                'checker'
+                              )
+                            "
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+
+                    </span>
+                    <!-- <span
+                      style="display: inline-block;width:100px;text-align: left;"
                     >
                       <span
                           v-if="
-                            setAdminUserES(record.check, 'modifier') ==
+                            setAdminUserES(record.check, 'creater') ==
                               ''
                           "
                           >{{
-                            getAdminUser(record.check, "modifier")
+                            getAdminUser(record.check, "creater")
                           }}</span
                         >
                         <img
-                          :src="setAdminUserES(record.check, 'modifier')"
+                          :src="setAdminUserES(record.check, 'creater')"
                           alt=""
                           srcset=""
                           v-else
                           style="height: 30px;"
                         />
-                    </span>
+                    </span> -->
                     护士签名
                     <span
                       style="display: inline-block;width:100px;text-align: left;"

src/xt_pages/dialysis/components/consumablesDialog.vue

@@ -10,6 +10,8 @@
         style="width:150px;margin-right:10px"
         v-model="startTime"
         type="date"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         placeholder="选择日期"
         @change="selectStartime">
       </el-date-picker>
@@ -17,6 +19,8 @@
         style="width:150px;margin-right:10px"
         v-model="endTime"
         type="date"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         placeholder="选择日期"
         @change="selectEndtime">
       </el-date-picker>

src/xt_pages/dialysis/components/dialysisDrugsDialog.vue

@@ -10,6 +10,8 @@
         style="width:140px;margin-right:10px"
         v-model="startTime"
         type="date"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         placeholder="选择日期"
         @change="changeStartTime">
         </el-date-picker>
@@ -17,6 +19,8 @@
         style="width:140px;margin-right:10px"
         v-model="endTime"
         type="date"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         placeholder="选择日期"
         @change="changeEndTime">
         </el-date-picker>

src/xt_pages/dialysis/components/dialysisParametersDialog.vue

@@ -11,12 +11,16 @@
         v-model="startTime"
         type="date"
         placeholder="选择日期"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         @change="selectStartime">
         </el-date-picker>
         <el-date-picker
         style="width:150px;margin-right:10px"
         v-model="endTime"
         type="date"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
         placeholder="选择日期">
         </el-date-picker>
         <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>

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

@@ -260,6 +260,7 @@
         },
         zoneIdList:[],
         partion_str:"",
+     
       }
     },
     created() {
@@ -662,33 +663,35 @@
           }
         }
 
-        if(this.$store.getters.xt_user.org_id == 10469 || this.$store.getters.xt_user.org_id == 0){
+        if(this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 10469){
+          //  console.log("----------------------",this.selected_date)
+            console.log("星期",this.getweekday(this.selected_date))
             var newArrList = []
-            var total_day = ""
-            if(moment().weekday() == 1){
-              total_day ="周一"
-            }
-            if(moment().weekday() == 2){
-              total_day ="周二"
-            }
-            if(moment().weekday() == 3){
-              total_day ="周三"
-            }
-            if(moment().weekday() == 4){
-              total_day ="周四"
-            }
-            if(moment().weekday() == 5){
-              total_day ="周五"
-            }
-            if(moment().weekday() == 6){
-              total_day ="周六"
-            }
-            if(moment().weekday() == 7){
-              total_day ="周日"
-            }
+            // var total_day = ""
+            // if(moment().weekday() == 1){
+            //   total_day ="周一"
+            // }
+            // if(moment().weekday() == 2){
+            //   total_day ="周二"
+            // }
+            // if(moment().weekday() == 3){
+            //   total_day ="周三"
+            // }
+            // if(moment().weekday() == 4){
+            //   total_day ="周四"
+            // }
+            // if(moment().weekday() == 5){
+            //   total_day ="周五"
+            // }
+            // if(moment().weekday() == 6){
+            //   total_day ="周六"
+            // }
+            // if(moment().weekday() == 7){
+            //   total_day ="周日"
+            // }
           if(newArr!=null && newArr.length >0){
             for(let i=0;i<newArr.length;i++){
-              if((newArr[i].frequency_type == 1) || (newArr[i].frequency_type == 3 && newArr[i].week_day.indexOf(total_day)!=-1)){
+              if((newArr[i].frequency_type == 1) || (newArr[i].frequency_type == 3 && newArr[i].week_day.indexOf(this.getweekday(this.selected_date))!=-1)){
                 console.log("药品名称",newArr[i].advice_name)
                  newArrList.push(newArr[i])
               }
@@ -702,7 +705,7 @@
             }
           }
         }
-        if(this.$store.getters.xt_user.org_id != 10469 && this.$store.getters.xt_user.org_id != 0){
+        if(this.$store.getters.xt_user.org_id != 9671 && this.$store.getters.xt_user.org_id != 0 && this.$store.getters.xt_user.org_id != 10469){
          
           if(newArr!=null && newArr.length > 0){
             for(let i=0;i<newArr.length;i++){
@@ -799,7 +802,14 @@
      changePartionType(){
       this.tableList = []
       this.statistics()
-     }
+     },
+     getweekday(date){
+        var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
+
+        var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
+
+        return week;
+      }
     }
   }
 </script>

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

@@ -199,31 +199,31 @@
 
         if(this.$store.getters.xt_user.org_id == 10469 || this.$store.getters.xt_user.org_id == 0){
             var newArrList = []
-            var total_day = ""
-            if(moment().weekday() == 1){
-              total_day ="周一"
-            }
-            if(moment().weekday() == 2){
-              total_day ="周二"
-            }
-            if(moment().weekday() == 3){
-              total_day ="周三"
-            }
-            if(moment().weekday() == 4){
-              total_day ="周四"
-            }
-            if(moment().weekday() == 5){
-              total_day ="周五"
-            }
-            if(moment().weekday() == 6){
-              total_day ="周六"
-            }
-            if(moment().weekday() == 7){
-              total_day ="周日"
-            }
+            // var total_day = ""
+            // if(moment().weekday() == 1){
+            //   total_day ="周一"
+            // }
+            // if(moment().weekday() == 2){
+            //   total_day ="周二"
+            // }
+            // if(moment().weekday() == 3){
+            //   total_day ="周三"
+            // }
+            // if(moment().weekday() == 4){
+            //   total_day ="周四"
+            // }
+            // if(moment().weekday() == 5){
+            //   total_day ="周五"
+            // }
+            // if(moment().weekday() == 6){
+            //   total_day ="周六"
+            // }
+            // if(moment().weekday() == 7){
+            //   total_day ="周日"
+            // }
           if(newArr!=null && newArr.length >0){
             for(let i=0;i<newArr.length;i++){
-              if((newArr[i].frequency_type == 1) || (newArr[i].frequency_type == 3 && newArr[i].week_day.indexOf(total_day)!=-1)){
+              if((newArr[i].frequency_type == 1) || (newArr[i].frequency_type == 3 && newArr[i].week_day.indexOf(this.getweekday(this.$route.query.schedule_date))!=-1)){
                 
                  newArrList.push(newArr[i])
               }
@@ -267,6 +267,16 @@
         const res = new Map()
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
       },
+
+      getweekday(date){
+        var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
+
+        var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
+
+        return week;
+      }
+
+      
     }
   }
 </script>

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

@@ -685,6 +685,7 @@
                    }
 
                  }
+                 console.log("list--------------------",list)
                  this.list = list
                }
              }

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

@@ -28,7 +28,7 @@
                 <td width="50">序号</td>
                 <td width="100">透析机号</td>
                 <td width="100">姓名</td>
-                <td width="100">透析机号</td>
+                <td width="100">透析号</td>
                 <td width="200" v-for="(item,index) in rowList" :key="index">
                   {{item.filed_name_cn}} 
                 </td>

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/assessmentBeforeDislysisDialog.vue

@@ -684,8 +684,8 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
                 <el-button @click="handleCancle">取 消</el-button>
-                 <!-- v-if="hasPermission" -->
-                <el-button type="primary" @click="handleComfirm('assessmentBeforeDislysis')">保 存</el-button>
+                 <!--  -->
+                <el-button type="primary" v-if="hasPermission" @click="handleComfirm('assessmentBeforeDislysis')">保 存</el-button>
             </span>
     </el-dialog>
 
@@ -982,41 +982,41 @@
 
     },
     methods: {
-    isName(name) {
-      let filedList = store.getters.xt_user.fileds;
-      for (let i = 0; i < filedList.length; i++) {
-        if (filedList[i].module == 3 && filedList[i].filed_name_cn == name) {
-          return filedList[i].filed_name;
+      isName(name) {
+        let filedList = store.getters.xt_user.fileds;
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 3 && filedList[i].filed_name_cn == name) {
+            return filedList[i].filed_name;
+          }
         }
-      }
-    },
+      },
 
-    isCheckmust(name) {
-      let filedList = store.getters.xt_user.fileds;
-
-      for (let i = 0; i < filedList.length; i++) {
-        if (
-          filedList[i].module == 3 &&
-          filedList[i].filed_name_cn == name &&
-          filedList[i].is_write == 1&&
-          filedList[i].is_show == 1
-        ) {
-          console.log(filedList[i],'false')
-          if (name == "血管通路"||name == "导管打折"||name == '出血'||name == '血栓'||name == '围手术期'||name=='血管杂音'||name=='急诊'||name=='中心静脉导置管') {
-          return [
-            { required: true, message: `请输入${name}` },
-            {
-              required: true,
-              pattern: /^[1-9]\d*$/,
-              message: `请输入${name}`,
-            },
-          ];
-        }
-          return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
-          
+      isCheckmust(name) {
+        let filedList = store.getters.xt_user.fileds;
+
+        for (let i = 0; i < filedList.length; i++) {
+          if (
+            filedList[i].module == 3 &&
+            filedList[i].filed_name_cn == name &&
+            filedList[i].is_write == 1&&
+            filedList[i].is_show == 1
+          ) {
+            // console.log(filedList[i],'false')
+            if (name == "血管通路"||name == "导管打折"||name == '出血'||name == '血栓'||name == '围手术期'||name=='血管杂音'||name=='急诊'||name=='中心静脉导置管') {
+            return [
+              { required: true, message: `请输入${name}` },
+              {
+                required: true,
+                pattern: /^[1-9]\d*$/,
+                message: `请输入${name}`,
+              },
+            ];
+          }
+            return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
+            
+          }
         }
-      }
-    },
+      },
       
       setLastRecord(lastPredialysisEvaluation, lastDryWeightDislysis) {
         this.lastPredialysisEvaluation = lastPredialysisEvaluation
@@ -1027,7 +1027,7 @@
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
           if (filedList[i].module == 3 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
-            console.log("filedList",filedList)
+            // console.log("filedList",filedList)
             return true
           }
         }
@@ -1506,9 +1506,11 @@
         
         
         
-      }, handleCancle: function() {
+      },
+       handleCancle: function() {
         this.isVisibility = false
-      }, showDryWeightDialog: function() {
+      }, 
+      showDryWeightDialog: function() {
         if (this.$store.getters.xt_user.user.user_type == 3) {
           this.$message.error('您没有权限调整干体重')
           return
@@ -1671,7 +1673,8 @@
       //   }
       //
       // }
-    }, watch: {
+    }, 
+    watch: {
       isVisibility(val) {
 
       },

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

@@ -20,7 +20,7 @@
           label="班次"
           v-if="isShowFiled('班次')"
           :prop="isName('班次')"
-         
+          :rules="isCheckmust('班次')"
         >
           <el-select
             v-model="form.schedual_type"
@@ -70,7 +70,7 @@
           label="穿刺者"
           v-if="isShowFiled('穿刺者')"
           prop="puncture_nurse_id"
-         
+          :rules="isCheckmust('穿刺者')"
         >
           <el-select
             v-model="form.puncture_nurse_id"
@@ -91,6 +91,7 @@
           prop="quality_nurse_id"
           :rules="isCheckmust('质控护士')"
         >
+        <!--  -->
           <el-select
             v-model="form.quality_nurse_id"
             placeholder="请选择质控护士"
@@ -110,7 +111,8 @@
           :prop="isName('换药护士')"
           :rules="isCheckmust('换药护士')"
         >
-          <el-select v-model="form.change_nurse" placeholder="换药护士">
+        <!--  -->
+          <el-select v-model="form.change_nurse" placeholder="请选择换药护士">
             <el-option
               v-for="(admin, index) in adminRoles"
               :key="index"
@@ -249,7 +251,6 @@
         >
           <el-select v-model="form.blood_access_id" placeholder="请选择" @change="changeBloodAccessOpion">
             <el-option :key="0" label="请选择" :value="0"></el-option>
-
             <el-option
               v-for="(option, index) in blood_access_option"
               :key="index + 'i'"
@@ -680,9 +681,7 @@ export default {
           filedList[i].is_show == 1&&
           filedList[i].is_write == 1
         ) {
-          return [{ required: true, message: `请输入${name}` }];
-        } 
-                if (
+          if (
           name == "穿刺者" ||
           name == "质控护士" ||
           name == "换药护士" ||
@@ -694,6 +693,9 @@ export default {
             { required: true, pattern: /^[1-9]\d*$/, message: `请输入${name}`,trigger: ['blur','change'] },
           ];
         }
+          return [{ required: true, message: `请输入${name}` }];
+        } 
+                
 
       }
     },
@@ -1119,7 +1121,7 @@ export default {
     changeBloodAccessOpion(id){
       var name = ""
       for(let i=0;i<this.blood_access_option.length;i++){
-        console.log("id9999",this.blood_access_option[i].id)
+        // console.log("id9999",this.blood_access_option[i].id)
         if(id == this.blood_access_option[i].id){
            name = this.blood_access_option[i].name
         }
@@ -1130,7 +1132,7 @@ export default {
     changeBloodAccessOpionOne(id){
       var name = ""
       for(let i=0;i<this.blood_access_option.length;i++){
-        console.log("id9999",this.blood_access_option[i].id)
+        // console.log("id9999",this.blood_access_option[i].id)
         if(id == this.blood_access_option[i].id){
            name = this.blood_access_option[i].name
         }

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

@@ -4,7 +4,7 @@
       <!-- <div class="txsj">
       </div> -->
       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
-      <el-form :model="form" label-width="100px"  :rules="drugdicRules"  ref="form">
+      <el-form :model="form" label-width="100px"    ref="form">
         <el-form-item label="下机护士" >
           <el-select v-model="form.nurse_id" :disabled="!(dialysis_order.id != 0)">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
@@ -36,7 +36,6 @@
             <el-input v-model="form.internal_fistula" readonly  @focus="showInnerDialog('7')" style="width:200px"></el-input>
         </el-form-item>
 
-
         <el-form-item label="导管: " :prop="isName('导管')"
               :rules="isCheckmust('导管')" v-if="isShowFiled('导管')">
           <el-input v-model="form.catheter" @focus="showInnerDialog('4')" style="width:200px"></el-input>
@@ -183,9 +182,6 @@
         },
         catheter: [],
         cruorOptions: [],
-        drugdicRules: {
-         internal_fistula: [{ required: true, message: "请选择内瘘" }]
-        },
         required:false,
         education:[],
         infoDialogVisible:false,
@@ -265,7 +261,8 @@
           filedList[i].filed_name_cn == name &&
           filedList[i].is_write == 1
             ) {
-          return [{ required: true ,message:`请输入${name}` }];
+              
+              return [{ required: true ,message:`请输入${name}` }];
             }
           }
         },

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

@@ -239,7 +239,9 @@
                 org_id == 9555 
                 || org_id == 10432
                 || org_id == 10445
-                || org_id == 10410) &&
+                || org_id == 10410 ||
+                org_id == 10495 ||
+                org_id == 10485) &&
                 org_id!=10387
             "
           >
@@ -307,7 +309,8 @@
               org_id!= 10210 &&
               org_id != 9555 
               && org_id!=10432 && org_id!=10445
-              && org_id!=10410)
+              && org_id!=10410 && org_id!=10495 &&
+               org_id!=10485 )
               || org_id == 10387
             "
           >
@@ -359,7 +362,8 @@
                 template_id == 60 ||
                 org_id == 10432 ||
                 org_id == 10445 ||
-                org_id == 10410)
+                org_id == 10410 ||
+                org_id == 10495)
                 && org_id!=10387
             "
           >
@@ -410,7 +414,7 @@
               template_id != 60 &&
               org_id!=10432 &&
               org_id!=10445 &&
-              org_id!=10410) || 
+              org_id!=10410 && org_id!=10495) || 
               org_id == 10387
             "
           >
@@ -470,7 +474,8 @@
                 template_id == 54 ||
                 template_id == 56 ||
                 org_id ==10432 || 
-                org_id ==10445
+                org_id ==10445 || 
+                org_id ==10410
               
                )
             "
@@ -498,7 +503,8 @@
               template_id != 54 &&
               template_id != 56 &&
               org_id !=10432 && 
-              org_id !=10445
+              org_id !=10445 &&
+              org_id !=10410
             "
           >
             <template slot-scope="scope">
@@ -849,6 +855,30 @@
             </template>
           </el-table-column>
 
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="置换液速度(ml/h)"
+            width="140"
+            v-if="isShow('置换液速度')"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.replacement_speed }}
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="碳酸氢钠用量(ml)"
+            width="140"
+            v-if="isShow('碳酸氢钠用量')"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.dicarbonate }}
+            </template>
+          </el-table-column>
+
           <el-table-column
             prop="heparin"
             align="center"
@@ -1201,7 +1231,9 @@
                 org_id == 10340 ||
                 org_id == 10432 ||
                 org_id == 10445 ||
-                org_id == 10410) 
+                org_id == 10410 ||
+                org_id == 10495 ||
+                org_id == 10485) 
                 && org_id!=10387
             "
           >
@@ -1255,7 +1287,10 @@
               org_id != 9555 &&
               org_id!=10432 && 
               org_id!=10445 && 
-              org_id!=10410)
+              org_id!=10410 &&
+              org_id!=10495 &&
+              org_id!=10485
+              )
               || org_id == 10387
             "
           >
@@ -1296,7 +1331,8 @@
               template_id != 56 &&
               template_id != 53 &&
               org_id!=10432 &&
-              org_id!=10445
+              org_id!=10445 &&
+              org_id!=10410
             "
           >
             <el-form-item label="置换率(L/h)：" :prop="isName('置换率')"
@@ -1320,7 +1356,8 @@
                 template_id == 56 ||
                 template_id == 48 ||
                 org_id==10432 ||
-                org_id!=10445)
+                org_id!=10445 ||
+                org_id!=10410)
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"
@@ -1564,6 +1601,20 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('置换液速度')">
+            <el-form-item label="置换液速度(ml/h):" :prop="isName('置换液速度')"
+              :rules="isCheckmust('置换液速度')">
+              <el-input v-model="form.replacement_speed"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShow('碳酸氢钠用量')">
+            <el-form-item label="碳酸氢钠用量(ml):" :prop="isName('碳酸氢钠用量')"
+              :rules="isCheckmust('碳酸氢钠用量')">
+              <el-input v-model="form.dicarbonate"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('滤前压')">
             <el-form-item label="滤前压(mmHg):">
               <el-input v-model="form.filter_pressure"></el-input>
@@ -1822,6 +1873,8 @@ export default {
         heparin_amount: "", //肝素量
         dehydration: "",
         filter_pressure:"",
+        replacement_speed:"",
+        dicarbonate:"",
       },
 
       table_current_row: null,
@@ -2533,7 +2586,18 @@ export default {
         parseFloat(this.form.dehydration) == NaN
           ? 0
           : parseFloat(this.form.dehydration);
+        
       this.form.filter_pressure = this.form.filter_pressure?this.form.filter_pressure:""
+
+      this.form.replacement_speed =
+        parseFloat(this.form.replacement_speed) == NaN
+          ? 0
+          : parseFloat(this.form.replacement_speed);
+
+          this.form.dicarbonate =
+        parseFloat(this.form.dicarbonate) == NaN
+          ? 0
+          : parseFloat(this.form.dicarbonate);
       let mode = "1";
       if (this.form.id > 0) {
         mode = "2";
@@ -2692,6 +2756,16 @@ export default {
               parseFloat(this.form.heparin_amount) == NaN
                 ? 0
                 : parseFloat(this.form.heparin_amount);
+
+                this.form.replacement_speed =
+            parseFloat(this.form.replacement_speed) == NaN
+          ? 0
+          : parseFloat(this.form.replacement_speed);
+
+          this.form.dicarbonate =
+        parseFloat(this.form.dicarbonate) == NaN
+          ? 0
+          : parseFloat(this.form.dicarbonate);
             this.$message.error(resp.msg);
             if(response.data.code == 600000008){
               this.infoDialogVisible = true

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

@@ -150,8 +150,7 @@
         type="primary"
         @click="handleComfirm('treatmentSummary')"
         v-if="hasPermission"
-        >保 存</el-button
-      >
+        >保 存</el-button> <!--  -->
     </div>
   </el-dialog>
 

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,14 +14,14 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445) " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 )" width="92px"  > 置换量(ml)  </th>
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445)" width="92px" > 置换量(L) </th>

src/xt_pages/dialysis/details/index.vue

@@ -54,7 +54,11 @@
         <!-- 候诊区 -->
         <el-tab-pane label="候诊区" name="first">
           <div class="cell clearfix" style="margin-bottom:10px;">
-            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
+            <el-date-picker v-model="selected_date" 
+              prefix-icon="el-icon-date" @change="handleScheduleDateChange"
+             :editable="false" :clearable="false"
+              style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" >
+            </el-date-picker>
             <el-input size="small" style="width:25%;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
             <el-button size="small" class="filter-item" type="primary" style="margin-right:20px;" @click="searchAction">搜索</el-button>
           </div>
@@ -239,147 +243,194 @@
         <div class="print_main_content">
           <div class="table_panel">
              <div v-for="(main_collection,index) in printList" :key="index">
-              <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)  }}岁）
-                </div>
-                <div class="printCell" style="display:flex;justify-content: space-around;">
-                  <span style="display: block;width: 50%;">
-                    床号：{{ main_collection.number.number }}
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span>
-                  </span>
-                  <span style="display: block;width: 50%;">{{ printDate }}</span>
-                </div>
-                <div class="printCell" style="display:flex;justify-content: space-around;">
-                   <span style="display: block;width: 50%;">干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
-                    <span style="display: block;width: 50%;">抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
+                <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)  }}岁）
+                  </div>
+                  <div class="printCell" style="display:flex;justify-content: space-around;">
+                    <span style="display: block;width: 50%;">
+                      床号：{{ main_collection.number.number }}
+                      <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
+                      <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
+                      <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span>
+                    </span>
+                    <span style="display: block;width: 50%;">{{ printDate }}</span>
+                  </div>
+                  <div class="printCell" style="display:flex;justify-content: space-around;">
+                    <span style="display: block;width: 50%;">干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
+                      <span style="display: block;width: 50%;">抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
 
-                </div>
-                <div class="printCell" style="display:flex;justify-content: space-around;">
-                  <span style="display: block;width: 50%;">净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
-                  
-                  <span style="display: block;width: 50%;">
-                    首剂： <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                  </div>
+                  <div class="printCell" style="display:flex;justify-content: space-around;">
+                    <span style="display: block;width: 50%;">净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
+                    
+                    <span style="display: block;width: 50%;">
+                      首剂： <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 4">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}mg
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
-                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
-                   {{main_collection.dialysissolution.anticoagulant_shouji}}mg
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
-                   {{main_collection.dialysissolution.anticoagulant_shouji}} mg
-                   </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
-                   {{main_collection.dialysissolution.anticoagulant_shouji}}iu
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
-                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
-                   </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
-                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
-                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
-                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
                     </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}} mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 6">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
-                   </span>
-                    </span> 
-                 
-                </div>
-                <div class="printCell" style="display:flex;justify-content: space-around;">
-                  <span style="display: block;width: 50%;">体重增加：{{ (main_collection.assessmentbefor.weight_before - assessmentAfterDislysis.weight_after).toFixed(2) }}Kg</span>
-                 <span style="display: block;width: 50%;">
-                     维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
-                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
-                    mg/h
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
-                    mg/h
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
-                   iu/h
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
-                    mg/h
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
-                    mg/h
-                   </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
-                   iu/h
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
-                   iu/h
-                   </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
-                    iu/h
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                      </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                      </span> 
+                  
+                  </div>
+                  <div class="printCell" style="display:flex;justify-content: space-around;">
+                    <span style="display: block;width: 50%;">体重增加：{{ (main_collection.assessmentbefor.weight_before - assessmentAfterDislysis.weight_after).toFixed(2) }}Kg</span>
+                  <span style="display: block;width: 50%;">
+                      维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                      mg/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                      mg/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 3">
                     iu/h
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                      mg/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                      mg/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 6">
                     iu/h
                     </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 7">
                     iu/h
-                   </span>
-                  </span>
-                
-                </div>
-                <div class="printCell" style="display:flex;justify-content: space-around;">
-                  <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}
-                    <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10138">ml</span> 
-                    <span v-else>L</span>
-                  </span>
-                  <span style="display: block;width: 50%;">
-                    总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">
-                    mg
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                      iu/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                      iu/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                      iu/h
+                      </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                      iu/h
+                    </span>
+                    </span>
+                  
+                  </div>
+                  <div class="printCell" style="display:flex;justify-content: space-around;">
+                    <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}
+                      <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10138">ml</span> 
+                      <span v-else>L</span>
+                    </span>
+                    <span style="display: block;width: 50%;">
+                      总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                      mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                      mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                      iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 4">
                     mg
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                      mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 6">
                     iu
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
-                   mg
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
-                    mg
-                   </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
-                   iu
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                      iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                      iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 9">
                     iu
-                   </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
-                     iu
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
-                   iu
-                  </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                      iu
+                      </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                     iu
                     </span>
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
-                   iu
-                   </span>
-                  </span>
+                    </span>
+                  </div>
                 </div>
-              </div>
-            </div>
+             </div>
+
+             <!-- <div v-for="(main_collection,index) in printList" :key="index" style="width: 80%;">
+                <table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse; text-align: center; margin: auto;">
+                
+                  <tr style="height: 20px;">
+                    <td>{{ printDate }}</td>
+                    <td>机号：{{ main_collection.number.number }}</td>
+                  </tr>
+                  <tr style="height: 20px;">
+                    <td>姓名</td>
+                    <td>{{main_collection.patient.name}}</td>
+                  </tr>
+                  <tr style="height: 20px;">
+                    <td>治疗方式</td>
+                    <td></td>
+                  </tr>
+                  <tr style="height: 20px;">
+                    <td>透析时间</td>
+                    <td>{{ printDate }}</td>
+                  </tr>
+                  <tr style="height: 20px;">
+                    <td>透前体重</td>
+                    <td></td>
+                  </tr>
+                  <tr style="height: 20px;">
+                    <td>干体重</td>
+                    <td>{{main_collection.assessmentbefor.dry_weight}}Kg</td>
+                  </tr>
+                  <tr style="height: 20px;">
+                    <td>超滤量</td>
+                    <td></td>
+                  </tr>
+                  <tr style="height: 20px;">
+                    <td>透前血压</td>
+                    <td>-</td>
+                  </tr>
+                  <tr style="height: 20px;">
+                    <td></td>
+                    <td></td>
+                  </tr>
+                  <tr style="height: 20px;">
+                    <td></td>
+                    <td></td>
+                  </tr>
+                </table>
+             </div> -->
+
           </div>
         </div>
       </div>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -105,13 +105,14 @@
       </template>
       <template
         v-if="
-          org_template_info.template_id == 6 ||
+          (org_template_info.template_id == 6 ||
           org_template_info.template_id == 10 ||
           org_template_info.template_id == 11 ||
           org_template_info.template_id == 50 ||
           org_template_info.template_id == 52 ||
           org_template_info.template_id == 53  ||
-          $store.getters.xt_user.org.id == 0
+          org_template_info.template_id == 64)
+          && $store.getters.xt_user.org.id != 0
         "
       >
       <div>
@@ -796,7 +797,20 @@
           >
         </div>
       </template>
-      
+
+      <template v-if="org_template_info.template_id == 65  || $store.getters.xt_user.org.id == 0 ">
+        <div>
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage"
+            type="primary"
+            >打印</el-button
+          >
+        </div>
+      </template>
+
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -933,8 +947,7 @@
           <DialysisPrintOrderTwo
             v-bind:childResponse="childResponse"
             v-if="
-              org_template_info.template_id == 2 ||
-              org_template_info.template_id == 0
+              org_template_info.template_id == 2
             "
           ></DialysisPrintOrderTwo>
 
@@ -958,7 +971,7 @@
                                   
           <DialysisPrintOrderSix
             v-bind:childResponse="childResponse"
-            v-if="org_template_info.template_id == 6"
+            v-if="org_template_info.template_id == 6 && $store.getters.xt_user.org.id!=0"
           >
           </DialysisPrintOrderSix>
 
@@ -1239,6 +1252,17 @@
           v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 63">
           </DialysisPrintOrderSixtyThree> -->
+          <DialysisPrintOrderSixtyfour
+          v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 64">
+
+          </DialysisPrintOrderSixtyfour>
+
+          <DialysisPrintOrderSixtyFive
+              v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 65 || $store.getters.xt_user.org.id ==0">
+
+          </DialysisPrintOrderSixtyFive>
         </div>
       </el-container>
     </div>
@@ -1320,6 +1344,8 @@ import DialysisPrintOrderSixty from "./template/DialysisPrintOrderSixty";
 import DialysisPrintOrderSixtyOne from "./template/DialysisPrintOrderSixtyOne"
 import DialysisPrintOrderSixtyTwo from "./template/DialysisPrintOrderSixtyTwo"
 // import DialysisPrintOrderSixtyThree from "./template/DialysisPrintOrderSixtyThree"
+import DialysisPrintOrderSixtyfour from './template/DialysisPrintOrderSixtyfour'
+import DialysisPrintOrderSixtyFive from "./template/DialysisPrintOrderSixtyFive.vue"
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -1386,10 +1412,12 @@ export default {
     DialysisPrintOrderSeven,
     DialysisPrintOrderEight,
     DialysisPrintOrderNine,
-
+    DialysisPrintOrderSixtyfour,
+    DialysisPrintOrderSixtyFive,
     LabelBox,
     BreadCrumb,
-  },
+    DialysisPrintOrderSixtyFive
+},
   data() {
     return {
       crumbs: [
@@ -1539,6 +1567,11 @@ export default {
       return "";
     },
     printThisPage() {
+      // console.log("this.org_template_info.template_id",this.org_template_info.template_id)
+      // if(this.$store.getters.xt_user.org.id == 0){
+      //   this.org_template_info.template_id = 65
+      // }
+       
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
@@ -1631,8 +1664,9 @@ export default {
         // this.org_template_info.template_id == 51 ||
         this.org_template_info.template_id == 58 ||
         this.org_template_info.template_id == 60 ||
-        this.org_template_info.template_id == 61  ||
-        this.org_template_info.template_id ==0
+        this.org_template_info.template_id == 61
+      
+       
       ) {
         printJS({
           printable: "dialysis-print-box-1",
@@ -1937,6 +1971,25 @@ export default {
           style: style2,
           scanStyles: false,
         });
+      }else if (
+        this.org_template_info.template_id == 64
+      ) {
+        printJS({
+          printable: "dialysis-print-box-64",
+          type: "html",
+          style: style12,
+          scanStyles: false,
+        });
+        
+      }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
+        console.log("进来")
+        printJS({
+          printable: "dialysis-print-box-65",
+          type: "html",
+          style: style12,
+          scanStyles: false,
+        });
+        
       }else if (
         this.org_template_info.template_id == 53
       ) {
@@ -1947,7 +2000,8 @@ export default {
           scanStyles: false,
         });
         
-      }else if (
+      }
+      else if (
         this.org_template_info.template_id == 54 || this.org_template_info.template_id == 57
       ) {
         printJS({
@@ -2032,7 +2086,7 @@ export default {
           style: style,
           scanStyles: false,
         });
-      }
+      } 
     },
     printThisTwoPage() {
       var ptime = Math.round(new Date().getTime() / 1000);
@@ -2160,6 +2214,7 @@ export default {
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.childResponse = response;
+          console.log('this.org_template_info是数据',response.data.data);
           this.org_template_info = response.data.data.org_template_info;
           this.loading = false;
           //   this.adminUser = response.data.data.users
@@ -2592,7 +2647,7 @@ export default {
         "/dialysis/print?xtdate=" +
           xtdate +
           "&xtno=" +
-          schedual.patient.dialysis_no
+          schedual.patient.dialysis_no+"&patient_id="+schedual.patient.id
       );
       //   this.patient_id = schedual.patient_id;
       //   this.date = schedual.schedule_date;

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>
@@ -302,6 +302,8 @@ export default {
                    }
                   }
                   for(let i=0;i<schedules.length;i++){
+                    schedules[i].sort = 0
+                    schedules[i].sort = schedules[i].device_number.sort
                     for(let j=0;j<schedules[i].parent_advice.length;j++){
                       schedules[i].parent_advice[j].childAdvice = []
                       for(let z=0;z<schedules[i].doctor_advice.length;z++){
@@ -312,7 +314,7 @@ export default {
                     }
                   }
                   console.log("scheduleMap999999999999",schedules)
-                  this.list = schedules
+                  this.list = schedules.sort(this.compare('sort'))
                 }
                
                  if(config.is_open == 1){
@@ -481,6 +483,8 @@ export default {
                   }
 
                   for(let i=0;i<schedules.length;i++){
+                    schedules[i].sort = 0
+                    schedules[i].sort = schedules[i].device_number.sort
                     for(let j=0;j<schedules[i].parent_advice.length;j++){
                       schedules[i].parent_advice[j].childAdvice = []
                       for(let z=0;z<schedules[i].doctor_advice.length;z++){
@@ -490,7 +494,9 @@ export default {
                       }
                     }
                   }
-                   this.list = schedules
+                  console.log("哈哈哈",schedules)
+                   this.list = schedules.sort(this.compare('sort'))
+                 
                    this.scheduleMap = scheduleMap  
                  }
                 console.log("this.list",this.list)

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -1153,7 +1153,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1564,7 +1565,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderEighteen.vue

@@ -591,7 +591,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -788,7 +789,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -1112,7 +1112,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFifteen.vue

@@ -505,7 +505,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -718,7 +719,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderFifty.vue

@@ -2597,6 +2597,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyEight.vue

@@ -2570,6 +2570,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -1011,6 +1011,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1166,7 +1167,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyNine.vue

@@ -2434,6 +2434,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -2595,7 +2595,7 @@
                                 />
                               </div>
                             </div>
-                            <div class="inline_block" style="flex: 1">
+                            <!-- <div class="inline_block" style="flex: 1">
                               下机护士：
                               <div
                                 class="under_line"
@@ -2633,8 +2633,8 @@
                                   v-else
                                 />
                               </div>
-                            </div>
-                            <!-- <div class="inline_block" style="flex: 1">
+                            </div> -->
+                            <div class="inline_block" style="flex: 1">
                               患者签名：
                               <div
                                 class="under_line"
@@ -2648,7 +2648,7 @@
                                   srcset=""
                                 />
                               </div>
-                            </div> -->
+                            </div>
                             <div class="inline_block" style="flex: 1">
                               治疗医生：
                               <div
@@ -2762,6 +2762,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -3582,20 +3583,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/DialysisPrintOrderFiftySeven.vue

@@ -1018,6 +1018,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1173,7 +1174,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySix.vue

@@ -2646,6 +2646,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -25,7 +25,7 @@
                       <div>
                         性别：{{ patientInfo_gender_1 == true ? "男" : "女" }}
                       </div>
-                      <div>年龄：{{ getoldAge() }}</div>
+                      <div>年龄：{{ getAge(patientInfo) }}</div>
                       <div>透析机号:&nbsp;{{ getNumber() }}</div>
                     </div>
                   </td>
@@ -688,9 +688,12 @@
                 <tr>
                   <td style="width: 60px" rowspan="2">时间</td>
                   <td colspan="4">透析参数</td>
-                  <td :colspan="org_id == 10441 || org_id == 9675 ? 4 : 5">
+                  <td :colspan="org_id == 10441 || org_id == 9675  ? 4 : 5">
                     生命体征
                   </td>
+                  <td v-if="org_id == 10430 || org_id == 0">
+                    KT/V
+                  </td>
                   <td colspan="1">治疗中病情变化</td>
                 </tr>
                 <tr class="short_tr">
@@ -716,6 +719,8 @@
                     <p style="height: 20px; line-height: 20px">℃</p>
                   </th>
 
+               
+
                   <th style="width: 80px; font-weight: normal">
                     <p style="height: 20px; line-height: 20px">T</p>
                     <p style="height: 20px; line-height: 20px">℃</p>
@@ -743,6 +748,11 @@
                     <p style="height: 20px; line-height: 20px">SpO₂</p>
                     <p style="height: 20px; line-height: 20px">%</p>
                   </th>
+                  <th style="width:50px; font-weight: normal" v-if="org_id == 10430 || org_id == 0">
+                    <p style="height: 20px; line-height: 20px">
+                      KT/V
+                    </p>
+                  </th>
                   <th style="width: 333px; font-weight: normal">
                     <p style="height: 20px; line-height: 20px">
                       记&nbsp;&nbsp;&nbsp;&nbsp;录
@@ -795,12 +805,14 @@
                     {{monitor.dialysate_temperature?monitor.dialysate_temperature:''}}
                   </td>
 
+
                   <td>
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{ monitor.temperature ? monitor.temperature : "" }}
                     </span>
                   </td>
 
+                
                   <td>
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{
@@ -836,6 +848,9 @@
                       }}
                     </span>
                   </td>
+                  <td v-if="org_id == 10430 || org_id == 0">
+                    {{ monitor.ktv?monitor.ktv:"" }}
+                  </td>
                   <td>
                     <span
                       v-if="
@@ -851,7 +866,7 @@
               </table>
             </td>
           </tr>
-          <tr style="transform: translateY(4px)" v-if="org_id!=10346 && org_id!=0">
+          <tr style="transform: translateY(4px)" v-if="org_id!=10346">
             <td>
               <table class="print-table" border="1" style="text-align: center">
                 <tr>
@@ -899,8 +914,9 @@
               </table>
             </td>
           </tr>
-          <div v-if="org_id!=10346 && org_id!=0">
+
           <tr
+            v-if="org_id!=10346"
             v-for="(advice, advice_index) in advices"
             :key="advice_index"
             style="transform: translateY(3px)"
@@ -919,14 +935,14 @@
                     <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                       {{ getAdminUser(advice.advice_doctor) }}
                     </span>
-                    <img
+                  <img
                       style="height: 30px"
                       :src="setAdminUserES(advice.advice_doctor)"
                       alt=""
                       srcset=""
                     />
                   </td>
-                  <td style="text-align: left; padding-left: 5px" width="340">
+                  <td style="text-align: left; padding-left: 5px" width="344">
                     <span v-if="advice.parent_id > 0">---></span>
                     <span>{{ advice.advice_name }}</span>
                     <span v-if="advice && advice.advice_desc"
@@ -1082,7 +1098,7 @@
               </table>
             </td>
           </tr>
-          </div>
+         
 
           <tr style="transform: translateY(1px)">
             <td>
@@ -1201,6 +1217,8 @@
       </table>
     </div>
   </div>
+
+  
   <div id="dialysis-print-box-1-2">
     <div class="dialysis-print-order">
       <table class="print-table">
@@ -1226,7 +1244,7 @@
                       <div>
                         性别：{{ patientInfo_gender_1 == true ? "男" : "女" }}
                       </div>
-                      <div>年龄：{{ getoldAge() }}</div>
+                      <div>年龄：{{ getAge(patientInfo) }}</div>
                       <div>透析机号:&nbsp;{{ getNumber() }}</div>
                     </div>
                   </td>
@@ -1285,7 +1303,6 @@
               </table>
             </td>
           </tr>
-          <div>
           <tr
             v-for="(advice, advice_index) in advices"
             :key="advice_index"
@@ -1311,7 +1328,7 @@
                       srcset=""
                     />
                   </td>
-                  <td style="text-align: left; padding-left: 5px" width="340">
+                  <td style="text-align: left; padding-left: 5px" width="344">
                     <span v-if="advice.parent_id > 0">---></span>
                     <span>{{ advice.advice_name }}</span>
                     <span v-if="advice && advice.advice_desc"
@@ -1467,7 +1484,6 @@
               </table>
             </td>
           </tr>
-          </div>
 
         
         </tbody>
@@ -1551,6 +1567,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1605,33 +1622,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 "";
@@ -1733,7 +1770,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;
@@ -2141,13 +2178,13 @@ export default {
       }
       return "";
     },
-    getAge: function (val) {
-      if (val.birthday != 0) {
-        return jsGetAge(val.birth, "-");
-      } else {
-        return "";
-      }
-    },
+    // getAge: function (val) {
+    //   if (val.birthday != 0) {
+    //     return jsGetAge(val.birth, "-");
+    //   } else {
+    //     return "";
+    //   }
+    // },
     newAdviceGroupObject: function () {
       return Object.assign(
         {},

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThreeAdvice.vue

@@ -1219,6 +1219,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1401,7 +1402,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyTwo.vue

@@ -1214,7 +1214,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyfive.vue

@@ -2450,6 +2450,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -1809,7 +1809,8 @@ export default {
 
         queryParams: {
           xtdate: '',
-          xtno: ''
+          xtno: '',
+          patient_id:0,
         },
         patientInfo: {
           birth: '',
@@ -2175,7 +2176,7 @@ export default {
       },
       getDialysisRecord() {
         this.loading = true
-
+        this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
         getDialysisRecord(this.queryParams).then(response => {
           if (response.data.state == 1) {
             this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

@@ -1422,6 +1422,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1876,7 +1877,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state === 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderFortyFive.vue

@@ -1119,7 +1119,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1407,7 +1408,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderFortyFour.vue

@@ -862,7 +862,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',

src/xt_pages/dialysis/template/DialysisPrintOrderFortyNine.vue

@@ -1190,7 +1190,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -867,7 +867,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -2644,6 +2644,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFortySix.vue

@@ -2098,6 +2098,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -1900,6 +1900,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

@@ -1677,6 +1677,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -2004,7 +2005,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -1143,7 +1143,8 @@
 
         queryParams: {
           xtdate: '',
-          xtno: ''
+          xtno: '',
+          patient_id:0,
         },
         patientInfo: {
           birth: '',
@@ -1284,7 +1285,7 @@
       },
       getDialysisRecord() {
         this.loading = true
-
+        this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
         getDialysisRecord(this.queryParams).then(response => {
           if (response.data.state == 1) {
             this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderFourteen.vue

@@ -1117,7 +1117,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1371,7 +1372,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

@@ -1714,7 +1714,8 @@ export default {
 
         queryParams: {
           xtdate: '',
-          xtno: ''
+          xtno: '',
+          patient_id:0,
         },
         patientInfo: {
           birth: '',
@@ -2021,7 +2022,7 @@ export default {
       },
       getDialysisRecord() {
         this.loading = true
-
+        this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
         getDialysisRecord(this.queryParams).then(response => {
           if (response.data.state == 1) {
             this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderNineteen.vue

@@ -1106,7 +1106,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -227,7 +227,23 @@
                   </tbody>
                 </table>
 
-                <table class="table-box">
+                <table class="table-box" v-if="org_id==10394 || org_id == 0">
+                  <tbody>
+                    <tr>
+                      <td width="40">内瘘:</td>
+                      <td width="800">
+                        <div class="under-line">
+                          &nbsp;
+                          <span v-if="predialysis&&predialysis.internal_fistula!=undefined">{{ predialysis.internal_fistula }}</span>
+                        </div>
+                      </td>
+                     
+                     
+                     
+                    </tr>
+                  </tbody>
+                </table>
+                <table class="table-box" v-if="org_id!=10394 && org_id!=0">
                   <tbody>
                     <tr>
                       <td width="40">内瘘:</td>
@@ -1094,7 +1110,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1374,7 +1391,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -617,7 +617,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -909,7 +910,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -1166,7 +1166,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1563,7 +1564,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -684,6 +684,28 @@
                       >
                         血浆胆红素吸附
                       </div>
+                      <div
+                        class="under_line"
+                        style="
+                          bwidth: 150px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 24"
+                      >
+                       I-HDF
+                      </div>
+                      <div
+                        class="under_line"
+                        style="
+                          bwidth: 150px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 25"
+                      >
+                       HD高通
+                      </div>
                       <div
                         class="under_line"
                         style="
@@ -915,16 +937,16 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=0 && org_id!=10440">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10440">
                       上次透后体重：
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 ">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
@@ -961,7 +983,7 @@
                       </div>
                       kg
                     </div>
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10469 && org_id!=0">
                       计划超滤量： 
                       <div
                         class="under_line"
@@ -976,6 +998,22 @@
                       <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">ml</span> 
                       <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">L</span>
                     </div>
+
+
+                    <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id == 0">
+                      处方脱水量： 
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                      >
+                        {{
+                          prescription.prescription_water
+                            ? prescription.prescription_water
+                            : "/"
+                        }}
+                      </div>
+                       ml
+                    </div>
                     <div class="inline_block" style="flex: 1">
                       干体重：
                       <div
@@ -1408,7 +1446,10 @@
                         <td width="60" v-if="org_id == 9919">血温(°C)</td>
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
-                        <td width="50" v-if="org_id != 10121">电导度<br />(ms/cm)</td>
+                        <td width="50" v-if="org_id != 10121">
+                          <span v-if="org_id != 0 && org_id !=10469"> 电导度<br />(ms/cm)</span> 
+                          <span v-if="org_id == 0 || org_id ==10469"> 钠浓度<br />(mmol/L)</span> 
+                        </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 0">超滤量<br />(ml)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
@@ -1501,7 +1542,9 @@
 
 
                         <td v-if="org_id != 9538 &&org_id != 10121">
-                          {{ monitor.conductivity ? monitor.conductivity : "" }}
+                          <span v-if="org_id!=0&&org_id!=10469"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
+                          <span v-if="org_id==0||org_id==10469"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
+                          
                         </td>
 
                       
@@ -3053,7 +3096,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
-        patient_id:""
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderSixteen.vue

@@ -940,7 +940,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1135,7 +1136,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue

@@ -2355,6 +2355,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyOne.vue

@@ -2695,6 +2695,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyThree.vue

@@ -2697,6 +2697,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -1453,6 +1453,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1906,7 +1907,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state === 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -239,6 +239,12 @@
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
                       </div>
                     </div>
+                    <div class="inline_block" style="flex:4;" v-if="org_id == 9779">
+                      穿刺点：
+                      <div class="under_line" style="min-width: 120px;text-align: center">
+                        {{ predialysis.point_puncture ? predialysis.point_puncture : "/" }}
+                      </div>
+                    </div>
                   </div>
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                     <div class="inline_block" style="flex:1;">
@@ -911,6 +917,8 @@
                         {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
                       </div>
                     </div>
+
+                    
                   </div>
 
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
@@ -1016,8 +1024,17 @@
                       <div class="under_line" style="width: 80px">
                         <!-- <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" /> -->
 
-                        <span v-if="setAdminUserES(prescription.creater) == ''">{{ getAdminUser(prescription.creater) }}</span>
-                        <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
+                        <!-- <span v-if="setAdminUserES(prescription.creater) == ''">{{ getAdminUser(prescription.creater) }}</span>
+                        <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else /> -->
+                    
+                      
+                       
+                          <span v-if="setAdminUserES(doctor_advices&&doctor_advices[0].advice_doctor) == ''">
+                            {{ getAdminUser(doctor_advices&&doctor_advices[0].advice_doctor) }}
+                          </span>
+                          <img style="height:20px;" :src="setAdminUserES(doctor_advices&&doctor_advices[0].advice_doctor)" alt srcset v-else />
+                       
+                     
                       </div>
                     </div>
                     <div class="inline_block" style="flex:1;">
@@ -1109,7 +1126,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1167,7 +1185,8 @@ export default {
         zongliang_unit: "mg",
         gaimingcheng_unit: "",
         gaijiliang_unit: ""
-      }
+      },
+      org_id:0,
     };
   },
   methods: {
@@ -1954,6 +1973,7 @@ export default {
     }
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id;
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");
     this.appetite_arr = getDataConfig("hemodialysis", "appetite");

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -662,7 +662,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -997,7 +998,7 @@ export default {
     },
     getDialysisRecords() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -594,7 +594,9 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
+
       },
       patientInfo: {
         birth: '',
@@ -996,7 +998,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -504,7 +504,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -905,7 +906,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFive.vue

@@ -1177,7 +1177,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1361,7 +1362,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue

@@ -524,7 +524,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyNine.vue

@@ -481,7 +481,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -793,7 +794,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -736,7 +736,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1072,7 +1073,7 @@ export default {
     },
     getDialysisRecords() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySeven.vue

@@ -505,7 +505,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -871,7 +872,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue

@@ -1083,7 +1083,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1270,7 +1271,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyThree.vue

@@ -1264,7 +1264,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -1083,7 +1083,8 @@ export default {
 
         queryParams: {
           xtdate: '',
-          xtno: ''
+          xtno: '',
+          patient_id:0,
         },
         patientInfo: {
           birth: '',
@@ -1423,7 +1424,7 @@ export default {
       },
       getDialysisRecord() {
         this.loading = true
-
+        this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
         getDialysisRecord(this.queryParams).then(response => {
           if (response.data.state == 1) {
             this.adminUser = response.data.data.users