From deda1a6a4ad02d1335487646e75a77526798fa77 Mon Sep 17 00:00:00 2001
From: luobinjie <lbj123>
Date: Wed, 26 Nov 2025 15:57:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerReport/diseaseStatistics.vue      | 228 +++++---
 .../customerReport/positiveResultsList.vue    |  28 +-
 .../doctorCheck/unitphysicalexamination.vue   | 530 +++++++++++++-----
 3 files changed, 567 insertions(+), 219 deletions(-)

diff --git a/src/views/customerReport/diseaseStatistics.vue b/src/views/customerReport/diseaseStatistics.vue
index a14d3df..834aeb7 100644
--- a/src/views/customerReport/diseaseStatistics.vue
+++ b/src/views/customerReport/diseaseStatistics.vue
@@ -8,7 +8,8 @@
         </div>
       </div>
       <div :style="'display: block;'">
-        <div style="
+        <div
+          style="
             background-color: #fff;
             padding: 15px;
             border-radius: 8px;
@@ -17,28 +18,59 @@
             margin-bottom: 10px;
             height: 35px;
             margin-top: 7px;
-          ">
+          "
+        >
           <div class="query">
             <span class="spanClass">体检单位</span>
-            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width: 240px" size="small"
-              disabled>
-              <el-button slot="append" icon="el-icon-search" @click="diagnosis.dialogCusOrgOCX = true"
-                style="font-size: 20px"></el-button>
+            <el-input
+              placeholder="请选择体检单位"
+              v-model="patientRegister.query.cusOrgOCX"
+              style="width: 240px"
+              size="small"
+              disabled
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-search"
+                @click="diagnosis.dialogCusOrgOCX = true"
+                style="font-size: 20px"
+              ></el-button>
             </el-input>
           </div>
           <div class="query">
             <span class="spanClass">诊断</span>
-            <el-input placeholder="请选择诊断" v-model="patientRegister.query.StatisticsOCX" style="width: 200px"
-              size="small" disabled>
-              <el-button slot="append" icon="el-icon-search" @click="diagnosis.dialogAsbitemOCX = true"
-                style="font-size: 20px"></el-button>
+            <el-input
+              placeholder="请选择诊断"
+              v-model="patientRegister.query.StatisticsOCX"
+              style="width: 200px"
+              size="small"
+              disabled
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-search"
+                @click="diagnosis.dialogAsbitemOCX = true"
+                style="font-size: 20px"
+              ></el-button>
             </el-input>
           </div>
           <div class="query">
             <span class="spanClass">状态</span>
-            <el-select v-model="patientRegister.query.completeFlags" placeholder="请选择" clearable style="width: 150px"
-              size="small" multiple collapse-tags>
-              <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
+            <el-select
+              v-model="patientRegister.query.completeFlags"
+              placeholder="请选择"
+              clearable
+              style="width: 150px"
+              size="small"
+              multiple
+              collapse-tags
+            >
+              <el-option
+                v-for="item in dict.completeFlag"
+                :key="item.id"
+                :label="item.displayName"
+                :value="item.id"
+              >
               </el-option>
             </el-select>
           </div>
@@ -56,65 +88,108 @@
             <span>分类统计</span>
           </div> -->
           <div class="query">
-            <el-button @click="btnQuery" size="small" class="commonbutton">查询</el-button>
+            <el-button @click="btnQuery" size="small" class="commonbutton"
+              >查询</el-button
+            >
           </div>
           <div class="query">
-            <el-button @click="handleExport" size="small" class="commonbutton">导出excel</el-button>
+            <el-button @click="handleExport" size="small" class="commonbutton"
+              >导出excel</el-button
+            >
           </div>
           <div class="query">
-            <el-button @click="onPrint" size="small" class="commonbutton">打印</el-button>
+            <el-button @click="onPrint" size="small" class="commonbutton"
+              >打印</el-button
+            >
           </div>
           <div class="query">
-            <el-button @click="columnarChart" size="small" class="commonbutton">柱状图</el-button>
+            <el-button @click="columnarChart" size="small" class="commonbutton"
+              >柱状图</el-button
+            >
           </div>
           <div class="query">
-            <el-button @click="peiChart" size="small" class="commonbutton">饼图</el-button>
+            <el-button @click="peiChart" size="small" class="commonbutton"
+              >饼图</el-button
+            >
           </div>
         </div>
-        <div style="
+        <div
+          style="
             display: flex;
             justify-content: space-between;
             position: relative;
-          " id="domTable">
-          <div style="
+          "
+          id="domTable"
+        >
+          <div
+            style="
               width: 47.7%;
               background-color: #fff;
               padding: 15px;
               border-radius: 8px;
