From d907e988582d12afbb2733d466381196362ac055 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Wed, 3 Dec 2025 18:59:57 +0800
Subject: [PATCH] seo

---
 src/components/common/HcAsbitem.vue           |  12 +-
 src/components/doctorCheck/ButtonList.vue     |   2 +-
 .../doctorCheck/PatientRegisterList.vue       |  17 +-
 .../report/PatientRegisterListNobtn.vue       |  54 ++--
 src/components/report/TurnoverReport.vue      |  17 +-
 src/components/report/TurnoverReportM.vue     | 283 +++++++++++++++++
 src/components/report/TurnoverReportP.vue     | 284 ++++++++++++++++++
 src/router/index.js                           |  14 +-
 src/views/fee-settings/Asbitem.vue            |   5 +-
 9 files changed, 635 insertions(+), 53 deletions(-)
 create mode 100644 src/components/report/TurnoverReportM.vue
 create mode 100644 src/components/report/TurnoverReportP.vue

diff --git a/src/components/common/HcAsbitem.vue b/src/components/common/HcAsbitem.vue
index 10ec162..ec6981d 100644
--- a/src/components/common/HcAsbitem.vue
+++ b/src/components/common/HcAsbitem.vue
@@ -92,7 +92,7 @@ import { arrayExistObj, tcdate, arrayFilter, arrayReduce, deepCopy,dddw } from "
 
 
 export default {
-  props:['asbitemId'],
+  props:['asbitemId','HcAsbitemBrush'],
   data() {
     return {
       packagePrice:0,               //分组总价
@@ -513,7 +513,11 @@ export default {
       if(asbitemId){
         postapi('/api/app/AsbitemMutualExclusion/GetAsbitemMutualExclusionByAsbitemId',{asbitemId}).then((res) => {    
           if(res.code != -1){
-            //this.medicalPackageAsbitems = res.data;
+            this.medicalPackageAsbitems = res.data.details;
+            this.medicalPackageAsbitems.forEach(e => {
+              e.asbitemId = e.mutualExclusionAsbitemId
+              e.displayName = e.mutualExclusionAsbitemName
+            });
             this.getAsbItemByItemType()
           }           
         });
@@ -528,10 +532,10 @@ export default {
   //监听事件
   watch: {
     //
-    "asbitemId"(newVal, oldVal) {
+    "HcAsbitemBrush"(newVal, oldVal) {
       console.log("asbitemId ",newVal,oldVal);
       if (newVal != oldVal) {
-        this.getHcAsbitems(newVal);
+        this.getHcAsbitems(this.asbitemId);
       }
     },
   },
diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue
index f41d74b..04dc212 100644
--- a/src/components/doctorCheck/ButtonList.vue
+++ b/src/components/doctorCheck/ButtonList.vue
@@ -645,7 +645,7 @@ export default {
                 isBuildImage: 'N',
                 IsUploadPdf: 'N',
                 ReportCode, token,
-                preViewCanPrint: 'Y', // this.doctorCheck.prBase.isAudit, //this.dataTransOpts.tableS.patient_register.isAudit
+                preViewCanPrint: 'Y', // Y、N   N只看不能打印
                 Parameters: [
                     { Name: 'printer', Value: user },
                     { Name: 'LTS', Value: 'Y' }, //Y、N   N只看不能打印
diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index ef2e4fe..bfbcd83 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -92,7 +92,15 @@
 
     <!-- 人员列表 -->
     <el-table :data="dataList" border width="100%" :height="tableHeight" row-key="id" size="small" highlight-current-row
-      @row-click="rowClick" @row-dblclick="rowDblclick" ref="info" id="info" style="border-radius:10px;">
+      @row-click="rowClick" @row-dblclick="rowDblclick" ref="info" id="info" style="border-radius:10px;"> 
+      <el-table-column type="index" label="序号" width="40" align="center" />   
+      <el-table-column prop="patientName" label="姓名" width="80" sortable align="center" />
+      <el-table-column prop="sexId" label="性别" sortable align="center">
+        <template slot-scope="scope">
+          <div>{{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="age" label="年龄" width="40" align="center" />
       <el-table-column prop="customerOrgParentName" label="单位" width="120" sortable>
         <template slot-scope="scope">
           <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
@@ -103,13 +111,6 @@
           <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="patientName" label="姓名" width="80" sortable align="center" />
-      <el-table-column prop="sexId" label="性别" sortable align="center">
-        <template slot-scope="scope">
-          <div>{{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column prop="age" label="年龄" align="center" />
       <el-table-column prop="patientRegisterNo" label="条码号" width="150" sortable align="center" />
       <el-table-column prop="patientNo" label="档案号" sortable align="center" />
       <el-table-column prop="medicalTimes" label="体检次数" align="center" />
diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index 01ff841..a6cca5d 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -23,7 +23,7 @@
             <i class="el-icon-printer" v-if="scope.row.isReportPrint == 'Y'" style="font-size: 24px;color: green;"></i>
           </template>
         </el-table-column>
-        <el-table-column prop="reportPrintName" label="打印人" width="60" align="center" sortable />
+        <el-table-column prop="reportPrintName" label="打印人" width="70" align="center" sortable />
         <el-table-column prop="isUploadAppoint" label="预约备单" align="center" sortable>
           <template slot-scope="scope">
             <div style="font-family: 'Microsoft YaHei';">{{ scope.row.isUploadAppoint == "Y" ? "√" : "" }}</div>
@@ -96,34 +96,7 @@
           <template slot-scope="scope">
             <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
           </template>
-        </el-table-column>
-
-        <!--
-        "sexHormoneTermId": "00000000-0000-0000-0000-000000000000",
-        "interposeMeasure": null,
-        "medicalConclusionId": "00000000-0000-0000-0000-000000000000",
-        "reportPrintTimes": 0,        
-        "isMedicalStart": "N",
-        "medicalStartDate": "6/28/2023",
-        "isRecoverGuide": "N",
-        "summaryDate": "",
-        "summaryDoctor": null,
-        "isAudit": "N",
-        "auditDoctor": null,
-        "auditDate": "",        
-        "isNameHide": "N",
-        "isPhoneFollow": "N",
-        "thirdInfo": null,
-        "guidePrintTimes": null,
-        "remark": null,
-        "medicalCenterId": "00000000-0000-0000-0000-000000000000",
-        "customerOrgRegisterId": "00000000-0000-0000-0000-000000000000",
-        "lastModifierName": "",
-        "lastModificationTime": null,
-        "lastModifierId": null,
-        "creatorId": null,
-        "id": "3a0c196d-a6d0-37fe-5c32-4806bdc4530f"
-        -->
+        </el-table-column>        
       </el-table>
       <div style="display: flex;justify-content:space-between;">
         <div></div>
@@ -176,6 +149,29 @@ export default {
       },
       loadOptsInit: {},
       summary_check_doctor_alias: ["总检", "审核"],
+
+      //拖动列      
+      dragCol: [
+        { label: "序号", prop: "sn", minWidth: 50, align: "center" },
+        { label: "姓名", prop: "patientName", minWidth: 65, align: "center"},
+        { label: "档案号", prop: "oldPatientNo", minWidth: 90, align: "center"},
+        { label: "检查条码", prop: "checkRequestNo", minWidth: 90, align: "center"},
+        { label: "检查项目", prop: "asbitemName", minWidth: 110, align: "left"},
+        { label: "性别", prop: "sexName", minWidth: 50, align: "center"},
+        { label: "年龄", prop: "age", minWidth: 50, align: "center"},        
+        { label: "单位名称", prop: "customerOrgParentName", minWidth: 110, align: "left"},
+        { label: "部门名称", prop: "customerOrgName", minWidth: 110, align: "left"},
+        { label: "电话", prop: "mobileTelephone", minWidth: 110, align: "center"},
+        { label: "身份证号", prop: "idNo", minWidth: 160, align: "center"},
+        { label: "上传日期", prop: "pacsUploadDate", minWidth: 140, align: "center"},
+        { label: "检查日期", prop: "pacsCheckDate", minWidth: 140, align: "center"},
+        { label: "检查医生", prop: "checkDoctorName", minWidth: 80, align: "center"},
+        { label: "体检类别", prop: "medicalTypeName", minWidth: 120, align: "center"},
+        { label: "发送状态", prop: "isSend", minWidth: 80, align: "center"},
+        { label: "审核日期", prop: "auditTime", minWidth: 140, align: "center"},
+        { label: "审核医生", prop: "auditorUserName", minWidth: 80, align: "center"}
+      ],
+      
     };
   },
 
diff --git a/src/components/report/TurnoverReport.vue b/src/components/report/TurnoverReport.vue
index 0116d59..58eaef4 100644
--- a/src/components/report/TurnoverReport.vue
+++ b/src/components/report/TurnoverReport.vue
@@ -3,7 +3,7 @@
     <div class="middlebox">
       <div class="contenttitle">
         体检查询 /
-        <span class="contenttitleBold">营业额统计</span>
+        <span class="contenttitleBold">营业额统计（单位）</span>
       </div>
     </div>
     <div
@@ -15,6 +15,7 @@
               <el-option label="登记日期" :value="'1'" />
               <el-option label="体检日期" :value="'2'" />
               <el-option label="总检日期" :value="'3'" />
+              <el-option label="收费日期" :value="'6'" />
             </el-select>
             <!-- dateType  1 登记，2 体检，3 总检日期-->
             <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small" style="width:90px;"
@@ -155,12 +156,12 @@ export default {
         }
       });
 
-      //体检类别
-      getapi("/api/app/medical-type/in-filter").then((res) => {
-        if (res.code > -1) {
-          this.dict.medicalType = res.data;
-        }
-      });
+      // //体检类别
+      // getapi("/api/app/medical-type/in-filter").then((res) => {
+      //   if (res.code > -1) {
+      //     this.dict.medicalType = res.data;
+      //   }
+      // });
     },
 
     //通用导出
@@ -211,7 +212,7 @@ export default {
       // }
      
       const { columns, data } = param;
-      const sumCol = [6, 7]  //需合计的列
+      const sumCol = [2,3,6, 7]  //需合计的列
       const sums = [];
       columns.forEach((column, index) => {
         //console.log('column, index,data',column, index,data)
diff --git a/src/components/report/TurnoverReportM.vue b/src/components/report/TurnoverReportM.vue
new file mode 100644
index 0000000..40e4478
--- /dev/null
+++ b/src/components/report/TurnoverReportM.vue
@@ -0,0 +1,283 @@
+<template>
+  <div>
+    <div class="middlebox">
+      <div class="contenttitle">
+        体检查询 /
+        <span class="contenttitleBold">营业额统计（体检类别）</span>
+      </div>
+    </div>
+    <div
+      style="display: flex;justify-content: space-between; padding: 10px;background-color: #fff;border-radius: 8px;margin-bottom: 10px;">
+      <div style="display:block;">
+        <div style="display: flex;flex-wrap: wrap;height: 32px;align-items: center;">
+          <div class="query">
+            <el-select v-model="query.dateType" placeholder="请选择" style="width: 80px" size="small">
+              <el-option label="登记日期" :value="'1'" />
+              <el-option label="体检日期" :value="'2'" />
+              <el-option label="总检日期" :value="'3'" />
+              <el-option label="收费日期" :value="'6'" />
+            </el-select>
+            <!-- dateType  1 登记，2 体检，3 总检日期-->
+            <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small" style="width:90px;"
+              value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+            <span class="spanClass">至</span>
+            <el-date-picker v-model="query.endDate" type="date" placeholder="截止日期" size="small" style="width:90px;"
+              value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+          </div>
+          <div class="query">
+            <span class="spanClass">体检类别</span>
+            <el-select v-model="query.medicalTypeIds" placeholder="请选择体检类别" :filter-method="filterMethod"
+              default-first-option clearable filterable style="margin-left: 10px" size="small" multiple collapse-tags>
+              <el-option v-for="item in medicalType" :key="item.id" :label="item.displayName" :value="item.id">
+                {{ item.displayName }}
+              </el-option>
+            </el-select>
+          </div>
+          <div class="query">
+            <span class="spanClass">是否包含预登记</span>
+            <el-checkbox v-model="query.isPreRegistration" true-label="Y" false-label="N" />
+          </div>
+        </div>
+      </div>
+      <div>
+        <el-button type="primary" class="commonbutton" @click="btnQuery" size="small">查询</el-button>       
+        <el-button class="commonbutton" @click="btnExport('tableData')" size="small">导出</el-button>          
+      </div>
+    </div>
+    <div id="tableData">
+      <el-table :data="tableData" border :height="window.pageHeight - 160" highlight-current-row 
+        size="small" row-key="id" :summary-method="getSummaries" show-summary ref="refTable">
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="medicalTypeName" label="体检类别" min-width="150" />
+        <el-table-column prop="registerCount" label="登记人数" min-width="80" align="center" />
+        <el-table-column prop="checkCount" label="检查人数" min-width="80" align="center" />
+        <el-table-column prop="avgStandardPrice" label="标准平均单价" min-width="100" align="center" />
+        <el-table-column prop="avgChargePrice" label="应收平均单价" min-width="100" align="center" />
+        <el-table-column prop="sumStandardPrice" label="标准金额" min-width="100" align="center" />
+        <el-table-column prop="sumChargePrice" label="应收金额" min-width="100" align="center" />
+      </el-table>
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { deepCopy } from "../../utlis/proFunc"
+import CusOrgOCX from "./CusOrgOCX.vue"
+import moment from "moment";
+import FileSaver from 'file-saver';
+
+export default {
+  components: {
+    CusOrgOCX,
+  },
+  props: ["orgEnable"],
+  data() {
+    return {
+      dialogVisible: false,
+      local: {
+        completeFlag: []
+      },
+
+      customerOrg: [],
+      customerOrgAll: [],
+      medicalType: [],
+      query: {
+        dateType: '1',
+        startDate: '',
+        endDate: '',
+        //customerOrgIds: [],
+        medicalTypeIds: [],
+        // isMedicalTypeId: 'Y',
+        isPreRegistration:'N'
+      },
+      tableData: [],
+
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+        shortcuts: [{
+          text: '今天',
+          onClick(picker) {
+            picker.$emit('pick', new Date());
+          }
+        }, {
+          text: '昨天',
+          onClick(picker) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24);
+            picker.$emit('pick', date);
+          }
+        }, {
+          text: '一周前',
+          onClick(picker) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', date);
+          }
+        }]
+      },
+
+    };
+  },
+
+  created() {
+
+  },
+
+  //挂载完成
+  mounted() {
+
+    this.dictInit()
+
+  },
+
+  updated() {
+    this.$nextTick(() => {
+      this.$refs['refTable'].doLayout()
+    })
+  },
+
+  computed: {
+    ...mapState(["window", "dict", "patientRegister", "report"]),
+  },
+  methods: {
+    //获取初始数据
+    dictInit() {
+      let today = moment(new Date()).format("YYYY-MM-DD")
+      this.query.startDate = today
+      this.query.endDate = today
+
+      //获取单位列表
+      // getapi("/api/app/customer-org/parent-all").then((res) => {
+      //   if (res.code != -1) {
+      //     this.customerOrgAll = res.data;
+      //     this.customerOrg = deepCopy(this.customerOrgAll);
+      //   }
+      // });
+
+      //体检类别
+      getapi("/api/app/medical-type/in-filter").then((res) => {
+        if (res.code > -1) {
+          this.dict.medicalType = res.data;
+          this.medicalType = res.data
+        }
+      });
+    },
+
+    //通用导出
+    btnExport(elId) {
+      let table = document.getElementById(elId);
+      let tableData = table.innerHTML
+      let fileName = moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
+      let blob = new Blob([tableData], { type: "text/plain;charset=utf-8" });
+      FileSaver.saveAs(blob, fileName);
+    },
+
+    // 单位过滤
+    filterMethod(keyWords) {
+      if (keyWords) {
+        this.medicalType = [];
+        this.dict.medicalType.forEach((item) => {
+          if (
+            item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
+          ) {
+            this.medicalType.push(item);
+          }
+        });
+      } else {
+        this.medicalType = deepCopy(this.dict.medicalType);
+      }
+    },
+
+    // 查询
+    btnQuery() {
+
+      postapi("/api/app/CustomerReport/GetMedicalTypePhysicalExaminationStatistics", this.query).then(res => {
+        if (res.code > -1) {
+          this.tableData = res.data
+        }
+      })
+    },
+
+    //合计
+    getSummaries(param) {
+      console.log('getSummaries param',param)
+      // if(!param){
+      //   param = {
+      //     columns:[{}, {}, {}, {}, {}, {}, {property: 'asbitemMoney'},{property: 'customerOrgGroupDetailMoney'}],
+      //     data:this.customerOrgGroupAsbitems
+      //   }
+      // }
+     
+      const { columns, data } = param;
+      const sumCol = [2,3,6, 7]  //需合计的列
+      const sums = [];
+      columns.forEach((column, index) => {
+        //console.log('column, index,data',column, index,data)
+        //显示合计列
+        if (index === 1) {
+          sums[index] = '合计';
+          return;
+        }
+
+        //不合计的列
+        if (sumCol.indexOf(index) == -1) {
+          sums[index] = '';
+          return;
+        }
+
+        sums[index] = 0
+        data.forEach(e => {
+          if (!isNaN(e[column.property])) sums[index] += Number(e[column.property])// * e['amount']
+        })
+        sums[index] = sums[index].toFixed(2) //+ ' 元';
+
+      });
+      // this.groupPrice = sums[7];
+      // console.log('getSummaries',sums)
+      // if (!this.totalFoucs) this.total = sums[5];
+      // if (!this.discountFoucs) this.discount = Number(this.total * 100 / this.totalStand).toFixed(2);
+      return sums;
+    },
+
+  },
+};
+</script>
+<style scoped>
+@import '../../assets/css/global.css';
+@import '../../assets/css/global_font.css';
+
+::v-deep .el-input__inner {
+  /*text-align: center;*/
+  padding-left: 5px;
+  padding-right: 15px;
+}
+
+::v-deep .el-input__icon {
+  width: 15px;
+  /* 输入框下拉箭头或清除图标 默认 25 */
+}
+
+::v-deep .el-input-group__append {
+  padding: 0 5px;
+  /* 控件默认 0 20px;*/
+}
+
+::v-deep .el-icon-search:before {
+  color: #00F;
+}
+
+.query {
+  margin-left: 10px;
+  font-size: 14px;
+  color: #232748;
+  font-weight: 400;
+  font-family: "NotoSansSC-Regular";
+}
+
+.spanClass {
+  padding: 0 2px 0 0;
+}
+</style>
diff --git a/src/components/report/TurnoverReportP.vue b/src/components/report/TurnoverReportP.vue
new file mode 100644
index 0000000..16cd8fd
--- /dev/null
+++ b/src/components/report/TurnoverReportP.vue
@@ -0,0 +1,284 @@
+<template>
+  <div>
+    <div class="middlebox">
+      <div class="contenttitle">
+        体检查询 /
+        <span class="contenttitleBold">营业额统计（人员类别）</span>
+      </div>
+    </div>
+    <div
+      style="display: flex;justify-content: space-between; padding: 10px;background-color: #fff;border-radius: 8px;margin-bottom: 10px;">
+      <div style="display:block;">
+        <div style="display: flex;flex-wrap: wrap;height: 32px;align-items: center;">
+          <div class="query">
+            <el-select v-model="query.dateType" placeholder="请选择" style="width: 80px" size="small">
+              <el-option label="登记日期" :value="'1'" />
+              <el-option label="体检日期" :value="'2'" />
+              <el-option label="总检日期" :value="'3'" />
+              <el-option label="收费日期" :value="'6'" />
+            </el-select>
+            <!-- dateType  1 登记，2 体检，3 总检日期-->
+            <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small" style="width:90px;"
+              value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+            <span class="spanClass">至</span>
+            <el-date-picker v-model="query.endDate" type="date" placeholder="截止日期" size="small" style="width:90px;"
+              value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+          </div>
+          <div class="query">
+            <span class="spanClass">体检单位</span>
+            <el-select v-model="query.personnelTypeIds" placeholder="请选择体检单位" :filter-method="filterMethod"
+              default-first-option clearable filterable style="margin-left: 10px" size="small" multiple collapse-tags>
+              <el-option v-for="item in personnelType" :key="item.id" :label="item.displayName" :value="item.id">
+                {{ item.displayName }}
+              </el-option>
+            </el-select>
+          </div>
+          <div class="query">
+            <span class="spanClass">是否包含预登记</span>
+            <el-checkbox v-model="query.isPreRegistration" true-label="Y" false-label="N" />
+          </div>
+        </div>
+      </div>
+      <div>
+        <el-button type="primary" class="commonbutton" @click="btnQuery" size="small">查询</el-button>       
+        <el-button class="commonbutton" @click="btnExport('tableData')" size="small">导出</el-button>          
+      </div>
+    </div>
+    <div id="tableData">
+      <el-table :data="tableData" border :height="window.pageHeight - 160" highlight-current-row 
+        size="small" row-key="id" :summary-method="getSummaries" show-summary ref="refTable">
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="personnelTypeName" label="人员类别" min-width="150" />
+        <el-table-column prop="registerCount" label="登记人数" min-width="80" align="center" />
+        <el-table-column prop="checkCount" label="检查人数" min-width="80" align="center" />
+        <el-table-column prop="avgStandardPrice" label="标准平均单价" min-width="100" align="center" />
+        <el-table-column prop="avgChargePrice" label="应收平均单价" min-width="100" align="center" />
+        <el-table-column prop="sumStandardPrice" label="标准金额" min-width="100" align="center" />
+        <el-table-column prop="sumChargePrice" label="应收金额" min-width="100" align="center" />
+      </el-table>
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { deepCopy } from "../../utlis/proFunc"
+import CusOrgOCX from "./CusOrgOCX.vue"
+import moment from "moment";
+import FileSaver from 'file-saver';
+
+export default {
+  components: {
+    CusOrgOCX,
+  },
+  props: ["orgEnable"],
+  data() {
+    return {
+      dialogVisible: false,
+      local: {
+        completeFlag: []
+      },
+
+      //customerOrg: [],
+      personnelType: [],
+      query: {
+        dateType: '1',
+        startDate: '',
+        endDate: '',
+        //customerOrgIds: [],
+        personnelTypeIds:[],
+        // medicalTypeIds: [],
+        // isMedicalTypeId: 'Y',
+        isPreRegistration:'N'
+      },
+      tableData: [],
+
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+        shortcuts: [{
+          text: '今天',
+          onClick(picker) {
+            picker.$emit('pick', new Date());
+          }
+        }, {
+          text: '昨天',
+          onClick(picker) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24);
+            picker.$emit('pick', date);
+          }
+        }, {
+          text: '一周前',
+          onClick(picker) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', date);
+          }
+        }]
+      },
+
+    };
+  },
+
+  created() {
+
+  },
+
+  //挂载完成
+  mounted() {
+
+    this.dictInit()
+
+  },
+
+  updated() {
+    this.$nextTick(() => {
+      this.$refs['refTable'].doLayout()
+    })
+  },
+
+  computed: {
+    ...mapState(["window", "dict", "patientRegister", "report"]),
+  },
+  methods: {
+    //获取初始数据
+    dictInit() {
+      let today = moment(new Date()).format("YYYY-MM-DD")
+      this.query.startDate = today
+      this.query.endDate = today
+
+      //获取单位列表
+      // getapi("/api/app/customer-org/parent-all").then((res) => {
+      //   if (res.code != -1) {
+      //     this.customerOrgAll = res.data;
+      //     this.customerOrg = deepCopy(this.customerOrgAll);
+      //   }
+      // });
+   
+      //人员类别
+      getapi("/api/app/personnel-type/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.personnelType = res.data;
+          this.personnelType = res.data;
+        }
+      });
+    },
+
+    //通用导出
+    btnExport(elId) {
+      let table = document.getElementById(elId);
+      let tableData = table.innerHTML
+      let fileName = moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
+      let blob = new Blob([tableData], { type: "text/plain;charset=utf-8" });
+      FileSaver.saveAs(blob, fileName);
+    },
+
+    // 单位过滤
+    filterMethod(keyWords) {
+      if (keyWords) {
+        this.personnelType = [];
+        this.dict.personnelType.forEach((item) => {
+          if (
+            item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
+            // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+          ) {
+            this.personnelType.push(item);
+          }
+        });
+      } else {
+        this.personnelType = deepCopy(this.dict.personnelType);
+      }
+    },
+
+    // 查询
+    btnQuery() {
+
+      postapi("/api/app/CustomerReport/GetPersonnelTypePhysicalExaminationStatistics", this.query).then(res => {
+        if (res.code > -1) {
+          this.tableData = res.data
+        }
+      })
+    },
+
+    //合计
+    getSummaries(param) {
+      console.log('getSummaries param',param)
+      // if(!param){
+      //   param = {
+      //     columns:[{}, {}, {}, {}, {}, {}, {property: 'asbitemMoney'},{property: 'customerOrgGroupDetailMoney'}],
+      //     data:this.customerOrgGroupAsbitems
+      //   }
+      // }
+     
+      const { columns, data } = param;
+      const sumCol = [2,3,6, 7]  //需合计的列
+      const sums = [];
+      columns.forEach((column, index) => {
+        //console.log('column, index,data',column, index,data)
+        //显示合计列
+        if (index === 1) {
+          sums[index] = '合计';
+          return;
+        }
+
+        //不合计的列
+        if (sumCol.indexOf(index) == -1) {
+          sums[index] = '';
+          return;
+        }
+
+        sums[index] = 0
+        data.forEach(e => {
+          if (!isNaN(e[column.property])) sums[index] += Number(e[column.property])// * e['amount']
+        })
+        sums[index] = sums[index].toFixed(2) //+ ' 元';
+
+      });
+      // this.groupPrice = sums[7];
+      // console.log('getSummaries',sums)
+      // if (!this.totalFoucs) this.total = sums[5];
+      // if (!this.discountFoucs) this.discount = Number(this.total * 100 / this.totalStand).toFixed(2);
+      return sums;
+    },
+
+  },
+};
+</script>
+<style scoped>
+@import '../../assets/css/global.css';
+@import '../../assets/css/global_font.css';
+
+::v-deep .el-input__inner {
+  /*text-align: center;*/
+  padding-left: 5px;
+  padding-right: 15px;
+}
+
+::v-deep .el-input__icon {
+  width: 15px;
+  /* 输入框下拉箭头或清除图标 默认 25 */
+}
+
+::v-deep .el-input-group__append {
+  padding: 0 5px;
+  /* 控件默认 0 20px;*/
+}
+
+::v-deep .el-icon-search:before {
+  color: #00F;
+}
+
+.query {
+  margin-left: 10px;
+  font-size: 14px;
+  color: #232748;
+  font-weight: 400;
+  font-family: "NotoSansSC-Regular";
+}
+
+.spanClass {
+  padding: 0 2px 0 0;
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index c652369..5894083 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -541,10 +541,22 @@ const routes = [{
             },
             {
                 path: "/TurnoverReport",
-                name: "营业额统计",
+                name: "营业额统计（单位）",
                 component: () =>
                     import ("../components/report/TurnoverReport.vue"),
             },
+            {
+                path: "/TurnoverReportM",
+                name: "营业额统计（体检类别）",
+                component: () =>
+                    import ("../components/report/TurnoverReportM.vue"),
+            },
+            {
+                path: "/TurnoverReportP",
+                name: "营业额统计（人员类别）",
+                component: () =>
+                    import ("../components/report/TurnoverReportP.vue"),
+            },
             {
                 path: "/AppointQuery",
                 name: "网上预约汇总",
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index 8f3cdc8..b7502e6 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -285,7 +285,7 @@
 
                   <!-- 互斥组合项目 -->
                   <el-tab-pane label="互斥组合项目" name="3">
-                    <HcAsbitem :asbitemId="curRow.id" />
+                    <HcAsbitem :asbitemId="curRow.id" :HcAsbitemBrush="HcAsbitemBrush"/>
                   </el-tab-pane>
                 </el-tabs>
               </div>
@@ -1099,7 +1099,7 @@ export default {
           displayName: "不打印",
         },
       ],      
-      
+      HcAsbitemBrush:0, // 互斥项目刷新
     };
   },
   created() {
@@ -2065,6 +2065,7 @@ export default {
       });
       this.getobtainguidance(this.curRow.id);
       this.publicapi();
+      this.HcAsbitemBrush++
     },
     getSummaries(param) {
       const { columns, data } = param;