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

src/api/advice.js

@@ -260,8 +260,7 @@ export function CreateGroupAdvice(id, groupno, advices, mode) {
 }
 export function DeleteGroupAdvice(groupno, mode) {
   return request({
-    url:
-      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
+    url:'/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
     method: 'delete',
     headers: {
       Permission: 3

src/api/device.js

@@ -340,4 +340,46 @@ export function getObjectTableDisinfectLongTime(params){
     method:"get",
     params:params,
   })
+}
+
+export function saveObjectRegistration(data){
+  
+  return request({
+    url:"/api/manage/saveobjectregistration",
+    method:"post",
+    data:data
+  })
+}
+
+export function getRegistrationDisInfectList(params){
+  return request({
+    url:"/api/manage/getregistrationdisinfectlist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getObjectRegistrationByIdList(id,params){
+  return request({
+    url:"/api/manage/getobjectregistrationbyidlist?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function UpdateObjectRegistration(data){
+  return request({
+    url:"/api/manage/updateobjectregistration",
+    method:"post",
+    data:data,
+  })
+
+}
+
+export function deleteObjectRegistration(id,params){
+  return request({
+    url:"/api/manage/deleteobjectregistration?id="+id,
+    method:"get",
+    params:params
+  })
 }

src/lang/en.js

@@ -81,6 +81,8 @@ export default {
     infor:'infor',
     weight: 'weight',
     dialysisRecord: 'dialysisRecord',
+    dialysisInfo:'dialysisInfo',
+    dialysis_index:'dialysis_index',
     scheduling: 'scheduling',
     device: 'Device',
     deviceManage: 'Device Manage',
@@ -123,7 +125,8 @@ export default {
     special_permission_manage: 'Special Permission Manage',
     schedule_print: 'Print Schudule',
     dialysis_batch_print: 'Batch Print Order',
-    user_detail: 'user_detail'
+    user_detail: 'user_detail',
+    objectRegistration:'objectRegistration',
   },
   navbar: {
     logOut: 'Log Out',

src/lang/zh.js

@@ -93,9 +93,9 @@ export default {
     dialysisSolution: '透析处方',
     inspection: '检验检查',
     home: '透析首页',
-    infor:'信息归档',
     weight: '干体重',
     dialysisRecord: '透析记录',
+    dialysisInfo:'透析信息',
     scheduling: '排班信息',
     proeducation: '宣教信息',
     doctorAdvice: '医嘱信息',
@@ -296,6 +296,8 @@ export default {
     yidiClear: '异地清分',
     zeroSummary: '零用明细汇总',
     hospitalhistory: '住院历史',
+    dialysis_index:'信息归档',
+    objectRegistration:"医疗器械登记",
     Dialysisanalysis: '专业质控'
   },
   navbar: {

src/router/index.js

@@ -64,6 +64,8 @@ import basicConfig from './modules/basicConfig'
 import Dialysisanalysis from './modules/Dialysisanalysis'
 
 
+import basicConfig from './modules/basicConfig'
+import dialysisIndex from './modules/dialysisIndex'
 Vue.use(Router)
 
 /** note: submenu only apppear when children.length>=1
@@ -206,6 +208,8 @@ var _asy_router_map = [
   basicConfig,
   supply,
   Dialysisanalysis,// 新菜单6.1
+  // Dialysisanalysis,// 新菜单6.1
+  dialysisIndex,
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

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

@@ -744,6 +744,7 @@ export const xt_asyncRouterMap = [
     },
     children: [
       { path: '/dialysis/dialysisrecord', component: () => import('@/xt_pages/dialysis/schedualPatient'), name: '透析记录', meta: { title: '透析记录' }},
+    
       {
         path: '/dialysis/record/:id',
         component: () => import('@/xt_pages/dialysis/dialysisPage'),
@@ -963,6 +964,18 @@ export const xt_asyncRouterMap = [
     ]
   },
 
+  {
+    path: '/dialysisIndex',
+    component: Layout,
+    redirct: '/dialysisIndex/index',
+    children: [{
+      path: '/dialysisIndex',
+      component: () => import('@/xt_pages/dialysis/scheduleIndex'),
+      name: 'dialysisIndex',
+      meta: { title: 'dialysisIndex', icon: 'dialysisIndex', noCache: true }
+    }]
+  },
+
   // /////////////////////////////////////线在end
   {
     path: '/role',
@@ -980,4 +993,6 @@ export const xt_asyncRouterMap = [
       { 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

@@ -90,16 +90,16 @@ export default {
     },
 
 
-    {
-      path: '/infor/index',
-      component: () => import('@/xt_pages/infor/index'),
-      name: 'infor',
+    // {
+    //   path: '/infor/index',
+    //   component: () => import('@/xt_pages/infor/index'),
+    //   name: 'infor',
      
-      meta: {
-        title: 'infor',
-        noCache: true,
-      }
-    },
+    //   meta: {
+    //     title: 'infor',
+    //     noCache: true,
+    //   }
+    // },
 
     {
       path: '/device/waterformprint',
@@ -114,7 +114,17 @@ export default {
       }
     },
 
-  
+    {
+      path: '/device/objectRegistration',
+      component: () => import('@/xt_pages/device/objectRegistration'),
+      name: 'objectRegistration',
+      meta: {
+        title: 'objectRegistration',
+        noCache: true,
+
+      }
+    },
+
 
   ]
 }

src/router/modules/dialysisIndex.js

@@ -0,0 +1,19 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+ 
+  path: '/dialysis_index',
+  component: Layout,
+  name:'dialysis_index',
+  redirct: '/dialysis/dialysisScheduleIndex',
+  children: [{
+    path: '/dialysis/dialysisScheduleIndex',
+    component: () => import('@/xt_pages/infor/index'),
+    name: '信息归档',
+    meta: {
+      title: '信息归档',
+      noCache: true
+    }
+  },]
+ 
+}

src/router/modules/dialysisRecord.js

@@ -13,5 +13,6 @@ export default {
       title: '透析记录',
       noCache: true
     }
-  },]
+  },],
+  
 }

src/views/layout/Layout.vue

@@ -134,7 +134,7 @@ export default {
   created(){
     let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","DepositManagement","hisTool",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
     let bingli = ['User','createPatient'];
-    let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control'];
+    let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index'];
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','inventoryTransfer','wareHouseManage','otherManagement'];
     let caigou = ['supplyManage','supplyList'];
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];

src/views/layout/components/Sidebar/index.vue

@@ -48,7 +48,7 @@ export default {
   },
   created(){
     if(this.navTitle == '透析管理'){
-      let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','Dialysisanalysis'];
+      let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index'];
       // console.log('permission_routers',this.permission_routers)
       let routerArr = [];
       this.permission_routers.map(item => {

src/xt_pages/data/components/addProject.vue

@@ -231,6 +231,17 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+
+                    <el-form-item label="是否打印显示:" prop="is_advice">
+                        <el-select v-model="form.is_print" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="item in printOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                 </el-form>
             </el-tab-pane>
         </el-tabs>
@@ -254,6 +265,10 @@ export default {
              {value: 1,label: '是'},
              {value: 2,label: '否'}
              ],
+             printOptions: [
+             {value: 1,label: '是'},
+             {value: 2,label: '否'}
+             ],
             value: '',
             radio:'1',
             form:{
@@ -288,7 +303,8 @@ export default {
               category:"",
               specail_project:"",
               social_security_directory_code:"",
-              record_date:""
+              record_date:"",
+              is_print:"",
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -383,7 +399,8 @@ export default {
                     category:this.form.category,
                     specail_project:this.form.specail_project,
                     social_security_directory_code:this.form.social_security_directory_code,
-                    record_date:this.form.record_date
+                    record_date:this.form.record_date,
+                    is_print:parseInt(this.form.is_print) 
                }
              console.log("params222222",params)
               saveProject(params).then(response=>{

src/xt_pages/data/components/editProject.vue

@@ -234,6 +234,16 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="是否打印显示:" prop="is_advice">
+                        <el-select v-model="form.is_print" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="item in printOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                 </el-form>
             </el-tab-pane>
         </el-tabs>
@@ -259,6 +269,10 @@ export default {
              {value: 1,label: '是'},
              {value: 2,label: '否'}
              ],
+             printOptions: [
+             {value: 1,label: '是'},
+             {value: 2,label: '否'}
+             ],
             value: '',
             radio:'1',
 
@@ -296,7 +310,7 @@ export default {
               specail_project:"",
               social_security_directory_code:"",
               record_date:"",
-
+              is_print:"",
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -416,6 +430,12 @@ export default {
                 this.form.social_security_directory_code = ""
               }
               this.form.record_date = this.getTime(projecDetail.record_date)
+              if(projecDetail.is_print == 0){
+                this.form.is_print = ""
+              }else{
+                this.form.is_print = projecDetail.is_print
+              }
+             
             }
          })
        },
@@ -457,7 +477,8 @@ export default {
                     category:this.form.category,
                      specail_project:this.form.specail_project,
                     social_security_directory_code:this.form.social_security_directory_code,
-                    record_date:this.form.record_date
+                    record_date:this.form.record_date,
+                    is_print:parseInt(this.form.is_print)
                }
 
               updatedProject(params).then(response=>{

src/xt_pages/data/components/patient_diagnose.vue

@@ -0,0 +1,317 @@
+<template>
+    <div class="main-contain">
+      <div class=" sign-and-weigh-box" style="background: white">
+  
+
+        <el-row :gutter="15">
+          <el-col>
+            <div>
+              <el-button
+                size="small"
+                icon="el-icon-circle-plus-outline"
+                style="float: right;margin-bottom: 15px"
+                type="primary"
+                @click="showDialog"
+              >新增
+              </el-button>
+            </div>
+  
+            <el-table
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{
+                backgroundColor: 'rgb(245, 247, 250)',
+                color: '#606266'
+              }"
+              :data="manufacturerData"
+              style="width: 100%"
+              border
+              v-loading="loading"
+            >
+             
+              <el-table-column label="诊断名称" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.class_name  }}
+                </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">
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    content="编辑"
+                    placement="top"
+                  >
+                    <el-button
+                      size="small"
+                      type="primary"
+                      icon="el-icon-edit-outline"
+                      @click="handleEdit(scope.$index, scope.row)"
+                    >
+                    </el-button>
+                  </el-tooltip>
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    content="删除"
+                    placement="top"
+                  >
+                    <el-button
+                      size="small"
+                      type="danger"
+                      icon="el-icon-delete"
+                      @click="handleDelete(scope.$index, scope.row)"
+                    >
+                    </el-button>
+                  </el-tooltip>
+  
+                </template>
+              </el-table-column>
+            </el-table>
+  
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :page-sizes="[10, 50, 100]"
+              :page-size="10"
+              background
+              align="right"
+              style="margin-top:20px;"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total"
+            >
+            </el-pagination>
+          </el-col>
+        </el-row>
+      </div>
+
+      <el-dialog
+        title="新增"
+        :visible.sync="dialogVisible"
+        width="50%">
+        <span>
+          <el-form>
+             <el-row>
+                <el-col >
+                   <el-form-item label="诊断名称：">
+                    <el-input v-model="form.class_name"  type="textarea" style="width: 300px;"></el-input>
+                   </el-form-item>
+                   
+                </el-col>
+             </el-row>
+
+             <el-row>
+                <el-col >
+                   <el-form-item label="排序：">
+                    <el-input v-model="form.sort" style="width: 200px;"></el-input>
+                   </el-form-item>
+                   
+                </el-col>
+             </el-row>
+          </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="savePatientCase">确 定</el-button>
+        </span>
+      </el-dialog>
+
+      <el-dialog
+        title="新增"
+        :visible.sync="editdialogVisible"
+        width="50%">
+        <span>
+          <el-form>
+             <el-row>
+                <el-col >
+                   <el-form-item label="诊断名称：">
+                    <el-input v-model="form.class_name"  type="textarea" style="width: 300px;"></el-input>
+                   </el-form-item>
+                   
+                </el-col>
+             </el-row>
+
+             <el-row>
+                <el-col >
+                   <el-form-item label="排序：">
+                    <el-input v-model="form.sort" style="width: 200px;"></el-input>
+                   </el-form-item>
+                   
+                </el-col>
+             </el-row>
+          </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="editdialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="updatePatientCase">确 定</el-button>
+        </span>
+      </el-dialog>
+     
+    </div>
+  </template>
+  
+  <script>
+    import {
+      savePatientDiagnose,
+      getPatientDiagnose,
+      getPatientDiagnoseDetail,
+      updatePatientCase,
+      deletePatientDiagnose 
+    } from '@/api/data'
+    import DiagnoseOtherDialog from "./diagnoseOtherDialog";
+  
+    export default {
+      components: {
+        DiagnoseOtherDialog,
+      },
+      name: 'diagnoseOther',
+      data() {
+        return {
+          signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+          manufacturerData: [],
+          total: 0,
+          pageTotal: 0,
+          pageSelect: 0,
+  
+          page: 1,
+          limit: 10,
+          loading: false,
+  
+          manufacturer_code: '',
+          editId: '',
+          editIndex: '',
+          form:{
+            id:0,
+            class_name:"",
+            sort:"",
+          },
+          dialogVisible:false,
+          editdialogVisible:false,
+        }
+      },
+      methods: {
+        savePatientCase(){
+            var params= {
+                class_name:this.form.class_name,
+                sort:parseInt(this.form.sort),
+            }
+           console.log("param23232323w",params)
+          savePatientDiagnose(params).then(response=>{
+            if(response.data.state==1){
+              var diagnose = response.data.data.diagnose
+              this.$message.success("保存成功!")
+              this.dialogVisible = false
+              this.getList()
+            }
+          })
+        },
+        getList(){
+            var params = {
+               limit:this.limit,
+               page:this.page,
+            }
+          getPatientDiagnose(params).then(response=>{
+             if(response.data.state == 1){
+                this.manufacturerData = response.data.data.list
+
+                this.total =  response.data.data.total
+             }
+          })
+        },
+        handleEdit(index,row){
+           
+            var params ={
+              id:row.id
+            }
+         
+          getPatientDiagnoseDetail(params).then(response=>{
+             if(response.data.state == 1){
+              var detail =  response.data.data.detail
+              this.editdialogVisible =true
+              this.form.class_name =detail.class_name
+              this.form.sort = detail.sort
+              this.form.id = detail.id
+             }
+          })
+        },
+        updatePatientCase(){
+              var params = {
+                id:this.form.id,
+                class_name:this.form.class_name,
+                sort:parseInt(this.form.sort),
+              }
+            updatePatientCase(params).then(response=>{
+                if(response.data.state == 1){
+                    this.$message.success("保存成功!")
+                    this.editdialogVisible = false
+                    this.getList()
+                }
+            })
+        },
+        handleDelete: function(index, row) {
+          this.$confirm('确认删除这条记录?', '删除记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+            .then(() => {
+              let params = {
+                id: row.id
+              }
+              deletePatientDiagnose(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  this.manufacturerData.splice(index, 1)
+                  this.$message.success('删除成功')
+                }
+              })
+            })
+            .catch(() => {
+            })
+        },
+     
+        showDialog: function() {
+           this.dialogVisible = true
+        },
+        handleSizeChange(val) {
+          this.limit = val
+          this.getList()
+        },
+        handleCurrentChange(val) {
+          this.page = val
+          this.getList()
+        },
+       
+      },
+      created() {
+        this.getList()
+      }
+    }
+  </script>
+  
+  <style lang="scss">
+    .el-table td,
+    .el-table th.is-leaf,
+    .el-table--border,
+    .el-table--group {
+      border-color: #d0d3da;
+    }
+  
+    .el-table--border::after,
+    .el-table--group::after,
+    .el-table::before {
+      background-color: #d0d3da;
+    }
+  </style>
+  

src/xt_pages/device/airDisinfectTwo.vue

@@ -24,7 +24,7 @@
               style="width: 150px;"
               @change="changeEndtime">
             </el-date-picker>
-            <el-button type="primary" style="margin-left: 10px;">搜索</el-button>
+            <el-button type="primary" style="margin-left: 10px;" @click="toSeach">搜索</el-button>
           </div>
           <div style="float:right;margin-bottom:10px;">
             <el-button type="primary" @click="printCard">打印</el-button>
@@ -943,48 +943,48 @@
         }
       },
       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    
         }
       },
@@ -993,7 +993,7 @@
         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
@@ -1378,6 +1378,9 @@
           this.form.last_disinfection_time = this.lastdisinfection_time   
 
           this.form.last_total_time = parseFloat(this.last_total_time ) + parseFloat(this.form.last_disinfection_time)
+        },
+        toSeach(){
+          this.getNewAirDisinfectList()   
         }
 
       },

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -7,6 +7,7 @@
           <div style="float: left; margin-bottom: 10px;">
             <el-date-picker
               v-model="startvalue"
+              value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
               style="width: 150px;">
@@ -16,9 +17,10 @@
               v-model="endvalue"
               type="date"
               placeholder="选择日期"
-              style="width: 150px;">
+              style="width: 150px;"
+              value-format="yyyy-MM-dd">
             </el-date-picker>
-            <el-button type="primary" style="margin-left: 10px;">搜索</el-button>
+            <el-button type="primary" style="margin-left: 10px;" @click="toSeach">搜索</el-button>
           </div>
           <div style="float:right;margin-bottom:10px;">
             <el-button type="primary" @click="printCard">打印</el-button>
@@ -1600,6 +1602,9 @@
         this.page = val;
         this.getObjectTableDisInfectList()
       },
+      toSeach(){
+        this.getObjectTableDisInfectList()
+      }
         
       }
     }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1382,9 +1382,9 @@
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
-                              record.prescription.mode_id == 2 ||
+                             (record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
-                              record.prescription.mode_id == 12
+                              record.prescription.mode_id == 12) && org_id!=0&&org_id!=10478
                             "
                             width="50"
                           >
@@ -1574,9 +1574,10 @@
 
                           <td
                             v-if="
-                              record.prescription.mode_id == 2 ||
+                              (record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
-                              record.prescription.mode_id == 12
+                              record.prescription.mode_id == 12)
+                              && org_id!=0&&org_id!=10478
                             "
                             style="width: 50px"
                           >

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

@@ -349,12 +349,18 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="isShow('透析中入量')">
+        <el-col :span="8" v-if="isShow('透析中入量') && org_id!=10485">
           <el-form-item label="透析中入量(L): " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
             <el-input v-model="form.dialysis_intakes"></el-input>
           </el-form-item>
         </el-col>
 
+        <el-col :span="8" v-if="isShow('透析中入量') && org_id==10485">
+          <el-form-item label="透析中入量(g): " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
+            <el-input v-model="form.dialysis_intakes"></el-input>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="8" v-if="isShow('透析中入量单位')">
           <el-form-item label="透析中入量单位: " :prop="isName('透析中入量单位')" :rules="isCheckmust('透析中入量单位')" >
             <el-select v-model="form.dialysis_intakes_unit" placeholder='请选择'>

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

@@ -2665,7 +2665,7 @@
         saveInformation(params).then(response=>{
            if(response.data.state == 1){
              var information = response.data.data.information
-             this.$message.success("审核成功!")
+             this.$message.success("提交成功!")
              this.infoDialogVisible = false
            }
         })

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

@@ -383,6 +383,7 @@
       </span>
     </el-dialog>
    </div>
+ </div>
 </template>
 
 <script>

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

@@ -952,8 +952,7 @@ export default {
       ParamsQuery["puncture_nurse"] = this.form.puncture_nurse_id;
       ParamsQuery["washpipe_nurse"] = this.form.washpipe_nurse;
       ParamsQuery["change_nurse"] = this.form.change_nurse;
-      ParamsQuery["difficult_puncture_nurse"] =
-        this.form.difficult_puncture_nurse;
+      ParamsQuery["difficult_puncture_nurse"] =this.form.difficult_puncture_nurse;
       ParamsQuery["new_fistula_nurse"] = this.form.new_fistula_nurse;
       ParamsQuery["blood_drawing"] = this.form.blood_drawing;
       ParamsQuery["quality_nurse"] = this.form.quality_nurse_id;
@@ -984,7 +983,7 @@ export default {
           }
         } else {
           this.$message.error(resp.msg);
-          if(response.data.code == 600000008){
+          if(resp.code == 600000008){
             this.infoDialogVisible = true
           }
         }

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

@@ -580,11 +580,11 @@
           module:8,
           remark:this.remark,
         }
-        console.log("params32222222222----",params)
+      
         saveInformation(params).then(response=>{
            if(response.data.state == 1){
              var information = response.data.data.information
-             this.$message.success("审核成功!")
+             this.$message.success("提交成功!")
              this.infoDialogVisible = false
            }
         })

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

@@ -363,7 +363,8 @@
                 org_id == 10432 ||
                 org_id == 10445 ||
                 org_id == 10410 ||
-                org_id == 10495)
+                org_id == 10495 
+                || org_id == 10485)
                 && org_id!=10387
             "
           >
@@ -414,7 +415,8 @@
               template_id != 60 &&
               org_id!=10432 &&
               org_id!=10445 &&
-              org_id!=10410 && org_id!=10495) ||
+              org_id!=10410 && org_id!=10495
+              && org_id!=10485) ||
               org_id == 10387
             "
           >
@@ -1133,7 +1135,8 @@
                 template_id == 60 ||
                 org_id== 10432 ||
                 org_id== 10445 ||
-                org_id== 10410) &&
+                org_id== 10410 ||
+                org_id == 10485) &&
                 org_id!=10387
             "
           >
@@ -1178,7 +1181,8 @@
               template_id != 60 &&
               org_id!=10432 &&
               org_id!=10445 &&
-              org_id!=10410)
+              org_id!=10410 &&
+              org_id!=10485)
               || org_id == 10387
             "
           >
@@ -2921,7 +2925,7 @@ export default {
         saveInformation(params).then(response=>{
            if(response.data.state == 1){
              var information = response.data.data.information
-             this.$message.success("审核成功!")
+             this.$message.success("提交成功!")
              this.infoDialogVisible = false
            }
         })

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

@@ -532,7 +532,7 @@ export default {
       saveInformation(params).then(response=>{
            if(response.data.state == 1){
              var information = response.data.data.information
-             this.$message.success("审核成功!")
+             this.$message.success("提交成功!")
              this.infoDialogVisible = false
            }
         })

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -16,8 +16,8 @@
           <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 == 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('超滤率') && (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 == 10485) && 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!=10485 ) || 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 || org_id == 10410) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -751,6 +751,7 @@
                       </div>
                     </div>
                     <div
+                     
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
                     >
@@ -1460,14 +1461,7 @@
                         <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>
-                        <td
-                          v-if="
-                            prescription.mode_id == 2 ||
-                            prescription.mode_id == 5 ||
-                            prescription.mode_id == 12
-                          "
-                          width="50"
-                        >
+                        <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0" width="50">
                           置换量<br />(ml)
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
@@ -1571,9 +1565,10 @@
                         </td> -->
                         <td
                           v-if="
-                            prescription.mode_id == 2 ||
+                            (prescription.mode_id == 2 ||
                             prescription.mode_id == 5 ||
-                            prescription.mode_id == 12
+                            prescription.mode_id == 12)
+                            && org_id!=0 && org_id!=10478
                           "
                           style="width: 50px"
                         >

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -989,7 +989,7 @@ export default {
 
         let projects = [];
         response.data.data.projects.map((item) => {
-          if (item.type == 2) {
+          if (item.type == 2 && item.project.is_print == 1) {
             projects.push(item);
           }
         });

src/xt_pages/infor/index.vue

@@ -59,16 +59,7 @@
                      <span v-if="scope.row.application_status == 3">拒绝</span>
                   </template>
                 </el-table-column>
-                <el-table-column prop="name" label="审批人"  min-width="100" align="center">
-                  <template  slot-scope="scope" >
-                      {{getUserName(scope.row.checker)  }}
-                   </template>
-                </el-table-column>
-                <el-table-column prop="address" label="审批时间"   min-width="100" align="center">
-                  <template  slot-scope="scope">
-                      {{getTimeOne(scope.row.check_time)  }}
-                   </template>
-                </el-table-column>
+               
                 <el-table-column  prop="address" label="备注"   min-width="100" align="center">
                   <template  slot-scope="scope">
                       {{scope.row.remark }}
@@ -299,7 +290,7 @@
                var informaitonSetting = response.data.data.informaitonSetting
                this.$message.success("保存成功!")
                this.dialogVisible = false
-               this.toSeeting()
+               this.toSeetingOne()
              }
           })
         },
@@ -365,68 +356,82 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
         }
      },
-     getUserName(admin_user_id){
-       var user_name = ""
-       for(let i=0;i<this.adminList.length;i++){
-         if(admin_user_id == this.adminList[i].admin_user_id){
-            user_name = this.adminList[i].user_name
-         }
-       }
-       return user_name
-     },
-     handleEdit(index,row) {
-      this.$confirm("确认审核吗?", "审核", {
-        confirmButtonText: "确 定",
-        cancelButtonText: "取 消",
-        type: "warning"
-      }).then(() => {
-          var params = {
-            id:row.id,
-            application_status:1,
+      getUserName(admin_user_id){
+        var user_name = ""
+        for(let i=0;i<this.adminList.length;i++){
+          if(admin_user_id == this.adminList[i].admin_user_id){
+              user_name = this.adminList[i].user_name
           }
-          checkDialysisInformation(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
-            } else {
-              this.$notify({
-                title: "成功",
-                message: "审核成功",
-                type: "success",
-                duration: 2000
-              });
-              this.getlist()
+        }
+        return user_name
+      },
+      handleEdit(index,row) {
+        this.$confirm("确认审核吗?", "审核", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+            var params = {
+              id:row.id,
+              application_status:1,
             }
-          });
-        })
-        .catch(() => {});
-    },
-    handleDelete(index,row){
-      this.$confirm("确认审核吗?", "审核", {
-        confirmButtonText: "确 定",
-        cancelButtonText: "取 消",
-        type: "warning"
-      }).then(() => {
-          var params = {
-            id:row.id,
-            application_status:3,
-          }
-          checkDialysisInformation(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
-            } else {
-              this.$notify({
-                title: "成功",
-                message: "拒绝成功",
-                type: "success",
-                duration: 2000
-              });
-              this.getlist()
+            checkDialysisInformation(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                return false;
+              } else {
+                this.$notify({
+                  title: "成功",
+                  message: "审核成功",
+                  type: "success",
+                  duration: 2000
+                });
+                this.getlist()
+              }
+            });
+          })
+          .catch(() => {});
+      },
+      handleDelete(index,row){
+        this.$confirm("确认审核吗?", "审核", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+            var params = {
+              id:row.id,
+              application_status:3,
             }
-          });
-        }).catch(() => {});
-    },
+            checkDialysisInformation(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                return false;
+              } else {
+                this.$notify({
+                  title: "成功",
+                  message: "拒绝成功",
+                  type: "success",
+                  duration: 2000
+                });
+                this.getlist()
+              }
+            });
+          }).catch(() => {});
+      },
+
+         toSeetingOne(){
+           var params = {
+             limit:this.limit,
+             page:this.page
+           }
+          getDialysisInformationSetting(params).then(response=>{
+            if(response.data.state == 1){
+              var informaitonSetting =  response.data.data.informaitonSetting
+              this.tableData = []
+              this.tableData = informaitonSetting
+            }
+          }) 
+      },
 
     
     },

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -60,7 +60,7 @@
                   </el-form-item>
 
 
-
+                
 
 
                   <el-form-item label="过敏病史: " prop="name" label-position="right">
@@ -74,7 +74,7 @@
                   </el-form-item>
 
 
-                  <el-form-item label="疾病诊断:" prop="name" label-position="right" style="width:66.6%;" v-if="org_id==3877 || org_id ==10485 ">
+                  <el-form-item label="疾病诊断:" prop="name" label-position="right" style="width:66.6%;" v-if="org_id==3877 || org_id ==10485 || org_id == 0 ">
 
                     <el-select style="width:100%;" v-model="patient_diagnose" placeholder="" multiple filterable>
                         <el-option
@@ -2077,7 +2077,7 @@ export default {
         }
 
       }
-
+      
       // console.log("info233333333333333333333",info.id)
       // console.log("LAST_INFO2323232323WO",last_info.patient_diagnosis)
       this.patient_diagnose = []
@@ -2094,13 +2094,13 @@ export default {
       }
 
       if(info.id > 0){
-
+       
         if (info.patient_diagnosis.length == 0) {
           this.patient_diagnose = []
         } else {
           this.patient_diagnose = []
           for (let i = 0; i < info.patient_diagnosis.split(",").length; i++) {
-
+           
             if(info.patient_diagnosis.split(',')[i].length > 0) {
               this.patient_diagnose.push(parseInt(info.patient_diagnosis.split(',')[i]))
             }
@@ -2387,7 +2387,7 @@ export default {
               reg_type: this.register_type,
               patient_diagnose:str
             }
-
+            
             for (let i = 0; i < this.prescriptions.length; i++) {
               if (this.prescriptions[i].advices.length > 0 && this.prescriptions[i].project.length == 0) {
                 this.prescriptions[i]['type'] = 1
@@ -2797,7 +2797,7 @@ export default {
             this.$message.error('科室不能为空')
             return
           }
-
+          
           var str = ""
           if(patient_diagnose!=""){
              str = this.patient_diagnose.join(',')

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -275,7 +275,6 @@
           </template>
         </el-table-column>
       </el-table>
-
       <el-dialog
           class="centerDialog"
           width="600px"

src/xt_pages/user/inspection.vue

@@ -888,6 +888,8 @@ export default {
               this.itemDate = this.form.inspect_date
               this.items = []
               var inspections = response.data.data.inspections
+             
+              
               this.inspections = response.data.data.inspections
               if (inspections == null) {
                 this.inspections = []
@@ -901,6 +903,7 @@ export default {
                 this.inspectionsMap[inspections[index].item_id] =
                   inspections[index]
               }
+             
               var items = this.project.inspection_reference
               console.log('itmes', items)
               for (var index in items) {
@@ -959,8 +962,7 @@ export default {
             this.patientID,
             this.form,
             this.form.remind_cycle
-          )
-            .then(response => {
+          ).then(response => {
               if (response.data.state == 1) {
                 this.$notify({
                   title: '成功',
@@ -1161,10 +1163,10 @@ export default {
 
     },
     fetchInspectionReference() {
-      fetchInspectionReference(this.patientID)
-        .then(response => {
+      fetchInspectionReference(this.patientID).then(response => {
           if (response.data.state == 1) {
             var reference = response.data.data.reference
+           
             var patient_info = response.data.data.patient_info
             this.projects = reference
             this.patient_info = patient_info
@@ -1218,6 +1220,10 @@ export default {
         .then(response => {
           if (response.data.state == 1) {
             var inspections = response.data.data.inspections
+            console.log("inspections=========",inspections)
+            console.log("时间",this.project.inspection_reference)
+            var obj = {created_time:0,inspect_date:0,inspect_desc:"",inspect_tips:"",inspect_type:1,inspect_value:"",item_id:11063,item_name:"",org_id:0,patient_id:"",project_id:4,project_name:"",updated_time:"",status:1}
+           
             this.total = response.data.data.total
             this.itemDate = response.data.data.date
             let remind = response.data.data.remind
@@ -1251,17 +1257,22 @@ export default {
             var inspectionsMap = {}
             this.inspectionsMap = {}
             for (var index in inspections) {
+             
               inspectionsMap[inspections[index].item_id] = inspections[index]
               this.inspectionsMap[inspections[index].item_id] = inspections[index]
             }
-
+           
             var items = this.project.inspection_reference
+           
             for (var index in items) {
               var item = {}
               for (var key in items[index]) {
+               
                 item[key] = items[index][key]
               }
+             
               if (item.item_id > 0) {
+                
                 if (inspectionsMap[items[index].item_id] == undefined) {
                   item.value = inspectionsMap[items[index].id].inspect_value
                   item.item_name = inspectionsMap[items[index].id].item_name
@@ -1272,13 +1283,14 @@ export default {
 
                 }
               } else {
+              
                 item.value = inspectionsMap[items[index].id].inspect_value
                 item.item_name = inspectionsMap[items[index].id].item_name
 
               }
-              // item["inspect_desc"] = inspectionsMap[items[index].id].inspect_desc
-              // item["inspect_type"] = inspectionsMap[items[index].id].inspect_type
+              
               item.value_direction = ''
+           
               if (item.range_type == 1) {
                 var value = parseFloat(item.value)
                 var range_min = parseFloat(item.range_min)
@@ -1289,8 +1301,9 @@ export default {
                   item.value_direction = '↑'
                 }
               }
+            
               this.items.push(item)
-
+              console.log("item233333333333wo",this.items)
 
               if(item.value.indexOf("http") >= 0){
                 this.isPic = true