-            " ref="imageDom">
-            <el-table :data="dataList" border width="45%" :height="flag
-              ? window.pageHeight < 600
-                ? 415
-                : window.pageHeight - 185 - 20
-              : ''
-              " row-key="id" highlight-current-row ref="dataList" id="table" :row-class-name="tableRowClassName"
-              show-summary :summary-method="getSummaries">
-              <el-table-column prop="diagnosisName" label="疾病" />
-              <el-table-column prop="patientCount" label="人数" />
-              <el-table-column prop="percentage" label="人员占比" >
-                <template slot-scope="scope">
-                  {{ scope.row.percentage + '%' }}
-                </template>
+            "
+            ref="imageDom"
+          >
+            <el-table
+              :data="dataList"
+              border
+              width="45%"
+              :height="
+                flag
+                  ? window.pageHeight < 600
+                    ? 415
+                    : window.pageHeight - 185 - 20
+                  : ''
+              "
+              row-key="id"
+              highlight-current-row
+              ref="dataList"
+              id="table"
+              :row-class-name="tableRowClassName"
+              show-summary
+              :summary-method="getSummaries"
+            >
+              <el-table-column
+                :label="`开始时间： ${summary.startDate || ''} 结束时间：${
+                  summary.endDate || ''
+                } 男性： ${summary.maleCount} 女性： ${summary.femaleCount}`"
+                align="left"
+              >
+                <el-table-column prop="diagnosisName" label="疾病" />
+                <el-table-column prop="patientCount" label="人数" />
+                <el-table-column prop="percentage" label="人员占比">
+                  <template slot-scope="scope">
+                    {{ scope.row.percentage + "%" }}
+                  </template>
+                </el-table-column>
               </el-table-column>
             </el-table>
           </div>
-          <div :style="'width: 47.7%;overflow: hidden;height:' +
-            (window.pageHeight < 600 ? 415 : window.pageHeight - 185 - 20) +
-            'px;background-color: #fff; padding: 15px; border-radius: 8px;'
-            ">
-            <div style="
+          <div
+            :style="
+              'width: 47.7%;overflow: hidden;height:' +
+              (window.pageHeight < 600 ? 415 : window.pageHeight - 185 - 20) +
+              'px;background-color: #fff; padding: 15px; border-radius: 8px;'
+            "
+          >
+            <div
+              style="
                 font-size: 20px;
                 font-weight: 700;
                 color: #232748;
                 font-family: 'NotoSansSC-Bold';
                 text-align: center;
-              ">
+              "
+            >
               疾病人数统计
             </div>
-            <div :style="'height:' +
-              (window.pageHeight < 600 ? 387 : window.pageHeight - 185 - 48) +
-              'px;'
-              ">
+            <div
+              :style="
+                'height:' +
+                (window.pageHeight < 600 ? 387 : window.pageHeight - 185 - 48) +
+                'px;'
+              "
+            >
               <ChartBlock ref="chart2"></ChartBlock>
             </div>
           </div>
@@ -122,13 +197,23 @@
       </div>
     </div>
     <!--通用选单位、体检次数、分组的控件-->
-    <el-dialog title="体检单位选择" :visible.sync="diagnosis.dialogCusOrgOCX" :close-on-click-modal="false" width="880px"
-      height="600px">
+    <el-dialog
+      title="体检单位选择"
+      :visible.sync="diagnosis.dialogCusOrgOCX"
+      :close-on-click-modal="false"
+      width="880px"
+      height="600px"
+    >
       <CusOrgOCX :initDateType="'creationTime'" :useCustomerOrg="true" />
     </el-dialog>
     <!--通用选组合项目的控件-->
-    <el-dialog title="诊断选择" :visible.sync="diagnosis.dialogAsbitemOCX" :close-on-click-modal="false" width="700px"
-      height="600px">
+    <el-dialog
+      title="诊断选择"
+      :visible.sync="diagnosis.dialogAsbitemOCX"
+      :close-on-click-modal="false"
+      width="700px"
+      height="600px"
+    >
       <StatisticsOCX />
     </el-dialog>
   </div>
@@ -165,6 +250,12 @@ export default {
       yAxisData: [],
       pieData: [],
       flag: true,
+      summary: {
+        startDate: "",
+        endDate: "",
+        femaleCount: "",
+        maleCount: "",
+      },
     };
   },
 
@@ -223,7 +314,6 @@ export default {
           this.dict.asbItemAll = res.data;
         }
       });
-
     },
     getSummaries(param) {
       const { columns, data } = param;
@@ -297,8 +387,8 @@ page-break-before: avoid;}}`, // 去除页眉页脚
               e.dateType == "summaryDate"
                 ? "3"
                 : e.dateType == "medicalStartDate"
