diff --git a/project/sass/apps/AppHealthReport/AppHealthReport.vue b/project/sass/apps/AppHealthReport/AppHealthReport.vue
new file mode 100644
index 00000000..4f430ca1
--- /dev/null
+++ b/project/sass/apps/AppHealthReport/AppHealthReport.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="AppHealthReport">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import List from './components/List.vue'
+  import Detail from './components/Detail.vue'
+
+  export default {
+    name: 'AppHealthReport',
+    label: '健康上报',
+
+    components: {
+      List,
+      Detail
+    },
+
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {}
+      }
+    },
+
+    methods: {
+      onChange (data) {
+        if (data.type === 'Detail') {
+          this.component = 'Detail'
+          this.isShowDetail = true
+          this.params = data.params
+        }
+
+        if (data.type === 'list') {
+          this.component = 'List'
+          this.params = data.params
+
+          this.$nextTick(() => {
+            if (data.isRefresh) {
+              this.$refs.component.getList()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .AppHealthReport {
+    height: 100%;
+  }
+</style>
diff --git a/project/sass/apps/AppHealthReport/components/Detail.vue b/project/sass/apps/AppHealthReport/components/Detail.vue
new file mode 100644
index 00000000..6f73a123
--- /dev/null
+++ b/project/sass/apps/AppHealthReport/components/Detail.vue
@@ -0,0 +1,316 @@
+ <template>
+  <ai-detail isHasSidebar>
+    <template slot="title">
+      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(true)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar>
+      <div v-show="currIndex === 0">
+        <ai-card title="基本信息" v-show="currIndex === 0">
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+              <ai-info-item label="上报时间" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
+              <ai-info-item label="所属地区" :value="info.areaName"></ai-info-item>
+              <ai-info-item label="详细地址" isLine :value="info.address"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+      </div>
+      <ai-card title="每日上报" v-show="currIndex === 1">
+        <template #content>
+          <ai-table
+            class="detail-table__table"
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
+            <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+              <template slot-scope="{ row }">
+                <div class="table-options">
+                  <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </ai-table>
+          <ai-dialog
+            :visible.sync="isShow"
+            width="890px"
+            customFooter
+            title="上报详情">
+            <ai-bar title="健康状况"></ai-bar>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="当前体温">
+                <span :style="{color: reportInfo.temperature > 37.3 ? '#FF4466' : '#42D784'}">{{ reportInfo.temperature }}℃</span>
+              </ai-info-item>
+              <ai-info-item label="14天内是否接触新冠确诊或疑似患者">
+                <span :style="{color: reportInfo.touchInFourteen === '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicTouchInFourteen', reportInfo.touchInFourteen) }}</span>
+              </ai-info-item>
+              <ai-info-item label="当前健康状况" isLine>
+                <span :style="{color: !reportInfo.isHealth ? '#42D784' : '#FF4466'}">{{ reportInfo.healthName }}</span>
+              </ai-info-item>
+            </ai-wrapper>
+            <ai-bar title="核酸检测信息"></ai-bar>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="检测日期">
+                <span>{{ reportInfo.checkTime && reportInfo.checkTime.split(' ')[0] }}</span>
+              </ai-info-item>
+              <ai-info-item label="检测结果">
+                <span :style="{color: reportInfo.checkResult === '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicRecentTestResult', reportInfo.checkResult) }}</span>
+              </ai-info-item>
+              <ai-info-item label="健康码状态">
+                <span :style="{color: (reportInfo.healthCode === '0' || reportInfo.healthCode === '1') ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicHealthCode', reportInfo.healthCode) }}</span>
+              </ai-info-item>
+              <ai-info-item label="已接种疫苗次数">
+                <span>{{ $dict.getLabel('epidemicVaccineTime', reportInfo.vaccine) }}</span>
+              </ai-info-item>
+              <ai-info-item label="本人健康码截图" isLine>
+                <ai-uploader
+                  :instance="instance"
+                  v-model="reportInfo.checkPhoto"
+                  disabled
+                  :limit="9">
+                </ai-uploader>
+              </ai-info-item>
+            </ai-wrapper>
+            <div class="dialog-footer" slot="footer">
+              <el-button @click="isShow = false">关闭</el-button>
+            </div>
+          </ai-dialog>
+        </template>
+      </ai-card>
+      <div v-show="currIndex === 2">
+        <ai-card title="异常处理">
+          <template #right>
+            <el-button type="primary" v-if="info.status === '0'" @click="release">解除异常</el-button>
+          </template>
+          <template #content>
+            <ai-wrapper
+              label-width="120px">
+              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+              <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
+              <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
+              <ai-info-item label="异常状况" isLine>
+                <span :style="{color: info.unusual ? 'red' : '#333'}">{{ info.unusual || '-' }}</span>
+              </ai-info-item>
+              <ai-info-item label="异常解除人" v-if="info.releaseName && info.status === '1'" :value="info.releaseName"></ai-info-item>
+              <ai-info-item label="异常解除时间" v-if="info.releaseTime && info.status === '1'" :value="info.releaseTime"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="异常情况记录">
+          <template #right>
+            <el-button type="primary" v-if="info.status === '0'" @click="isShowAdd = true">添加记录</el-button>
+          </template>
+          <template #content>
+            <ai-table
+              :tableData="recordList"
+              :col-configs="recordConfigs"
+              :total="recordTotal"
+              :current.sync="recordSerch.current"
+              :size.sync="recordSerch.size"
+              @getList="getRecordList">
+              <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
+                <template slot-scope="{ row }">
+                  <div class="table-options">
+                    <el-button type="text" @click="remove(row.id)">删除</el-button>
+                  </div>
+                </template>
+              </el-table-column>
+            </ai-table>
+          </template>
+        </ai-card>
+        <ai-dialog
+          :visible.sync="isShowAdd"
+          width="800px"
+          @close="form.content = ''"
+          title="添加异常记录"
+          @onConfirm="onConfirm">
+          <el-form class="ai-form" label-width="120px" :model="form" ref="form">
+            <el-form-item label="异常记录" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入异常记录' }]">
+              <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.content" clearable placeholder="请输入异常记录" show-word-limit></el-input>
+            </el-form-item>
+          </el-form>
+        </ai-dialog>
+      </div>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        total: 0,
+        info: {},
+        id: '',
+        isShowAdd: false,
+        recordTotal: 0,
+        recordSerch: {
+          current: 1,
+          size: 10
+        },
+        search: {
+          current: 1,
+          size: 10
+        },
+        form: {
+          content: ''
+        },
+        recordConfigs: [
+          {prop: 'content', label: '异常记录', align: 'center' },
+          {prop: 'createTime', label: '创建时间', align: 'center'},
+          {prop: 'createUserName', label: '记录人', align: 'center' }
+        ],
+        reportInfo: {},
+        isShow: false,
+        currIndex: 0,
+        tableData: [],
+        recordList: [],
+        colConfigs: [
+          {prop: 'createTime', label: '上报日期', align: 'center', dateFormart: 'YYYY-MM-DD'},
+          {prop: 'status', label: '健康状态', align: 'center', formart: v => v === '0' ? '异常' : '正常' }
+        ],
+        tabList: ['基本信息', '每日上报', '异常处理']
+      }
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.dict.load(['epidemicRecentHealth', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicMemberType', 'epidemicRecentTestResult']).then(() => {
+          this.getInfo(this.params.id)
+          this.getList()
+          this.getRecordList()
+        })
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            this.currIndex = 0
+          }
+        })
+      },
+
+      getRecordList () {
+        this.instance.post(`/app/appepidemicunusuallog/list`, null, {
+          params: {
+            ...this.search,
+            recordId: this.params.id
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.recordList = res.data.records
+            this.recordTotal = res.data.total
+          }
+        })
+      },
+
+      onConfirm() {
+        this.$refs.form.validate(v => {
+          if (v) {
+            this.instance.post('/app/appepidemicunusuallog/addOrUpdate', {
+              ...this.form,
+              recordId: this.params.id
+            }).then(res => {
+              if (res?.code == 0) {
+                this.isShowAdd = false
+                this.getRecordList(this.params.id)
+                this.$message.success('添加成功!')
+              }
+            })
+          }
+        })
+      },
+
+      release () {
+        this.$confirm('确定解除异常？').then(() => {
+          this.instance.post(`/app/appepidemicreportmember/release`, {
+            id: this.params.id
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success('解除异常成功！')
+              this.currIndex = 0
+              this.getInfo(this.params.id)
+            }
+          })
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appepidemicunusuallog/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getRecordList(this.params.id)
+            }
+          })
+        })
+      },
+
+      toDetail (id) {
+        this.instance.post(`/app/appepidemichealthreport/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.reportInfo = res.data
+            this.reportInfo.checkPhoto = JSON.parse(res.data.checkPhoto)
+            let healthName = ''
+            this.reportInfo.isHealth = false
+            res.data.health.split(',').forEach(v => {
+              if (v > 0) {
+                this.reportInfo.isHealth = true
+              }
+              healthName = healthName + this.dict.getLabel('epidemicRecentHealth', v)
+            })
+            this.reportInfo.healthName = healthName
+
+            this.isShow = true
+          }
+        })
+      },
+
+      getList () {
+        this.instance.post(`/app/appepidemichealthreport/list`, null, {
+          params: {
+            ...this.search,
+            memberId: this.params.id
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/project/sass/apps/AppHealthReport/components/List.vue b/project/sass/apps/AppHealthReport/components/List.vue
new file mode 100644
index 00000000..b9760aad
--- /dev/null
+++ b/project/sass/apps/AppHealthReport/components/List.vue
@@ -0,0 +1,136 @@
+<template>
+  <ai-list class="list">
+    <ai-title slot="title" title="健康上报" isShowBottomBorder></ai-title>
+    <template slot="content">
+      <div class="content">
+        <ai-search-bar bottomBorder>
+          <template #right>
+            <el-input
+              v-model="search.name"
+              size="small"
+              placeholder="请输入姓名"
+              clearable
+              @keyup.enter.native="search.current = 1, getList()"
+              @clear="search.current = 1, search.name = '', getList()"
+              suffix-icon="iconfont iconSearch">
+            </el-input>
+          </template>
+        </ai-search-bar>
+        <ai-table
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          v-loading="loading"
+          style="margin-top: 16px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
+          <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+                <el-button type="text" @click="remove(row.id)">删除</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </div>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          name: ''
+        },
+        colConfigs: [
+          { prop: 'name', label: '姓名' },
+          { prop: 'phone', align: 'center', label: '手机号码' },
+          { prop: 'areaName', align: 'center', label: '所属地区', width: '200px' },
+          { prop: 'reportTime', align: 'center', label: '上报时间', width: '200px' }, 
+          { prop: 'healthCode', align: 'center', label: '健康码', formart: v => v ? this.dict.getLabel('epidemicHealthCode', v) : '-' }, 
+          { prop: 'checkTime', align: 'center', label: '核酸日期', formart: v => v ? v.split(' ')[0] : '-' }, 
+          { prop: 'checkResult', align: 'center', label: '检测结果', formart: v => v ? this.dict.getLabel('epidemicRecentTestResult', v) : '-' },
+          { prop: 'today', align: 'center', label: '今日上报', formart: v => v === '0' ? '未上报' : '已上报' },
+        ],
+        tableData: [],
+        total: 0,
+        loading: false
+      }
+    },
+
+    computed: {
+      ...mapState(['user']),
+
+      param () {
+        return {
+
+        }
+      }
+    },
+
+    created () {
+      this.loading = true
+      this.dict.load(['epidemicTouchInFourteen']).then(() => {
+        this.getList()
+      })
+    },
+
+    methods: {
+      getList () {
+        this.instance.post(`/app/appepidemicreportmember/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        }).catch(() => {
+          this.loading = false
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appepidemicreportmember/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getTotalInfo()
+              this.getList()
+            }
+          })
+        })
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>