diff --git a/src/assets/css/global.css b/src/assets/css/global.css
index a281251..b847969 100644
--- a/src/assets/css/global.css
+++ b/src/assets/css/global.css
@@ -147,7 +147,6 @@
 
 
 /* el-cascader 隐藏前面的radio并点击行选中 */
-
 .example .el-cascader-panel .el-radio {
     width: 100%;
     height: 100%;
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 89b94d2..dfa2ec9 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -587,7 +587,7 @@
         :append-to-body="true">
         <div style="height: 320px;">
           <el-cascader v-model="form.customerOrgId" :options="patientRegister.customerOrgTreeAll" style="width:400px;"
-            filterable popper-class="example" :show-all-levels="false"
+            filterable popper-class="example" :show-all-levels="false" 
             :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }" size="small">
           </el-cascader>
         </div>
@@ -1197,20 +1197,22 @@ export default {
         customerOrgParentId = v[0]
       } else {
         customerOrgId = v  // 后台顶级单位ID未获取正确（再获取一次）
-        let pids = getTreePids(this.patientRegister.customerOrgTreeAll, "treeChildren", "parentId", "id", customerOrgId)
-        if (Array.isArray(pids) && pids.length > 0) {
-          if (pids.length == 1) {
-            customerOrgParentId = customerOrgId
-          } else {
-            customerOrgParentId = pids[1]
-          }
-        }
+        customerOrgParentId = await this.getParentCustomerOrgId(customerOrgId)
+        // let pids = getTreePids(this.patientRegister.customerOrgTreeAll, "treeChildren", "parentId", "id", customerOrgId)
+        // if (Array.isArray(pids) && pids.length > 0) {
+        //   if (pids.length == 1) {
+        //     customerOrgParentId = customerOrgId
+        //   } else {
+        //     customerOrgParentId = pids[1]
+        //   }
+        // }
       }
       this.preCustomerOrgId = customerOrgId