-                  ? "2"
-                  : "1",
+                ? "2"
+                : "1",
           };
 
           if (e.customerOrgId) {
@@ -321,14 +411,16 @@ page-break-before: avoid;}}`, // 去除页眉页脚
         });
       }
 
-      
-
       body.customerOrgs = customerOrgs;
       body.diagnosisIds = diagnosisIds;
-      if(this.patientRegister.query.completeFlags && Array.isArray(this.patientRegister.query.completeFlags) && this.patientRegister.query.completeFlags.length > 0){
-        body.completeFlags = this.patientRegister.query.completeFlags
-      }else{
-        delete body['completeFlags']
+      if (
+        this.patientRegister.query.completeFlags &&
+        Array.isArray(this.patientRegister.query.completeFlags) &&
+        this.patientRegister.query.completeFlags.length > 0
+      ) {
+        body.completeFlags = this.patientRegister.query.completeFlags;
+      } else {
+        delete body["completeFlags"];
       }
 
       // if (this.patientRegister.query.isCharge) body.isCharge = this.patientRegister.query.isCharge
@@ -338,24 +430,28 @@ page-break-before: avoid;}}`, // 去除页眉页脚
       postapi("/api/customerreport/getdiseasecountstatisticsreport", body).then(
         (res) => {
           if (res.code != -1) {
-            this.dataList = res.data;
+            this.dataList = res.data.details;
+            this.summary.startDate = res.data.startDate;
+            this.summary.endDate = res.data.endDate;
+            this.summary.femaleCount = res.data.femaleCount;
+            this.summary.maleCount = res.data.maleCount;
             this.yAxisData = [];
             this.seriesData = [];
-            this.pieData = []
+            this.pieData = [];
             let pies = {
               name: "",
               value: 0,
             };
             for (
               let i = 0;
-              i < (res.data.length > 10 ? 10 : res.data.length);
+              i < (this.dataList.length > 10 ? 10 : this.dataList.length);
               i++
             ) {
               let pie = JSON.parse(JSON.stringify(pies));
-              this.yAxisData.push(res.data[i].diagnosisName);
-              this.seriesData.push(res.data[i].patientCount);
-              pie.name = res.data[i].diagnosisName;
-              pie.value = res.data[i].patientCount;
+              this.yAxisData.push(this.dataList[i].diagnosisName);
+              this.seriesData.push(this.dataList[i].patientCount);
+              pie.name = this.dataList[i].diagnosisName;
+              pie.value = this.dataList[i].patientCount;
               this.pieData.push(pie);
             }
             this.columnarChart();
@@ -512,7 +608,7 @@ page-break-before: avoid;}}`, // 去除页眉页脚
 }
 
 ::v-deep .el-icon-search:before {
-  color: #00F;
+  color: #00f;
 }
 
 .query:last-child {
diff --git a/src/views/customerReport/positiveResultsList.vue b/src/views/customerReport/positiveResultsList.vue
index d3ef06a..32774de 100644
--- a/src/views/customerReport/positiveResultsList.vue
+++ b/src/views/customerReport/positiveResultsList.vue
@@ -114,7 +114,8 @@
               :summary-method="getSummaries"
             >
               <el-table-column label="阳性结果人员清单">
-                  <template slot-scope="scope">
+                <el-table-column :label="`开始时间： ${summary.startDate || ''} 结束时间：${summary.endDate || ''} 男性： ${summary.maleCount} 女性： ${summary.femaleCount}`" align="left">
+                                    <template slot-scope="scope">
                     <el-table
                       :data="scope.row.patientRegisters"
                       border
@@ -157,6 +158,7 @@
                       </el-table-column>
                     </el-table>
                   </template>
+                </el-table-column>
               </el-table-column>
             </el-table>
           </div>
@@ -177,7 +179,8 @@
               :summary-method="getSummaris"
             >
               <el-table-column label="阳性结果人员清单">
-                <el-table-column
+                <el-table-column :label="`开始时间： ${summary.startDate || ''} 结束时间：${summary.endDate || ''} 男性： ${summary.maleCount} 女性： ${summary.femaleCount}`" align="left">
+                                  <el-table-column
                   prop="diagnosisName"
                   label="诊断名称"
                 ></el-table-column>
@@ -191,6 +194,7 @@
                 ></el-table-column>
                 <el-table-column prop="percentage" label="占百分比">
                 </el-table-column>
+                </el-table-column>
               </el-table-column>
             </el-table>
           </div>
@@ -251,6 +255,12 @@ export default {
       mergedColumnes: ["departmentName"],
       spanMaps: {},
       flag: true,
+      summary:{
+        startDate:"",
+        endDate:"",
+        femaleCount:"",
+        maleCount:""
+      }
     };
   },
 
@@ -494,7 +504,11 @@ export default {
           body
         ).then((res) => {
           if (res.code != -1) {
-            this.ForwardRanking(res.data)
+            this.ForwardRanking(res.data.details)
+            this.summary.startDate=res.data.startDate;
+          this.summary.endDate=res.data.endDate;
+          this.summary.femaleCount=res.data.femaleCount;
+          this.summary.maleCount=res.data.maleCount;
             this.$nextTick(() => {
           this.$refs.projectTableData.doLayout();
         });
@@ -506,7 +520,11 @@ export default {
           body
         ).then((res) => {
           if (res.code != -1) {
-            this.dataLists = res.data;
+            this.dataLists = res.data.details;
+            this.summary.startDate=res.data.startDate;
+          this.summary.endDate=res.data.endDate;
+          this.summary.femaleCount=res.data.femaleCount;
+          this.summary.maleCount=res.data.maleCount;
             this.$nextTick(() => {
           this.$refs.standardTableData.doLayout();
         });
@@ -550,7 +568,7 @@ page-break-before: avoid;}}`, // 去除页眉页脚
     },
     handleExport() {
       if (this.format == 0) {
-                let index = 2;
+                let index = 3;
         let list = [];
         list.push(index);
         for (let i = 0; i < this.dataList.length - 1; i++) {
diff --git a/src/views/doctorCheck/unitphysicalexamination.vue b/src/views/doctorCheck/unitphysicalexamination.vue
index d578a91..5f52743 100644
--- a/src/views/doctorCheck/unitphysicalexamination.vue
+++ b/src/views/doctorCheck/unitphysicalexamination.vue
@@ -8,7 +8,8 @@
         </div>
       </div>
       <div :style="'display: block;'">
-        <div style="
+        <div
+          style="
             background-color: #fff;
             padding: 15px;
             border-radius: 8px;
@@ -17,104 +18,223 @@
             margin-bottom: 10px;
             height: 35px;
             margin-top: 7px;
-          ">
+          "
+        >
           <div class="query">
             <span>体检单位：</span>
-            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width: 240px" size="small"
-              disabled>
-              <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
-                style="font-size: 20px"></el-button>
+            <el-input
+              placeholder="请选择体检单位"
+              v-model="patientRegister.query.cusOrgOCX"
+              style="width: 240px"
+              size="small"
+              disabled
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-search"
+                @click="report.dialogCusOrgOCX = true"
+                style="font-size: 20px"
+              ></el-button>
             </el-input>
           </div>
           <div class="query">
             <span>报表格式：</span>
-            <el-select v-model="format" placeholder="请选择" style="width: 80px" @change="changeValue" size="small">
+            <el-select
+              v-model="format"
+              placeholder="请选择"
+              style="width: 80px"
+              @change="changeValue"
+              size="small"
+            >
               <el-option label="标准格式" value="0" />
               <el-option label="精简格式" value="1" />
               <el-option label="Word格式" value="2" />
             </el-select>
           </div>
           <div class="query">
-            <el-button @click="btnQuery" size="small" class="commonbutton">查询</el-button>
+            <el-button @click="btnQuery" size="small" class="commonbutton"
+              >查询</el-button
+            >
           </div>
           <div class="query">
-            <el-button size="small" class="commonbutton" :disabled="format == 2" @click="handleExport">导出excel</el-button>
+            <el-button
+              size="small"
+              class="commonbutton"
+              :disabled="format == 2"
+              @click="handleExport"
+              >导出excel</el-button
+            >
           </div>
           <div class="query">
-            <el-button size="small" class="commonbutton" :disabled="format == 2" @click="onPrint">打印</el-button>
+            <el-button
+              size="small"
+              class="commonbutton"
+              :disabled="format == 2"
+              @click="onPrint"
+              >打印</el-button
+            >
           </div>
         </div>
         <div v-show="format == 0" ref="imageDom0">
-          <div style="background-color: #fff; padding: 15px; border-radius: 8px">
-            <el-table border :height="flag
-                ? window.pageHeight < 600
-                  ? 415
-                  : window.pageHeight - 185 - 20
-                : ''
-              " :data="tableData" id="standardTableData" ref="standardTableData" style="width: 100%"
-              :header-cell-class-name="headerStyle">
+          <div
+            style="background-color: #fff; padding: 15px; border-radius: 8px"
+          >
+            <el-table
+              border
+              :height="
+                flag
+                  ? window.pageHeight < 600
+                    ? 415
+                    : window.pageHeight - 185 - 20
+                  : ''
+              "
+              :data="tableData"
+              id="standardTableData"
+              ref="standardTableData"
+              style="width: 100%"
+              :header-cell-class-name="headerStyle"
+            >
               <el-table-column :label="reportTitle">
-                <el-table-column :label="`单位： ${customerOrgName||''} 体检次数 ${medicalTimes||''} 开始月份： ${startMonth||''} 结束月份： ${endMonth||''}`">
+                <el-table-column
+                  :label="`单位： ${customerOrgName || ''} 体检次数 ${
+                    medicalTimes || ''
+                  } 开始月份： ${startMonth || ''} 结束月份： ${
+                    endMonth || ''
+                  }`"
+                >
                   <template slot-scope="scope">
-                    <el-table :data="scope.row.patientRegisterPositiveReports.details" border show-summary
-                      :summary-method="summarizeRegisterCounts" :header-cell-class-name="headerStyle">
+                    <el-table
+                      :data="scope.row.patientRegisterPositiveReports.details"
+                      border
+                      show-summary
+                      :summary-method="summarizeRegisterCounts"
+                      :header-cell-class-name="headerStyle"
+                    >
                       <el-table-column label="人员阳性结果清单">
-                        <el-table-column :label="`${startDate||''}
+                        <el-table-column
+                          :label="`${
+                            scope.row.patientRegisterPositiveReports
+                              .startDate || ''
+                          }
                           至
-                          ${endDate||''}
-                          体检人员共计：
-                          ${sumMedicalNumber|| ''}
-                          其中男：
-                          ${maleMedicalNumber}
-                          女：
-                          ${femaleMedicalNumber} 
-                          其他：
-                          ${otherMedicalNumber}
-                          `">
-                          <el-table-column prop="patientNo" label="档案号" width="120" />
-                          <el-table-column prop="patientName" label="姓名" width="120" />
-                          <el-table-column prop="sexName" label="性别" width="50" />
+                          ${
+                            scope.row.patientRegisterPositiveReports.endDate ||
+                            ''
+                          }
+                          男性：
+                          ${scope.row.patientRegisterPositiveReports.maleCount}
+                          女性：
+                          ${
+                            scope.row.patientRegisterPositiveReports.femaleCount
+                          } 
+                          `"
+                        >
+                          <el-table-column
+                            prop="patientNo"
+                            label="档案号"
+                            width="120"
+                          />
+                          <el-table-column
+                            prop="patientName"
+                            label="姓名"
+                            width="120"
+                          />
+                          <el-table-column
+                            prop="sexName"
+                            label="性别"
+                            width="50"
+                          />
                           <el-table-column prop="age" label="年龄" width="80" />
-                          <el-table-column prop="medicalTimes" label="次数" width="50" />
-                          <el-table-column prop="mobileTelephone" label="手机号码" width="120" />
-                          <el-table-column prop="diagnosisNames" label="诊断名称" />
+                          <el-table-column
+                            prop="medicalTimes"
+                            label="次数"
+                            width="50"
+                          />
+                          <el-table-column
+                            prop="mobileTelephone"
+                            label="手机号码"
+                            width="120"
+                          />
+                          <el-table-column
+                            prop="diagnosisNames"
+                            label="诊断名称"
+                          />
                         </el-table-column>
                       </el-table-column>
                     </el-table>
 
-                    <el-table :data="scope.row.positivePatientRegisterReportStandards" border
-                      :header-cell-class-name="headerStyle" style="margin-top: 15px">
+                    <el-table
+                      :data="
+                        scope.row.positivePatientRegisterReportStandards.details
+                      "
+                      border
+                      :header-cell-class-name="headerStyle"
+                      style="margin-top: 15px"
+                    >
                       <el-table-column label="阳性结果人员清单">
-                        <el-table-column :label="`${startDate||''}
+                        <el-table-column
+                          :label="`${
+                            scope.row.patientRegisterPositiveReports
+                              .startDate || ''
+                          }
                           至
