src/api/common/common.js

@@ -133,12 +133,13 @@ export function DeleteCheck(id, params) {
   })
 }
 
-export function getDialysisModeType(startime, endtime, lapsetotype, sourcetype) {
+export function getDialysisModeType(startime, endtime, lapsetotype, sourcetype,patienttype) {
   const params = {
     startime: startime,
     endtime: endtime,
     lapsetotype: lapsetotype,
-    sourcetype: sourcetype
+    sourcetype: sourcetype,
+    patienttype:patienttype,
   }
   return request({
     url: '/com/api/getdialysismodetype',
@@ -147,12 +148,13 @@ export function getDialysisModeType(startime, endtime, lapsetotype, sourcetype)
   })
 }
 
-export function getTotalLapseCount(startime, endtime, lapsetotype, sourcetype) {
+export function getTotalLapseCount(startime, endtime, lapsetotype, sourcetype,patienttype) {
   const params = {
     startime: startime,
     endtime: endtime,
     lapsetotype: lapsetotype,
-    sourcetype: sourcetype
+    sourcetype: sourcetype,
+    patienttype:patienttype,
   }
   console.log('转归params', params)
   return request({
@@ -162,12 +164,13 @@ export function getTotalLapseCount(startime, endtime, lapsetotype, sourcetype) {
   })
 }
 
-export function getTotalSexCount(startime, endtime, lapsetotype, sourcetype) {
+export function getTotalSexCount(startime, endtime, lapsetotype, sourcetype,patienttype) {
   const params = {
     startime: startime,
     endtime: endtime,
     lapsetotype: lapsetotype,
-    sourcetype: sourcetype
+    sourcetype: sourcetype,
+    patienttype:patienttype
   }
   return request({
     url: '/com/api/gettotalsexcount',
@@ -176,12 +179,13 @@ export function getTotalSexCount(startime, endtime, lapsetotype, sourcetype) {
   })
 }
 
-export function getTotalInfectiousCount(startime, endtime, lapsetotype, sourcetype) {
+export function getTotalInfectiousCount(startime, endtime, lapsetotype, sourcetype,patienttype) {
   const params = {
     startime: startime,
     endtime: endtime,
     lapsetotype: lapsetotype,
-    sourcetype: sourcetype
+    sourcetype: sourcetype,
+    patienttype:patienttype,
   }
   console.log('传染病', params)
   return request({
@@ -191,12 +195,13 @@ export function getTotalInfectiousCount(startime, endtime, lapsetotype, sourcety
   })
 }
 
-export function getTotalAgeCount(startime, endtime, lapsetotype, sourcetype) {
+export function getTotalAgeCount(startime, endtime, lapsetotype, sourcetype,patienttype) {
   const params = {
     startime: startime,
     endtime: endtime,
     lapsetotype: lapsetotype,
-    sourcetype: sourcetype
+    sourcetype: sourcetype,
+    patienttype:patienttype,
   }
   return request({
     url: '/com/api/gettotalagecount',
@@ -205,12 +210,13 @@ export function getTotalAgeCount(startime, endtime, lapsetotype, sourcetype) {
   })
 }
 
-export function getTotalDialysisCount(startime, endtime, lapsetotype, sourcetype) {
+export function getTotalDialysisCount(startime, endtime, lapsetotype, sourcetype,patienttype) {
   const params = {
     startime: startime,
     endtime: endtime,
     lapsetotype: lapsetotype,
-    sourcetype: sourcetype
+    sourcetype: sourcetype,
+    patienttype:patienttype,
   }
   return request({
     url: '/com/api/gettotaldialysiscount',
@@ -550,10 +556,10 @@ export function getRolloutCount(params) {
 
 
 export function getPatientInspectionList(params){
-  
+
   return request({
     url:"/com/api/getpatientinspectionlist",
     method:"get",
     params:params
   })
-}
+}

src/api/his/his.js

@@ -924,6 +924,17 @@ export function newsummary(params) {
 
 
 
+export function getGood(params) {
+  return request({
+    url: '/api/good/config',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+
 
 
 

src/api/new_stock/stock.js

@@ -8,6 +8,14 @@ export function GetDrugStock(params) {
     params:params
   })
 }
+
+export function GetGoodStock(params) {
+  return request({
+    url: '/api/good/stock',
+    method: 'get',
+    params:params
+  })
+}
 export function GetDrugChangeStock(params) {
   return request({
     url: '/api/drug/change',
@@ -28,7 +36,7 @@ export function getHisDrugCodeQueryList(params){
 }
 
 export function createUploadDrugCode(params){
- 
+
   return request({
     url:"/api/drug/createuploaddrugcode",
     method:"get",
@@ -37,10 +45,10 @@ export function createUploadDrugCode(params){
 }
 
 export function getPatientDrugCode(params){
- 
+
   return request({
     url:"/api/drug/getpatientdrugcode",
     method:"Get",
     params:params,
   })
-}
+}

src/lang/zh.js

@@ -318,7 +318,11 @@ export default {
     drugChange:"药品销售",
     drugQuery:"药品查询",
     drugCodeQuery:"药品追溯",
-    drugSourceCode:"药品追溯"
+    drugSourceCode:"药品追溯",
+    goodStock:"耗材盘存",
+    goodQuery:"耗材查询",
+    calScore:'医保记分',
+
   },
   navbar: {
     logOut: '退出登录',

src/router/index.js

@@ -47,6 +47,8 @@ import PatientDispensing from './modules/PatientDispensing'
 import DrugDispensing from './modules/DrugDispensing'
 import DispensingDetails from './modules/DispensingDetails'
 import DrugCodeList  from './modules/DrugCodeList'
+import goodGrant  from './modules/goodGrant'
+
 // import ConsumablesManagement from './modules/ConsumablesManagement'
 import MedicianManagement from './modules/MedicianManagement'
 
@@ -175,6 +177,7 @@ var _asy_router_map = [
   DrugDispensing, // 药房管理模块
   DispensingDetails, // 药房管理模块
   DrugCodeList,//药品追溯码
+  goodGrant,
   //ConsumablesManagement, // 药房管理模块
   MedicianManagement, // 药房管理模块
 

src/router/modules/hisTool.js

@@ -108,6 +108,18 @@ export default {
       name: 'yidiClear',
       meta: { title: 'yidiClear', noCache: true }
     }, {
+      path: '/hisTool/calScore',
+      component: () => import('@/xt_pages/outpatientTool/calScore'),
+      name: 'calScore',
+      meta: { title: 'calScore', noCache: true }
+    },
+    // ,{
+    //   path: '/hisTool/calScore',
+    //   component: () => import('@/xt_pages/outpatientTool/calScore'),
+    //   name: 'yidiClear',
+    //   meta: { title: 'yidiClear', noCache: true }
+    // },
+    {
       path: '/hisTool/queryData',
       component: () => import('@/xt_pages/outpatientTool/queryData'),
       name: 'queryData',

src/vendor/Export2Excel.js

@@ -471,3 +471,80 @@ export function export_json_to_excel3({
     type: "application/octet-stream"
   }), `${filename}.${bookType}`);
 }
+export function export_json_to_excel23({
+                                       multiHeader = [],
+                                       header,
+                                       data,
+                                       filename,
+                                       merges = [],
+                                       autoWidth = true,
+                                       bookType = 'xlsx'
+                                     } = {}) {
+  /* 修复列宽计算错误 */
+  filename = filename || 'excel-list';
+  data = [...data];
+
+  if (header && header.length > 0) {
+    data.unshift(header);
+  }
+
+  for (let i = multiHeader.length - 1; i > -1; i--) {
+    data.unshift(multiHeader[i]);
+  }
+
+  const ws_name = "SheetJS";
+  const wb = new Workbook();
+  const ws = sheet_from_array_of_arrays(data);
+
+  if (merges.length > 0) {
+    if (!ws['!merges']) ws['!merges'] = [];
+    merges.forEach(item => {
+      ws['!merges'].push(XLSX.utils.decode_range(item));
+    });
+  }
+
+  // 修复的列宽计算逻辑
+  if (autoWidth) {
+    /* 计算最大列数 */
+    const maxColumns = data.reduce((max, row) =>
+      Math.max(max, row.length), 0);
+
+    /* 创建列宽数组并初始化为最小值 */
+    const colWidths = Array(maxColumns).fill({ wch: 10 });
+
+    /* 安全计算每列最大宽度 */
+    data.forEach(row => {
+      row.forEach((val, colIndex) => {
+        let length = 10;
+        if (val != null) {
+          const strVal = val.toString();
+          // 改进的中文字符宽度计算
+          if (/[\u4E00-\u9FA5\u3040-\u309F\u30A0-\u30FF]/.test(strVal)) {
+            length = strVal.length * 2;
+          } else {
+            length = strVal.length;
+          }
+        }
+
+        if (length > colWidths[colIndex].wch) {
+          colWidths[colIndex] = { wch: Math.max(length, 10) };
+        }
+      });
+    });
+
+    ws['!cols'] = colWidths;
+  }
+
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  const wbout = XLSX.write(wb, {
+    bookType: bookType,
+    bookSST: false,
+    type: 'binary'
+  });
+
+  saveAs(new Blob([s2ab(wbout)], {
+    type: "application/octet-stream"
+  }), `${filename}.${bookType}`);
+}

src/views/layout/Layout.vue

@@ -139,7 +139,7 @@ export default {
     let caigou = ['supplyManage','supplyList'];
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];
     let kuyishopping = ['kuyiShopping'];
-    let medician = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs','DrugCodeList']
+    let medician = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs','DrugCodeList','goodGrant']
     let menzhenArr = [];
     let bingliArr = [];
     let touxiArr = [];

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

@@ -103,7 +103,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '药房管理'){
-          let nameArr = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs','DrugCodeList']
+          let nameArr = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs','DrugCodeList','goodGrant']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/Pharmacy/drugCode.vue

@@ -277,6 +277,7 @@ export default {
       this.getlist()
     },
     toUpload(row) {
+      console.log(row)
       if(this.is_type == 3){
         if (row.drug_code.length == 0) {
           this.$message.error("追溯码不能为空");
@@ -351,6 +352,30 @@ export default {
           is_type:this.is_type,
         };
 
+        //有打开则调用接口
+        axios.get('http://127.0.0.1:9532/api/changedrug/five', {params: params}).then(function (response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg);
+            return false
+          } else {
+            if (response.data.data.failed_code == -10) {
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
+            } else {
+              that.getlist()
+            }
+          }
+        }).catch(function (error) {
+        })
+
+
+        //TODO
+
         axios.get('http://127.0.0.1:9532/test/net', {}).then(function (response) {
           if (response.data.state == 0) {
             // that.$message.error(response.data.data.msg);

src/xt_pages/Pharmacy/goodGrant.vue

@@ -1314,8 +1314,11 @@ export default {
       for (var i = 0; i < this.multipleSelection.length; i++) {
         tmp = tmp + this.multipleSelection[i].id + ",";
       }
+
+
       var params = {
         creater: this.admin_user_id,
+        d_type:1,
         ids: tmp,
       };
       this.$confirm("确定是否对该耗材进行发药?", "耗材发放", {

src/xt_pages/drugSourceCode/goodQuery.vue

@@ -492,9 +492,9 @@
 
 
 <script>
-// import {
-//   getGood
-// } from '@/api/his/his'
+import {
+  getGood
+} from '@/api/his/his'
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import axios from 'axios'
 const moment = require('moment')
@@ -687,7 +687,7 @@ export default {
             })
 
           }else if(that.stock_type == 5){
-            axios.get('http://127.0.0.1:9532/api/3513',{params:params}).then(function(response) {
+            axios.get('http://127.0.0.1:9532/api/3513forgood',{params:params}).then(function(response) {
               if (response.data.state == 0) {
                 that.$message.error(response.data.data.msg);
                 return false

src/xt_pages/drugSourceCode/goodStock.vue

@@ -205,12 +205,10 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-// import {GetDrugStock, GetGoodStock} from '../../api/new_stock/stock'
+import {GetGoodStock} from '../../api/new_stock/stock'
 const moment = require('moment')
-import { getDictionaryDataConfig } from "@/utils/data";
 import { uParseTime } from '@/utils/tools'
 import axios from 'axios'
-
 export default {
   components: {
     BreadCrumb
@@ -236,8 +234,8 @@ export default {
         { id: 2, name: '未变更' },
       ],
       crumbs: [
-        { path: false, name: '药品追溯' },
-        { path: false, name: '药品盘点' }
+        { path: false, name: '耗材追溯' },
+        { path: false, name: '耗材盘点' }
       ],
     }
   },
@@ -303,7 +301,7 @@ export default {
                 }).catch(() => {
                 })
               }else{
-                that.GetDrugStock()
+                that.GetGoodStock()
               }
             }
           }).catch(function(error) {
@@ -466,7 +464,7 @@ export default {
                 }).catch(() => {
                 })
               }else{
-                that.GetDrugStock()
+                that.GetGoodStock()
               }
             }
           }).catch(function(error) {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -2358,7 +2358,9 @@ export default {
                       preTime = this.record_date + ' ' + '05:30'
                     } else {
                       preTime = this.record_date + ' ' + '7:00'
-
+                      if (this.org_id == 10633){
+                        preTime = this.record_date + ' ' + '6:00'
+                      }
                     }
                   } else if (this.schedule.schedule_type == 2) {
                     if(this.org_id == 10206  || this.org_id == 0 ){
@@ -2590,6 +2592,9 @@ export default {
                       preTime = this.record_date+ ' ' + '05:30'
                     } else {
                       preTime = this.record_date + ' ' + '7:00'
+                      if (this.org_id == 10633){
+                        preTime = this.record_date + ' ' + '6:00'
+                      }
                     }
                     // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                   } else if (this.schedule.schedule_type == 2) {
@@ -3020,7 +3025,9 @@ export default {
                             preTime = this.record_date + ' ' + '05:30'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
-
+                            if (this.org_id == 10633){
+                              preTime = this.record_date + ' ' + '6:00'
+                            }
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -3054,6 +3061,9 @@ export default {
                               preTime = this.record_date+ ' ' + '05:30'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
+                              if (this.org_id == 10633){
+                                preTime = this.record_date + ' ' + '6:00'
+                              }
                             }
                           }else if(this.schedule.schedule_type == 2){
                             if(this.org_id == 10206  || this.org_id == 0){
@@ -3227,6 +3237,9 @@ export default {
                             preTime = this.record_date + ' ' + '05:30'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
+                            if (this.org_id == 10633){
+                              preTime = this.record_date + ' ' + '6:00'
+                            }
 
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -3258,6 +3271,9 @@ export default {
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
+                            if (this.org_id == 10633){
+                              preTime = this.record_date + ' ' + '6:00'
+                            }
                           }
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
@@ -3328,6 +3344,9 @@ export default {
                           preTime = this.record_date+ ' ' + '05:30'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
+                          if (this.org_id == 10633){
+                            preTime = this.record_date + ' ' + '6:00'
+                          }
                         }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
@@ -3732,6 +3751,9 @@ export default {
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
+                            if (this.org_id == 10633){
+                              preTime = this.record_date + ' ' + '6:00'
+                            }
                           }
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
@@ -3895,6 +3917,9 @@ export default {
 
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
+                            if (this.org_id == 10633){
+                              preTime = this.record_date + ' ' + '6:00'
+                            }
                           }
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
@@ -3960,6 +3985,9 @@ export default {
                           preTime = this.record_date+ ' ' + '05:30'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
+                          if (this.org_id == 10633){
+                            preTime = this.record_date + ' ' + '6:00'
+                          }
                         }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
@@ -4351,6 +4379,9 @@ export default {
 
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
+                          if (this.org_id == 10633){
+                            preTime = this.record_date + ' ' + '6:00'
+                          }
                         }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
@@ -4518,6 +4549,9 @@ export default {
                           preTime = this.record_date+ ' ' + '05:30'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
+                          if (this.org_id == 10633){
+                            preTime = this.record_date + ' ' + '6:00'
+                          }
                         }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
@@ -4582,6 +4616,9 @@ export default {
                         preTime = this.record_date+ ' ' + '05:30'
                       }else {
                         preTime = this.record_date + ' ' + '7:00'
+                        if (this.org_id == 10633){
+                          preTime = this.record_date + ' ' + '6:00'
+                        }
                       }
                     }else if(this.schedule.schedule_type == 2){
                       if(this.org_id == 10206  || this.org_id == 0){
@@ -5063,6 +5100,9 @@ export default {
 
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
+                            if (this.org_id == 10633){
+                              preTime = this.record_date + ' ' + '6:00'
+                            }
 
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -5102,6 +5142,9 @@ export default {
 
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
+                              if (this.org_id == 10633){
+                                preTime = this.record_date + ' ' + '6:00'
+                              }
                             }
                           }else if(this.schedule.schedule_type == 2){
                             if(this.org_id == 10206  || this.org_id == 0){
@@ -5278,6 +5321,9 @@ export default {
                             preTime = this.record_date+ ' ' + '05:30'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
+                            if (this.org_id == 10633){
+                              preTime = this.record_date + ' ' + '6:00'
+                            }
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -5307,6 +5353,9 @@ export default {
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
+                            if (this.org_id == 10633){
+                              preTime = this.record_date + ' ' + '6:00'
+                            }
                           }
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
@@ -5384,6 +5433,9 @@ export default {
                           preTime = this.record_date+ ' ' + '05:30'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
+                          if (this.org_id == 10633){
+                            preTime = this.record_date + ' ' + '6:00'
+                          }
                         }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
@@ -5766,6 +5818,9 @@ export default {
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
+                            if (this.org_id == 10633){
+                              preTime = this.record_date + ' ' + '6:00'
+                            }
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -5802,6 +5857,9 @@ export default {
                               preTime = this.record_date+ ' ' + '05:30'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
+                                if (this.org_id == 10633){
+                                preTime = this.record_date + ' ' + '6:00'
+                              }
                             }
                           }else if(this.schedule.schedule_type == 2){
                             if(this.org_id == 10206  || this.org_id == 0){
@@ -5981,6 +6039,9 @@ export default {
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
+                            if (this.org_id == 10633){
+                              preTime = this.record_date + ' ' + '6:00'
+                            }
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -6011,6 +6072,9 @@ export default {
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
+                            if (this.org_id == 10633){
+                              preTime = this.record_date + ' ' + '6:00'
+                            }
                           }
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
@@ -6090,6 +6154,9 @@ export default {
 
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
+                          if (this.org_id == 10633){
+                            preTime = this.record_date + ' ' + '6:00'
+                          }
                         }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){

src/xt_pages/outpatientTool/calScore.vue

@@ -0,0 +1,242 @@
+<template>
+  <div class="container">
+    <h1>{{ fixmedins_name }}执业人员信息表</h1>
+
+    <div class="summary">
+      <div class="summary-item">
+        <div class="value">{{ fixmedins_code }}</div>
+        <div class="label">机构编码</div>
+      </div>
+      <div class="summary-item">
+        <div class="value">{{ info.length }} 人</div>
+        <div class="label">执业人员总数</div>
+      </div>
+      <div class="summary-item">
+        <div class="value">{{ activeCount }} 人</div>
+        <div class="label">正常执业</div>
+      </div>
+      <div class="summary-item">
+        <div class="value">{{ signedCount }} 人</div>
+        <div class="label">承诺书已上传</div>
+      </div>
+    </div>
+
+    <table v-if="info.length > 0">
+      <thead>
+      <tr>
+        <th>序号</th>
+        <th>执业人员编码</th>
+        <th>执业人员姓名</th>
+        <th>人员状态</th>
+        <th>执业类型</th>
+        <th>本年度记分</th>
+        <th>修复分数</th>
+        <th>承诺书</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr v-for="(item, index) in info" :key="item.dr_code">
+        <td>{{ index + 1 }}</td>
+        <td>{{ item.dr_code }}</td>
+        <td>{{ item.dr_name }}</td>
+        <td :class="{'status-active': item.dr_stas === '1', 'status-inactive': item.dr_stas !== '1'}">
+          {{ item.dr_stas === '1' ? '正常' : '异常' }}
+        </td>
+        <td>{{ getPractitionerType(item.prac_psn_type) }}</td>
+        <td>{{ item.th_roun_score }}</td>
+        <td>{{ item.repair_score }}</td>
+        <td :class="{'sign-uploaded': item.sign_flag === '1', 'sign-not-uploaded': item.sign_flag !== '1'}">
+          {{ item.sign_flag === '1' ? '已上传' : '未上传' }}
+        </td>
+      </tr>
+      </tbody>
+    </table>
+    <div v-else class="loading">
+      <p v-if="loading">数据加载中...</p>
+      <p v-else>暂无数据</p>
+    </div>
+
+    <div class="footer">
+      数据更新时间：{{ currentDate }} | {{ fixmedins_name }}执业人员信息系统
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "calScore",
+  data() {
+    return {
+      loading: true,
+      info: [{"admdvs":null,"chk_stas":null,"current_user":null,"dr_code":"D440229003938","dr_codes":null,"dr_name":"甘轶华","dr_stas":"1","fixmedins_code":"H44022900158","fixmedins_name":"翁源沅胜血液透析中心","medins_code":null,"medins_name":null,"page_num":null,"page_size":null,"parc_psn_type":"1","pau_stas":null,"prac_psn_type":"1","prac_psn_type_name":null,"psn_no":null,"repair_score":0,"sign_flag":"1","stt_year":null,"sulpd_cnt":null,"th_roun_score":0,"uploaded_cnt":null},{"admdvs":null,"chk_stas":null,"current_user":null,"dr_code":"D440229004651","dr_codes":null,"dr_name":"周君权","dr_stas":"1","fixmedins_code":"H44022900158","fixmedins_name":"翁源沅胜血液透析中心","medins_code":null,"medins_name":null,"page_num":null,"page_size":null,"parc_psn_type":"1","pau_stas":null,"prac_psn_type":"1","prac_psn_type_name":null,"psn_no":null,"repair_score":0,"sign_flag":"1","stt_year":null,"sulpd_cnt":null,"th_roun_score":0,"uploaded_cnt":null}],
+      fixmedins_name: '',
+      fixmedins_code: '',
+      currentDate: new Date().toLocaleDateString()
+    }
+  },
+  computed: {
+    activeCount() {
+      return this.info.filter(item => item.dr_stas === '1').length
+    },
+    signedCount() {
+      return this.info.filter(item => item.sign_flag === '1').length
+    }
+  },
+  methods: {
+    getPractitionerType(type) {
+      const types = {
+        '1': '医师',
+        '2': '护士',
+        '3': '药师',
+        '4': '技师'
+      }
+      return types[type] || '其他'
+    },
+    async fetchData() {
+      try {
+        this.loading = true;
+        const response = await fetch('http://127.0.0.1:9532/api/2503');
+        const data = await response.json();
+
+        if (data.code === 0 && data.data.info.length > 0) {
+          this.info = data.data.info;
+          this.fixmedins_name = data.data.org_config.fixmedins_name;
+          this.fixmedins_code = data.data.org_config.fixmedins_code;
+        }
+      } catch (error) {
+        console.error('Error fetching data:', error);
+      } finally {
+        this.loading = false;
+      }
+    }
+  },
+  mounted() {
+    this.fetchData();
+  }
+}
+</script>
+
+<style scoped>
+.container {
+  max-width: 1200px;
+  margin: 0 auto;
+  background: white;
+  border-radius: 10px;
+  box-shadow: 0 0 20px rgba(0,0,0,0.1);
+  padding: 25px;
+}
+
+h1 {
+  text-align: center;
+  color: #2c3e50;
+  margin-bottom: 30px;
+  padding-bottom: 15px;
+  border-bottom: 2px solid #3498db;
+}
+
+.summary {
+  background-color: #e8f4fe;
+  padding: 15px;
+  border-radius: 8px;
+  margin-bottom: 25px;
+  display: flex;
+  justify-content: space-around;
+  flex-wrap: wrap;
+}
+
+.summary-item {
+  text-align: center;
+  padding: 10px 20px;
+  min-width: 150px;
+}
+
+.summary-item .value {
+  font-size: 24px;
+  font-weight: bold;
+  color: #2980b9;
+}
+
+.summary-item .label {
+  font-size: 14px;
+  color: #7f8c8d;
+}
+
+table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-top: 20px;
+  box-shadow: 0 2px 5px rgba(0,0,0,0.05);
+}
+
+th {
+  background-color: #3498db;
+  color: white;
+  font-weight: bold;
+  text-align: left;
+  padding: 15px;
+  position: sticky;
+  top: 0;
+}
+
+td {
+  padding: 14px 15px;
+  border-bottom: 1px solid #ecf0f1;
+}
+
+tr:nth-child(even) {
+  background-color: #f8f9fa;
+}
+
+tr:hover {
+  background-color: #e8f4fe;
+}
+
+.status-active {
+  color: #27ae60;
+  font-weight: bold;
+}
+
+.status-inactive {
+  color: #e74c3c;
+  font-weight: bold;
+}
+
+.sign-uploaded {
+  color: #27ae60;
+}
+
+.sign-not-uploaded {
+  color: #e74c3c;
+}
+
+.footer {
+  text-align: center;
+  margin-top: 30px;
+  color: #7f8c8d;
+  font-size: 14px;
+}
+
+.loading {
+  text-align: center;
+  padding: 50px;
+  font-size: 18px;
+  color: #7f8c8d;
+}
+
+@media (max-width: 768px) {
+  .summary {
+    flex-direction: column;
+    align-items: center;
+  }
+
+  .summary-item {
+    margin-bottom: 15px;
+    width: 100%;
+  }
+
+  table {
+    display: block;
+    overflow-x: auto;
+  }
+}
+</style>

src/xt_pages/outpatientTool/components/detail.vue

@@ -416,18 +416,14 @@ export default {
       GetSummaryDetail(params).then(response => {
         if (response.data.state == 0) {
           this.detail_loading = false
-
           this.$message.error(response.data.msg)
           return false
         } else {
-
-
           this.detail_loading = false
-
           this.tableData = []
           let tempPatients = []
           let tempPatientsTwo = []
-          //
+
           let tempData = response.data
           let allData =  response.data
            tempData = this.uniquepid(tempData)

src/xt_pages/outpatientTool/components/personSettle.vue

@@ -490,119 +490,288 @@ export default {
 
 
           let list = []
-          for (let i = 0; i < result.length; i++) {
-            let order = result[i]
-            let name = order.PsnName
-
-
-            let type_name = ""
-            if(order.TypeName == '城乡'){
-              let e = org_info.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
-              let f = order.CanBaoDi.slice(0, 2); //参保地前4位编码
-              let a = org_info.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
-              let b = order.CanBaoDi.slice(0, 3); //参保地前3位编码
-              let c = org_info.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
-              let d = order.CanBaoDi.slice(0, 4); //参保地前4位编码
-              if (e == f) {
-                if (a == b) {
-                  if (c == d) {
-                    type_name = "本地城乡"
+          // for (let i = 0; i < result.length; i++) {
+          //   let order = result[i]
+          //   let name = order.PsnName
+          //
+          //
+          //   let type_name = ""
+          //   if(order.TypeName == '城乡'){
+          //     let e = org_info.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
+          //     let f = order.CanBaoDi.slice(0, 2); //参保地前4位编码
+          //     let a = org_info.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+          //     let b = order.CanBaoDi.slice(0, 3); //参保地前3位编码
+          //     let c = org_info.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+          //     let d = order.CanBaoDi.slice(0, 4); //参保地前4位编码
+          //     if (e == f) {
+          //       if (a == b) {
+          //         if (c == d) {
+          //           type_name = "本地城乡"
+          //         } else {
+          //           type_name = "省内异地城乡"
+          //         }
+          //       } else {
+          //         type_name = "省内异地城乡"
+          //       }
+          //     } else {
+          //       type_name = "省外异地城乡"
+          //     }
+          //
+          //   }else if(order.TypeName == '职工') {
+          //     let e = org_info.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
+          //     let f = order.CanBaoDi.slice(0, 2); //参保地前4位编码
+          //     let a = org_info.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+          //     let b = order.CanBaoDi.slice(0, 3); //参保地前3位编码
+          //     let c = org_info.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+          //     let d = order.CanBaoDi.slice(0, 4); //参保地前4位编码
+          //     if (e == f) {
+          //       if (a == b) {
+          //         if (c == d) {
+          //           type_name = "本地职工"
+          //         } else {
+          //           type_name = "省内异地职工"
+          //         }
+          //       } else {
+          //         type_name = "省内异地职工"
+          //       }
+          //     } else {
+          //       type_name = "省外异地职工"
+          //     }
+          //   }
+          //   let total = order.Total
+          //
+          //   let xt = order.XtCount
+          //   let xl = order.XlCount
+          //   let gl = order.GlCount
+          //
+          //
+          //
+          //   let obj = {
+          //     '患者姓名': name,
+          //     '类型': type_name,
+          //     "合计次数": total,
+          //     '血透': xt,
+          //     "血滤": xl,
+          //     '灌流': gl,
+          //     "西药费":order.WesternMedicineFee,
+          //     "中成药费":order.ChinesePatentMedicineFee,
+          //     '耗材费': order.HealthMaterialsFee,
+          //     '挂号费': order.RegistrationFee,
+          //     '治疗费': order.TreatmentFee,
+          //     '检查费': order.ExaminationFee,
+          //     '化验费': order.LaboratoryFee,
+          //     '护理费': order.NursingFee,
+          //     '其他费': order.OtherFee,
+          //     '床位费': order.BedsFee,
+          //     '诊察费': order.ConsultationFee,
+          //     '中药饮片费': order.ChineseMedicineFee,
+          //     '一般诊疗费': order.GeneralTreatmentFee,
+          //     '合计': order.TotalMedicalFee,
+          //     "医保基金支付金额":order.Func,
+          //     "医保统筹基金支出":order.TC,
+          //     "医疗救助支付金额":order.YLJZ,
+          //     "大病保险报销金额":order.DBBX,
+          //     "公务员医疗补助支付":order.GWY,
+          //     "职工大额医疗费用补助支付":order.DE,
+          //     "企业补充医疗保险基金支付":order.BC,
+          //     "其他支付":order.QT,
+          //     '自费金额': order.SelfPay,
+          //     '个人账户支付': order.AcctPay,
+          //     '退费': order.Return,
+          //     '优惠': order.YouHui,
+          //     '应收': order.YingShou,
+          //     '挂账': order.GuaZhang,
+          //     '冲账': order.ChongZhang,
+          //     '实收': order.ShiShou,
+          //     '已收': order.YiShou,
+          //   }
+          //   list.push(obj)
+          //
+          // }
+
+            import('@/vendor/Export2Excel').then(excel => {
+
+              // // 创建主标题和日期行
+              // let titleRow = {
+              //   '': '盛友血液透析中心收入统计',
+              //   // 其他属性留空
+              // }
+              //
+              // let dateRow = {
+              //   '': `统计日期：${start_time}至${end_time}`,
+              //   // 其他属性留空
+              // }
+              // let obj2 = {
+              //    "":"",
+              //   '患者姓名': "患者姓名",
+              //   '类型': "类型",
+              //   "合计次数": "合计次数",
+              //   '血透': "血透",
+              //   "血滤": "血滤",
+              //   '灌流': "灌流",
+              //   "西药费": "西药费",
+              //   "中成药费": "中成药费",
+              //   '耗材费': "耗材费",
+              //   '挂号费': "挂号费",
+              //   '治疗费': "治疗费",
+              //   '检查费': "检查费",
+              //   '化验费': "化验费",
+              //   '护理费': "护理费",
+              //   '其他费': "其他费",
+              //   '床位费': "床位费",
+              //   '诊察费':  "诊察费",
+              //   '中药饮片费': "中药饮片费",
+              //   '一般诊疗费': "一般诊疗费",
+              //   '合计': "合计",
+              //   "医保基金支付金额":"医保基金支付金额",
+              //   "医保统筹基金支出":"医保统筹基金支出",
+              //   "医疗救助支付金额":"医疗救助支付金额",
+              //   "大病保险报销金额":"大病保险报销金额",
+              //   "公务员医疗补助支付":"公务员医疗补助支付",
+              //   "职工大额医疗费用补助支付":"职工大额医疗费用补助支付",
+              //   "企业补充医疗保险基金支付":"企业补充医疗保险基金支付",
+              //   "其他支付":"其他支付",
+              //   '自费金额': "自费金额",
+              //   '个人账户支付': "个人账户支付",
+              //   '退费': "退费",
+              //   '优惠': "优惠",
+              //   '应收': "应收",
+              //   '挂账': "挂账",
+              //   '冲账': "冲账",
+              //   '实收': "实收",
+              //   '已收': "已收",
+              // }
+
+              // let list = [titleRow, dateRow, obj2] // 前3行固定
+              let list = []
+              for (let i = 0; i < result.length; i++) {
+                let order = result[i]
+                let name = order.PsnName
+
+
+                let type_name = ""
+                if(order.TypeName == '城乡'){
+                  let e = org_info.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
+                  let f = order.CanBaoDi.slice(0, 2); //参保地前4位编码
+                  let a = org_info.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+                  let b = order.CanBaoDi.slice(0, 3); //参保地前3位编码
+                  let c = org_info.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+                  let d = order.CanBaoDi.slice(0, 4); //参保地前4位编码
+                  if (e == f) {
+                    if (a == b) {
+                      if (c == d) {
+                        type_name = "本地城乡"
+                      } else {
+                        type_name = "省内异地城乡"
+                      }
+                    } else {
+                      type_name = "省内异地城乡"
+                    }
                   } else {
-                    type_name = "省内异地城乡"
+                    type_name = "省外异地城乡"
                   }
-                } else {
-                  type_name = "省内异地城乡"
-                }
-              } else {
-                type_name = "省外异地城乡"
-              }
 
-            }else if(order.TypeName == '职工') {
-              let e = org_info.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
-              let f = order.CanBaoDi.slice(0, 2); //参保地前4位编码
-              let a = org_info.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
-              let b = order.CanBaoDi.slice(0, 3); //参保地前3位编码
-              let c = org_info.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
-              let d = order.CanBaoDi.slice(0, 4); //参保地前4位编码
-              if (e == f) {
-                if (a == b) {
-                  if (c == d) {
-                    type_name = "本地职工"
+                }else if(order.TypeName == '职工') {
+                  let e = org_info.mdtrtarea_admvs.slice(0, 2); //就医地前3位编码
+                  let f = order.CanBaoDi.slice(0, 2); //参保地前4位编码
+                  let a = org_info.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
+                  let b = order.CanBaoDi.slice(0, 3); //参保地前3位编码
+                  let c = org_info.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+                  let d = order.CanBaoDi.slice(0, 4); //参保地前4位编码
+                  if (e == f) {
+                    if (a == b) {
+                      if (c == d) {
+                        type_name = "本地职工"
+                      } else {
+                        type_name = "省内异地职工"
+                      }
+                    } else {
+                      type_name = "省内异地职工"
+                    }
                   } else {
-                    type_name = "省内异地职工"
+                    type_name = "省外异地职工"
                   }
-                } else {
-                  type_name = "省内异地职工"
                 }
-              } else {
-                type_name = "省外异地职工"
-              }
-            }
-            let total = order.Total
-
-            let xt = order.XtCount
-            let xl = order.XlCount
-            let gl = order.GlCount
-
-
-            let obj = {
-              '患者姓名': name,
-              '类型': type_name,
-              "合计次数": total,
-              '血透': xt,
-              "血滤": xl,
-              '灌流': gl,
-              "西药费":order.WesternMedicineFee,
-              "中成药费":order.ChinesePatentMedicineFee,
-              '耗材费': order.HealthMaterialsFee,
-              '挂号费': order.RegistrationFee,
-              '治疗费': order.TreatmentFee,
-              '检查费': order.ExaminationFee,
-              '化验费': order.LaboratoryFee,
-              '护理费': order.NursingFee,
-              '其他费': order.OtherFee,
-              '床位费': order.BedsFee,
-              '诊察费': order.ConsultationFee,
-              '中药饮片费': order.ChineseMedicineFee,
-              '一般诊疗费': order.GeneralTreatmentFee,
-              '合计': order.TotalMedicalFee,
-              "医保基金支付金额":order.Func,
-              "医保统筹基金支出":order.TC,
-              "医疗救助支付金额":order.YLJZ,
-              "大病保险报销金额":order.DBBX,
-              "公务员医疗补助支付":order.GWY,
-              "职工大额医疗费用补助支付":order.DE,
-              "企业补充医疗保险基金支付":order.BC,
-              "其他支付":order.QT,
-              '自费金额': order.SelfPay,
-              '个人账户支付': order.AcctPay,
-              '退费': order.Return,
-              '优惠': order.YouHui,
-              '应收': order.YingShou,
-              '挂账': order.GuaZhang,
-              '冲账': order.ChongZhang,
-              '实收': order.ShiShou,
-              '已收': order.YiShou,
-            }
-            list.push(obj)
-          }
+                let total = order.Total
+
+                let xt = order.XtCount
+                let xl = order.XlCount
+                let gl = order.GlCount
+
+
+
+                let obj = {
+                  "":"",
+                  '患者姓名': name,
+                  '类型': type_name,
+                  "合计次数": total,
+                  '血透': xt,
+                  "血滤": xl,
+                  '灌流': gl,
+                  "西药费":order.WesternMedicineFee,
+                  "中成药费":order.ChinesePatentMedicineFee,
+                  '耗材费': order.HealthMaterialsFee,
+                  '挂号费': order.RegistrationFee,
+                  '治疗费': order.TreatmentFee,
+                  '检查费': order.ExaminationFee,
+                  '化验费': order.LaboratoryFee,
+                  '护理费': order.NursingFee,
+                  '其他费': order.OtherFee,
+                  '床位费': order.BedsFee,
+                  '诊察费': order.ConsultationFee,
+                  '中药饮片费': order.ChineseMedicineFee,
+                  '一般诊疗费': order.GeneralTreatmentFee,
+                  '合计': order.TotalMedicalFee,
+                  "医保基金支付金额":order.Func,
+                  "医保统筹基金支出":order.TC,
+                  "医疗救助支付金额":order.YLJZ,
+                  "大病保险报销金额":order.DBBX,
+                  "公务员医疗补助支付":order.GWY,
+                  "职工大额医疗费用补助支付":order.DE,
+                  "企业补充医疗保险基金支付":order.BC,
+                  "其他支付":order.QT,
+                  '自费金额': order.SelfPay,
+                  '个人账户支付': order.AcctPay,
+                  '退费': order.Return,
+                  '优惠': order.YouHui,
+                  '应收': order.YingShou,
+                  '挂账': order.GuaZhang,
+                  '冲账': order.ChongZhang,
+                  '实收': order.ShiShou,
+                  '已收': order.YiShou,
+                }
+                list.push(obj)
 
-          if(list.length > 0){
-            import('@/vendor/Export2Excel').then(excel => {
+              }
+              const multiHeader = [
+                ['盛友血液透析中心收入统计'],  // 第一行
+                [`统计日期：${start_time}至${end_time}`]  // 第二行
+              ]
+
+              const merges = [
+                'A1:AK1', // 合并标题行
+                'A2:AK2', // 合并日期行
+                // 表头行不合并
+              ]
+
+              // const merges = ['A1:A2', 'B1:B2', 'C1:C2', 'D1:D2', 'E1:E2','F1:F2','G1:G2','H1:H2', 'I1:I2','J1:J2','K1:K2','L1:L2','M1:M2','N1:N2','O1:O2','P1:P2','Q1:Q2','R1:R2','S1:S2','T1:T2','U1:U2','V1:V2','W1:W2','X1:X2','Y1:Y2','Z1:Z2','AA1:AA2','AB1:AB2','AC1:AC2','AD1:AD2','AE1:AE2','AF1:AF2','AG1:AG2','AH1:AH2','AI1:AI2','AJ1:AJ2','AK1:AK2']
               const tHeader = ['患者姓名', '类型', "合计次数", '血透', '血滤', "灌流", "西药费", "中成药费", '耗材费', '挂号费', '治疗费', '检查费', '化验费', '护理费', "其他费", "床位费", "诊察费", "中药饮片费", "一般诊疗费", "合计","医保基金支付金额", "医保统筹基金支出","医疗救助支付金额","大病保险报销金额","公务员医疗补助支付","职工大额医疗费用补助支付","企业补充医疗保险基金支付","其他支付","自费金额", '个人账户支付', '退费', "优惠", "应收", "挂账", "冲账", "实收", "已收"]
               const filterVal = ['患者姓名', '类型', "合计次数", '血透', '血滤', "灌流", "西药费", "中成药费", '耗材费', '挂号费', '治疗费', '检查费', '化验费', '护理费', "其他费", "床位费", "诊察费", "中药饮片费", "一般诊疗费", "合计","医保基金支付金额","医保统筹基金支出","医疗救助支付金额","大病保险报销金额","公务员医疗补助支付","职工大额医疗费用补助支付","企业补充医疗保险基金支付","其他支付", "自费金额", '个人账户支付', '退费', "优惠", "应收", "挂账", "冲账", "实收", "已收"]
 
               const data = this.formatJson(filterVal, list)
-              excel.export_json_to_excel({
+
+              // const data = this.formatJson(filterVal, list)
+
+              excel.export_json_to_excel23({
+                multiHeader,
                 header: tHeader,
                 data,
-                filename: '收入统计'
+                filename: '盛友血液透析中心收入统计',
+                merges,           // 应用合并单元格设置
+                autoWidth: true   // 自动调整列宽
               })
             })
           }
-
-
-        }
       })
 
 
@@ -623,7 +792,7 @@ export default {
         const tHeader = [ '患者姓名']
         const filterVal = [ '患者姓名']
         const data = this.formatJson(filterVal, list)
-        excel.export_json_to_excel1({
+        excel.export_json_to_excel({
           header: tHeader,
           data,
           filename: '汇总',