-      // let customerOrgParentId = await this.getParentCustomerOrgId(customerOrgId)
+      
 
       if (customerOrgParentId) {
         if (customerOrgParentId == this.dict.personOrgId) {
+          // 个人体检则 固定单位体检次数
           this.form.customerOrgRegisterId = "00000000-0000-0000-0000-000000000001"
         } else {
           // 获取体检次数字典库
diff --git a/src/components/report/NationHealthReport.vue b/src/components/report/NationHealthReport.vue
new file mode 100644
index 0000000..c5c3761
--- /dev/null
+++ b/src/components/report/NationHealthReport.vue
@@ -0,0 +1,250 @@
+<template>
+  <div>
+    <div style="display: flex;padding: 10px;background-color: #fff;border-radius: 8px;margin-bottom: 10px;">
+      <div style="display:block;">
+        <div style="display: flex;flex-wrap: wrap;height: 80px;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-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.customerOrgIds" placeholder="请选择体检单位" :filter-method="filterMethod"
+              default-first-option clearable filterable style="margin-left: 10px" @change="changeCustomerOrg"
+              size="small" multiple collapse-tags>
+              <el-option v-for="item in customerOrg" :key="item.id" :label="item.displayName" :value="item.id">
+                {{ item.displayName }}
+              </el-option>
+            </el-select>
+          </div>
+          <div class="query">
+            <span class="spanClass">体检类别</span>
+            <el-select v-model="query.medicalTypeIds" placeholder="请选择" clearable filterable
+              style="width: 200px" size="small" multiple collapse-tags>
+              <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName" :value="item.id" />
+            </el-select>
+          </div>
+          <div class="query">
+            <span class="spanClass">包含未填体检类别人员</span>
+            <el-checkbox v-model="query.isMedicalTypeId" true-label="Y" false-label="N"/>            
+          </div>
+        </div>
+      </div>
+      <div>
+        <el-button type="primary" class="commonbutton" @click="btnQuery">查询</el-button>
+      </div>
+    </div>
+    <div>
+      <table>
+        <thead>
+          <th>序号</th>
+          <th>项目</th>
+          <th>数据</th>
+        </thead>
+        <tbody>
+          <tr>
+            <td>1</td>
+            <td>男(人次)</td>
+            <td>{{ nationHealthReportData.maleCount }}</td>
+          </tr>
+          <tr>
+            <td>2</td>           
+            <td>女(人次)</td>
+            <td>{{ nationHealthReportData.femaleCount }}</td>
+          </tr>
+          <tr>
+            <td>3</td>            
+            <td>总人次</td>
+            <td>{{ nationHealthReportData.sumCount }}</td>
+          </tr>
+          <tr>
+            <td>4</td>            
+            <td>理论金额(万元)</td>
+            <td>{{ nationHealthReportData.standardMoney }}</td>
+          </tr>
+          <tr>
+            <td>5</td>            
+            <td>应收金额(万元)</td>
+            <td>{{ nationHealthReportData.chargeMoney }}</td>
+          </tr>
+        </tbody>
+      </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"
+
+export default {
+  components: {
+    CusOrgOCX,
+  },
+  props: ["orgEnable"],
+  data() {
+    return {
+      dialogVisible: false,
+      local: {
+        completeFlag: []
+      },
+
+      customerOrg: [],
+      customerOrgAll: [],
+      query: {
+        dateType: '1',
+        startDate: '',
+        endDate: '',
+        customerOrgIds: [],
+        medicalTypeIds: [],
+        isMedicalTypeId: 'Y',
+      },
+
+      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);
+          }
+        }]
+      },
+
+      nationHealthReportData: {
+        maleCount: null,  //体检人数（男）
+        femaleCount: null, //体检人数（女）
+        sumCount: null, //体检总人数 
+        standardMoney: null, // 标准金额(万元)
+        chargeMoney: null // 应收金额(万元)
+      }
+    };
+  },
+
+  created() {
+
+  },
+
+  //挂载完成
+  mounted() {
+
+    this.dictInit()
+
+  },
+
+  computed: {
+    ...mapState(["window", "dict", "patientRegister", "report"]),
+  },
+  methods: {
+    //获取初始数据
+    dictInit() {
+      //获取单位列表
+      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;
+        }
+      });
+    },
+
+    // 单位过滤
+    filterMethod(keyWords) {
+      if (keyWords) {
+        this.customerOrg = [];
+        this.customerOrgAll.forEach((item) => {
+          if (
+            item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1 ||
+            item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
+            // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+          ) {
+            this.customerOrg.push(item);
+          }
+        });
+      } else {
+        this.customerOrg = deepCopy(this.customerOrgAll);
+      }
+    },
+
+    // 查询
+    btnQuery() {
+      postapi("/api/app/PeisReport/GetHealthStatistics", this.query).then(res => {
+        if (res.code > -1) {
+          res.data.standardMoney = Math.floor(res.data.standardMoney) / 10000
+          res.data.chargeMoney = Math.floor(res.data.chargeMoney) / 10000
+          this.nationHealthReportData = res.data
+        }
+      })
+    },
+
+
+  },
+};
+</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 194fb01..2336e3b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -457,6 +457,12 @@ const routes = [{
                 component: () =>
                     import ("../views/report/report.vue"),
             },
+            {
+                path: "/NationHealthReport",
+                name: "上报国家平台数据",
+                component: () =>
+                    import ("../components/report/NationHealthReport.vue"),
+            },            
             {
                 path: "/checkStatus",
                 name: "组合项目检查状态",
diff --git a/src/views/customerOrg/patientRegisterImport.vue b/src/views/customerOrg/patientRegisterImport.vue
index 54563d8..016c36e 100644
--- a/src/views/customerOrg/patientRegisterImport.vue
+++ b/src/views/customerOrg/patientRegisterImport.vue
@@ -174,7 +174,7 @@
           <div style="display: flex;margin:20px;">
             <div>
               <span>体检单位：</span>
-              <el-cascader v-model="customerOrgIds" :options="customerOrgTree" popper-class="example" style="width:260px;"
+              <el-cascader v-model="customerOrgIds" :options="customerOrgTreeFilter" popper-class="example" style="width:260px;"
                 @change="changeCustomerOrg" filterable :filter-method="filterMethod"
                 :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
                 :show-all-levels="true" size="small">
@@ -265,7 +265,7 @@
           </div>
           <div style="display: flex;margin:20px;">
             <span class="spanLeftClass">体检单位：</span>
-            <el-cascader v-model="query.customerOrgIds" :options="customerOrgTree" style="width:260px;"
+            <el-cascader v-model="query.customerOrgIds" :options="customerOrgTreeFilter" style="width:260px;"
               @change="changeQueryCustomerOrg" filterable :filter-method="filterMethod" popper-class="example"
               :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }" :show-all-levels="true"
               size="small">
@@ -452,7 +452,7 @@
               <el-radio v-model="newCustomerOrgFlag" :label="true">新单位或部门</el-radio>
             </div>
             <div style="margin-left:5px;" v-if="newCustomerOrgFlag">
-              <el-cascader v-model="customerOrgIds" :options="customerOrgTree" popper-class="example" style="width:260px;"
+              <el-cascader v-model="customerOrgIds" :options="customerOrgTreeFilter" popper-class="example" style="width:260px;"
                 @change="changeCustomerOrg" filterable :filter-method="filterMethod"
                 :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
                 :show-all-levels="true" size="small">
@@ -521,6 +521,7 @@ export default {
         privs: [] // 页面权限
       },
       customerOrgTree: [],
+      customerOrgTreeFilter: [],
       customerOrgIds: [], //选中单位节点
       customerOrgRegisterList: [], //体检次数列表
       customerOrgRegister: {}, //体检次数
@@ -723,17 +724,25 @@ export default {
       getapi("/api/app/customerorg/getbycodeall?IsHidePerson=1").then((res) => {
         // console.log("res.data", res.data);
         if (res.code != -1) {
-          this.customerOrgTree = res.data;
+          this.customerOrgTree = res.data;          
           let lfind = arrayExistObj(this.customerOrgTree, 'id', this.dict.personOrgId)
           if (lfind > -1) this.customerOrgTree.splice(lfind, 1)
           tcdate(this.customerOrgTree)
+          this.customerOrgTreeFilter = deepCopy(this.customerOrgTree)
         }
       });
     },
 
     //单位过滤 预留
-    filterMethod() {
-
+    filterMethod(v) {
+      if (v) {
+        let lv = v.toUpperCase()
+        this.customerOrgTreeFilter = this.customerOrgTree.filter(e => {
+          return e.displayName.indexOf(lv) > -1 || e.simpleCode.indexOf(lv) > -1
+        })
+      } else {
+        this.customerOrgTreeFilter = deepCopy(this.customerOrgTree)
+      }
     },
 
     //选择单位