-                          ${endDate||''}
-                          体检人员共计：
-                          ${sumMedicalNumber}
-                          其中男：
-                          ${maleMedicalNumber}
-                          女：
-                          ${femaleMedicalNumber} 
-                          其他：
-                          ${otherMedicalNumber}
-                          `">
+                          ${
+                            scope.row.patientRegisterPositiveReports.endDate ||
+                            ''
+                          }
+                          男性：
+                          ${scope.row.patientRegisterPositiveReports.maleCount}
+                          女性：
+                          ${
+                            scope.row.patientRegisterPositiveReports.femaleCount
+                          } 
+                          `"
+                        >
                           <template slot-scope="scopes">
-                            <el-table :data="scopes.row.patientRegisters" border show-summary
-                              :summary-method="summarizeRegisterCounts">
-                              <el-table-column :label="scopes.row.diagnosisName">
-                                <el-table-column label="部门名称" prop="departmentName"></el-table-column>
-                                <el-table-column label="姓名" prop="patientName"></el-table-column>
-                                <el-table-column label="性别" prop="sexName"></el-table-column>
+                            <el-table
+                              :data="scopes.row.patientRegisters"
+                              border
+                              show-summary
+                              :summary-method="summarizeRegisterCounts"
+                            >
+                              <el-table-column
+                                :label="scopes.row.diagnosisName"
+                              >
+                                <el-table-column
+                                  label="部门名称"
+                                  prop="departmentName"
+                                ></el-table-column>
+                                <el-table-column
+                                  label="姓名"
+                                  prop="patientName"
+                                ></el-table-column>
+                                <el-table-column
+                                  label="性别"
+                                  prop="sexName"
+                                ></el-table-column>
                                 <el-table-column prop="age" label="年龄">
                                 </el-table-column>
-                                <el-table-column prop="patientRegisterNo" label="条码号">
+                                <el-table-column
+                                  prop="patientRegisterNo"
+                                  label="条码号"
+                                >
                                 </el-table-column>
-                                <el-table-column prop="patientNo" label="档案号">
+                                <el-table-column
+                                  prop="patientNo"
+                                  label="档案号"
+                                >
                                 </el-table-column>
-                                <el-table-column prop="medicalTimes" label="体检次数">
+                                <el-table-column
+                                  prop="medicalTimes"
+                                  label="体检次数"
+                                >
                                 </el-table-column>
                                 <el-table-column prop="telephone" label="电话">
                                 </el-table-column>
-                                <el-table-column prop="mobileTelephone" label="手机号">
+                                <el-table-column
+                                  prop="mobileTelephone"
+                                  label="手机号"
+                                >
                                 </el-table-column>
                               </el-table-column>
                             </el-table>
@@ -123,26 +243,41 @@
                       </el-table-column>
                     </el-table>
 
-                    <el-table :data="scope.row.diseaseCountStatisticsReports" border :header-cell-class-name="headerStyle"
-                      show-summary :summary-method="summarizeRegisterCount" style="margin-top: 15px">
+                    <el-table
+                      :data="scope.row.diseaseCountStatisticsReports.details"
+                      border
+                      :header-cell-class-name="headerStyle"
+                      show-summary
+                      :summary-method="summarizeRegisterCount"
+                      style="margin-top: 15px"
+                    >
                       <el-table-column label="疾病人数统计">
-                        <el-table-column :label="`${startDate||''}
+                        <el-table-column
+                          :label="`${
+                            scope.row.patientRegisterPositiveReports
+                              .startDate || ''
+                          }
                           至
-                          ${endDate||''}
-                          体检人员共计：
-                          ${sumMedicalNumber}
-                          其中男：
-                          ${maleMedicalNumber}
-                          女：
-                          ${femaleMedicalNumber} 
-                          其他：
-                          ${otherMedicalNumber}
-                          `">
+                          ${
+                            scope.row.patientRegisterPositiveReports.endDate ||
+                            ''
+                          }
+                          男性：
+                          ${scope.row.patientRegisterPositiveReports.maleCount}
+                          女性：
+                          ${
+                            scope.row.patientRegisterPositiveReports.femaleCount
+                          } 
+                          `"
+                        >
                           <el-table-column label="序号" type="index">
                           </el-table-column>
                           <el-table-column prop="diagnosisName" label="疾病" />
                           <el-table-column prop="patientCount" label="人数" />
-                          <el-table-column prop="percentage" label="占总检人员百分比" />
+                          <el-table-column
+                            prop="percentage"
+                            label="占总检人员百分比"
+                          />
                         </el-table-column>
                       </el-table-column>
                     </el-table>
@@ -153,88 +288,169 @@
           </div>
         </div>
         <div v-show="format == 1" ref="imageDom1">
-          <div style="background-color: #fff; padding: 15px; border-radius: 8px">
-            <el-table border :height="flag
-                ? window.pageHeight < 600
-                  ? 415
-                  : window.pageHeight - 185 - 20
-                : ''
-              " :data="reducetableData" id="reducetableData" ref="reducetableData" style="width: 100%"
-              :header-cell-class-name="headerStyle">
+          <div
+            style="background-color: #fff; padding: 15px; border-radius: 8px"
+          >
+            <el-table
+              border
+              :height="
+                flag
+                  ? window.pageHeight < 600
+                    ? 415
+                    : window.pageHeight - 185 - 20
+                  : ''
+              "
+              :data="reducetableData"
+              id="reducetableData"
+              ref="reducetableData"
+              style="width: 100%"
+              :header-cell-class-name="headerStyle"
+            >
               <el-table-column :label="reducereportTitle">
-                <el-table-column :label="`单位： ${customerOrgName||''} 体检次数 ${medicalTimes||''} 开始月份： ${startMonth||''} 结束月份： ${endMonth||''}`">
+                <el-table-column
+                  :label="`单位： ${customerOrgName || ''} 体检次数 ${
+                    medicalTimes || ''
+                  } 开始月份： ${startMonth || ''} 结束月份： ${
+                    endMonth || ''
+                  }`"
+                >
                   <template slot-scope="scope">
-                    <el-table :data="scope.row.patientRegisterPositiveReports.details" border show-summary
-                      :summary-method="summarizeRegisterCounts" :header-cell-class-name="headerStyle">
+                    <el-table
+                      :data="scope.row.patientRegisterPositiveReports.details"
+                      border
+                      show-summary
+                      :summary-method="summarizeRegisterCounts"
+                      :header-cell-class-name="headerStyle"
+                    >
                       <el-table-column label="人员阳性结果清单">
-                        <el-table-column :label="`${reducestartDate||''}
+                        <el-table-column
+                          :label="`${
+                            scope.row.patientRegisterPositiveReports
+                              .startDate || ''
+                          }
                           至
-                          ${reduceendDate||''}
-                          体检人员共计：
-                          ${reducesumMedicalNumber} 
-                          其中男：
-                          ${reducemaleMedicalNumber} 
-                          女：
-                          ${reducefemaleMedicalNumber} 
-                          其他：
-                          ${reduceotherMedicalNumber}
-                          `">
-                          <el-table-column prop="patientNo" label="档案号" width="120" />
-                          <el-table-column prop="patientName" label="姓名" width="120" />
-                          <el-table-column prop="sexName" label="性别" width="50" />
+                          ${
+                            scope.row.patientRegisterPositiveReports.endDate ||
+                            ''
+                          }
+                          男性：
+                          ${scope.row.patientRegisterPositiveReports.maleCount}
+                          女性：
+                          ${
+                            scope.row.patientRegisterPositiveReports.femaleCount
+                          } 
+                          `"
+                        >
+                          <el-table-column
+                            prop="patientNo"
+                            label="档案号"
+                            width="120"
+                          />
+                          <el-table-column
+                            prop="patientName"
+                            label="姓名"
+                            width="120"
+                          />
+                          <el-table-column
+                            prop="sexName"
+                            label="性别"
+                            width="50"
+                          />
                           <el-table-column prop="age" label="年龄" width="80" />
-                          <el-table-column prop="medicalTimes" label="次数" width="50" />
-                          <el-table-column prop="mobileTelephone" label="手机号码" width="120" />
-                          <el-table-column prop="diagnosisNames" label="诊断名称" />
+                          <el-table-column
+                            prop="medicalTimes"
+                            label="次数"
+                            width="50"
+                          />
+                          <el-table-column
+                            prop="mobileTelephone"
+                            label="手机号码"
+                            width="120"
+                          />
+                          <el-table-column
+                            prop="diagnosisNames"
+                            label="诊断名称"
+                          />
                         </el-table-column>
                       </el-table-column>
                     </el-table>
 
-                    <el-table :data="scope.row.positivePatientRegisterReportReduces" border
-                      :header-cell-class-name="headerStyle" show-summary :summary-method="summarizeRegisterCount"
-                      style="margin-top: 15px">
+                    <el-table
+                      :data="
+                        scope.row.positivePatientRegisterReportReduces.details
+                      "
+                      border
+                      :header-cell-class-name="headerStyle"
+                      show-summary
+                      :summary-method="summarizeRegisterCount"
+                      style="margin-top: 15px"
+                    >
                       <el-table-column label="阳性结果人员清单">
-                        <el-table-column :label="`${reducestartDate||''}
+                        <el-table-column
+                          :label="`${
+                            scope.row.patientRegisterPositiveReports
+                              .startDate || ''
+                          }
                           至
-                          ${reduceendDate||''}
-                          体检人员共计：
-                          ${reducesumMedicalNumber} 
-                          其中男：
-                          ${reducemaleMedicalNumber} 
-                          女：
-                          ${reducefemaleMedicalNumber} 
-                          其他：
-                          ${reduceotherMedicalNumber}
-                          `">
+                          ${
+                            scope.row.patientRegisterPositiveReports.endDate ||
+                            ''
+                          }
+                          男性：
+                          ${scope.row.patientRegisterPositiveReports.maleCount}
+                          女性：
+                          ${
+                            scope.row.patientRegisterPositiveReports.femaleCount
+                          } 
+                          `"
+                        >
                           <el-table-column label="序号" type="index">
                           </el-table-column>
                           <el-table-column prop="diagnosisName" label="诊断" />
                           <el-table-column prop="patientCount" label="人数" />
-                          <el-table-column prop="percentage" label="占总检人员百分比" />
+                          <el-table-column
+                            prop="percentage"
+                            label="占总检人员百分比"
+                          />
                         </el-table-column>
                       </el-table-column>
                     </el-table>
 
-                    <el-table :data="scope.row.diseaseCountStatisticsReports" border :header-cell-class-name="headerStyle"
-                      show-summary :summary-method="summarizeRegisterCount" style="margin-top: 15px">
+                    <el-table
+                      :data="scope.row.diseaseCountStatisticsReports.details"
+                      border
+                      :header-cell-class-name="headerStyle"
+                      show-summary
+                      :summary-method="summarizeRegisterCount"
+                      style="margin-top: 15px"
+                    >
                       <el-table-column label="疾病人数统计">
-                        <el-table-column :label="`${reducestartDate||''}
+                        <el-table-column
+                          :label="`${
+                            scope.row.patientRegisterPositiveReports
+                              .startDate || ''
+                          }
                           至
-                          ${reduceendDate||''}
-                          体检人员共计：
-                          ${reducesumMedicalNumber} 
-                          其中男：
-                          ${reducemaleMedicalNumber} 
-                          女：
-                          ${reducefemaleMedicalNumber} 
-                          其他：
-                          ${reduceotherMedicalNumber}
-                          `">
+                          ${
+                            scope.row.patientRegisterPositiveReports.endDate ||
+                            ''
+                          }
+                          男性：
+                          ${scope.row.patientRegisterPositiveReports.maleCount}
+                          女性：
+                          ${
+                            scope.row.patientRegisterPositiveReports.femaleCount
+                          } 
+                          `"
+                        >
                           <el-table-column label="序号" type="index">
                           </el-table-column>
                           <el-table-column prop="diagnosisName" label="疾病" />
                           <el-table-column prop="patientCount" label="人数" />
-                          <el-table-column prop="percentage" label="占总检人员百分比" />
+                          <el-table-column
+                            prop="percentage"
+                            label="占总检人员百分比"
+                          />
                         </el-table-column>
                       </el-table-column>
                     </el-table>
@@ -245,11 +461,16 @@
           </div>
         </div>
         <div v-show="format == 2" ref="imageDom2">
-          <div style="background-color: #fff; padding: 15px; border-radius: 8px">
-            <div :style="'display: flex;justify-content: center;align-items: center;height:' +
-              (window.pageHeight < 600 ? 415 : window.pageHeight - 185 - 20) +
-              'px;'
-              ">
+          <div
+            style="background-color: #fff; padding: 15px; border-radius: 8px"
+          >
+            <div
+              :style="
+                'display: flex;justify-content: center;align-items: center;height:' +
+                (window.pageHeight < 600 ? 415 : window.pageHeight - 185 - 20) +
+                'px;'
+              "
+            >
               <div v-show="reportUrl == ''">无数据</div>
               <a :href="reportUrl" v-show="reportUrl != ''">
                 <el-button>下载Word报表</el-button>
@@ -260,9 +481,18 @@
       </div>
     </div>
     <!--通用选单位、体检次数、分组的控件-->
-    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" width="880px"
-      height="600px">
-      <CusOrgOCX :useCustomerOrg="true" :initDateType="'creationTime'" :isUnit="true" />
+    <el-dialog
+      title="体检单位选择"
+      :visible.sync="report.dialogCusOrgOCX"
+      :close-on-click-modal="false"
+      width="880px"
+      height="600px"
+    >
+      <CusOrgOCX
+        :useCustomerOrg="true"
+        :initDateType="'creationTime'"
+        :isUnit="true"
+      />
     </el-dialog>
   </div>
 </template>
@@ -342,8 +572,8 @@ export default {
               e.dateType == "summaryDate"
                 ? "3"
                 : e.dateType == "medicalStartDate"
-                  ? "2"
-                  : "1",
+                ? "2"
+                : "1",
           };
 
           if (e.customerOrgId) {
@@ -412,7 +642,9 @@ export default {
           body
         ).then((res) => {
           if (res.code != -1) {
-            const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig'))
+            const sysConfig = JSON.parse(
+              window.sessionStorage.getItem("sysConfig")
+            );
             this.reportUrl = sysConfig.apiurl + res.data.reportUrl;
           }
         });
@@ -483,16 +715,18 @@ export default {
         let index = 3;
         let list = [];
         list.push(index);
-        index += this.tableData[0].patientRegisterPositiveReports.length + 7;
+        index += this.tableData[0].patientRegisterPositiveReports.details.length + 7;
         list.push(index);
         for (
           let i = 0;
           i <
-          this.tableData[0].positivePatientRegisterReportStandards.length - 1;
+          this.tableData[0].positivePatientRegisterReportStandards.details
+            .length -
+            1;
           i++
         ) {
           index +=
-            this.tableData[0].positivePatientRegisterReportStandards[i]
+            this.tableData[0].positivePatientRegisterReportStandards.details[i]
               .patientRegisters.length + 4;
           list.push(index);
         }
@@ -595,9 +829,9 @@ page-break-before: avoid;}}`, // 去除页眉页脚
 }
 
 ::v-deep .el-icon-search:before {
-  color: #00F;
+  color: #00f;
 }
-.query:last-child{
+.query:last-child {
   margin-right: 0;
 }
 </style>
\ No newline at end of file