diff --git a/packages/jianping/AppAssessment/AppAssessment.vue b/packages/jianping/AppAssessment/AppAssessment.vue
index bee8daeb..1af6b8ad 100644
--- a/packages/jianping/AppAssessment/AppAssessment.vue
+++ b/packages/jianping/AppAssessment/AppAssessment.vue
@@ -22,8 +22,56 @@
           <h2 style="color: red">{{ info['丧礼登记数量'] }}</h2>
         </div>
       </div>
+      <div class="info">
+        <ai-card title="饮用水和三保障情况">
+          <template #content>
+            <ai-wrapper label-width="120px">
+              <ai-info-item label="住房安全" :value="info.title"></ai-info-item>
+              <ai-info-item label="饮水安全" :value="info.publishUnitName"></ai-info-item>
+              <ai-info-item label="失学辍学" :value="info.title"></ai-info-item>
+              <ai-info-item label="未参加医疗保险" :value="info.publishUnitName"></ai-info-item>
+              <ai-info-item label="低于家庭收入" :value="info.title"></ai-info-item>
+              <ai-info-item label="低于人均收入" :value="info.publishUnitName"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+        <ai-card title="信息采集进度">
+          <template #content>
+            <div class="progress-wrapper">
+              <div class="progress">
+                <div class="item" v-for="(item, index) in 10" :key="index">
+                  <h2>网格</h2>
+                  <el-progress :percentage="99"></el-progress>
+                </div>
+              </div>
+            </div>
+          </template>
+        </ai-card>
+      </div>
       <ai-card title="帮扶走访情况">
         <template #content>
+          <ai-search-bar bottomBorder>
+            <template #left>
+              <ai-select
+                v-model="search.riskType"
+                clearable
+                placeholder="请选择风险类型"
+                :selectList="dict.getDict('fpRiskType')"
+                @change="search.current = 1, getList()">
+              </ai-select>
+            </template>
+            <template #right>
+              <el-input
+                v-model="search.name"
+                size="small"
+                placeholder="姓名/风险说明/操作人"
+                clearable
+                v-throttle="() => {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"
@@ -147,6 +195,45 @@
 
 <style lang="scss" scoped>
   .AppAssessment {
+    .info {
+      display: flex;
+      justify-content: space-between;
+
+      .ai-card {
+        flex: 1;
+        height: 300px;
+        overflow-y: auto;
+
+        &:first-child {
+          margin-right: 20px;
+        }
+
+        .progress-wrapper {
+          height: 190px;
+          overflow: hidden;
+        }
+
+        .progress {
+          overflow-y: auto;
+          .item {
+            display: flex;
+            align-items: center;
+            margin-bottom: 12px;
+
+            .el-progress {
+              flex: 1;
+            }
+
+            h2 {
+              margin-right: 10px;
+              font-size: 14px;
+              color: #333;
+            }
+          }
+        }
+      }
+    }
+
     .statistics-top {
       display: flex;
       align-items: center;
diff --git a/packages/jianping/AppRiskWarning/components/Add.vue b/packages/jianping/AppRiskWarning/components/Add.vue
index 32895825..ff74457c 100644
--- a/packages/jianping/AppRiskWarning/components/Add.vue
+++ b/packages/jianping/AppRiskWarning/components/Add.vue
@@ -14,7 +14,7 @@
             <el-form-item label="联系方式" prop="phone" :rules="[{ required: true, validator: validatorPhone, trigger: 'blur' }]">
               <el-input v-model="form.phone" :maxlength="11" size="small" placeholder="请输入..."></el-input>
             </el-form-item>
-            <el-form-item label="风险类型" prop="idNumber" :rules="[{ required: true, message: '请选择风险类型', trigger: 'blur' }]">
+            <el-form-item label="风险类型" prop="riskType" :rules="[{ required: true, message: '请选择风险类型', trigger: 'blur' }]">
               <ai-select
                 v-model="form.riskType"
                 clearable
diff --git a/packages/jianping/AppRiskWarning/components/Detail.vue b/packages/jianping/AppRiskWarning/components/Detail.vue
index da858597..3bc7cb56 100644
--- a/packages/jianping/AppRiskWarning/components/Detail.vue
+++ b/packages/jianping/AppRiskWarning/components/Detail.vue
@@ -8,14 +8,13 @@
       <ai-card title="基本信息">
         <template #content>
           <ai-wrapper>
-            <ai-info-item label="标题" isLine :value="info.title"></ai-info-item>
-            <ai-info-item label="发布组织" isLine :value="info.publishUnitName"></ai-info-item>
-            <ai-info-item label="正文" isLine>
-              <AiArticle :value="info.content"></AiArticle>
-            </ai-info-item>
-            <ai-info-item label="图片" isLine>
-              <ai-uploader v-model="info.images" disabled :instance="instance" :limit="9"></ai-uploader>
-            </ai-info-item>
+            <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+            <ai-info-item label="联系方式" :value="info.phone"></ai-info-item>
+            <ai-info-item label="风险类型" :value="dict.getLabel('fpRiskType', info.riskType)"></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-info-item label="备注说明" isLine :value="info.remarks"></ai-info-item>
           </ai-wrapper>
         </template>
       </ai-card>
@@ -49,10 +48,9 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appmininotice/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/apppreventionreturntopovertyriskperson/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
-            this.info.images = res.data.images ? JSON.parse(res.data.images) : []
           }
         })
       },
diff --git a/packages/jianping/AppRiskWarning/components/List.vue b/packages/jianping/AppRiskWarning/components/List.vue
index cf522614..4402ed89 100644
--- a/packages/jianping/AppRiskWarning/components/List.vue
+++ b/packages/jianping/AppRiskWarning/components/List.vue
@@ -32,10 +32,10 @@
           <el-button icon="iconfont iconDelete" size="small" @click="removeAll" :disabled="ids.length == 0">删除 </el-button>
         </template>
         <template #right>
-          <ai-download :instance="instance" url="/app/apppreventionreturntopovertyriskperson/export" :params="search" fileName="风险预警人员" :disabled="tableData.length == 0">
+          <ai-download :instance="instance" url="/app/apppreventionreturntopovertyriskperson/export" :params="params" fileName="风险预警人员" :disabled="tableData.length == 0">
             <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
           </ai-download>
-          <ai-import :instance="instance" :dict="dict" type="apppreventionreturntopovertyriskperson" :importParams="search" name="风险预警人员" @success="getList()">
+          <ai-import :instance="instance" :dict="dict" type="apppreventionreturntopovertyriskperson" name="风险预警人员" @success="getList()">
             <el-button icon="iconfont iconImport">导入</el-button>
           </ai-import>
         </template>
@@ -95,8 +95,8 @@
           {prop: 'areaName', label: '所属区域', align: 'center' },
           {prop: 'remarks', label: '备注说明', align: 'center' },
           {prop: 'createTime', label: '操作时间', align: 'center'},
-          {prop: 'visitUserName', label: '操作人', align: 'center' },
-          {prop: 'createTime', label: '归口部门', align: 'center' },
+          {prop: 'createUserName', label: '操作人', align: 'center' },
+          {prop: 'departmentName', label: '归口部门', align: 'center' },
           {slot: 'options', label: '操作'}
         ],
         tableData: []
@@ -104,7 +104,17 @@
     },
 
     computed: {
-      ...mapState(['user'])
+      ...mapState(['user']),
+
+      params () {
+        if (this.ids.length) {
+          return {
+            ids: this.ids
+          }
+        }
+
+        return this.search
+      }
     },
 
     created () {
diff --git a/packages/jianping/AppVisitToVerify/components/Detail.vue b/packages/jianping/AppVisitToVerify/components/Detail.vue
index 17c77b6d..c5d0a965 100644
--- a/packages/jianping/AppVisitToVerify/components/Detail.vue
+++ b/packages/jianping/AppVisitToVerify/components/Detail.vue
@@ -3,7 +3,13 @@
     <template slot="title">
       <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
         <template #rightBtn>
-          <el-button size="small" type="primary" @click="isShow = true">处理结果</el-button>
+          <el-button
+            size="small"
+            type="primary"
+            @click="isShow = true"
+            v-if="(checkType === '1' || checkType === '2') && info.status !== '3'">
+            {{ checkType === '1' ? '走访核实' : '处理结果' }}
+          </el-button>
         </template>
       </ai-title>
     </template>
@@ -11,16 +17,51 @@
       <ai-card title="基本信息">
         <template #content>
           <ai-wrapper>
-            <ai-info-item label="姓名" :value="info.title"></ai-info-item>
-            <ai-info-item label="联系方式" :value="info.publishUnitName"></ai-info-item>
-            <ai-info-item label="风险类型" :value="info.publishUnitName"></ai-info-item>
-            <ai-info-item label="身份证号" :value="info.publishUnitName"></ai-info-item>
-            <ai-info-item label="所属区域" isLine :value="info.publishUnitName"></ai-info-item>
-            <ai-info-item label="联系地址" isLine :value="info.publishUnitName"></ai-info-item>
-            <ai-info-item label="备注说明" isLine :value="info.publishUnitName"></ai-info-item>
-            <ai-info-item label="处理时间" :value="info.publishUnitName"></ai-info-item>
-            <ai-info-item label="处理人" :value="info.publishUnitName"></ai-info-item>
-            <ai-info-item label="状态" isLine :value="info.publishUnitName"></ai-info-item>
+            <ai-info-item label="姓名" :value="info.name"></ai-info-item>
+            <ai-info-item label="联系方式" :value="info.phone"></ai-info-item>
+            <ai-info-item label="风险类型" :value="dict.getLabel('fpRiskType', info.riskType)"></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-info-item label="备注说明" isLine :value="info.remarks"></ai-info-item>
+            <ai-info-item label="操作人" :value="info.createUserName"></ai-info-item>
+            <ai-info-item label="归口部门" :value="info.departmentName"></ai-info-item>
+            <ai-info-item label="操作时间" isLine :value="info.createTime"></ai-info-item>
+            <ai-info-item label="状态" isLine :value="dict.getLabel('fpRiskPersonStatus', info.status)"></ai-info-item>
+          </ai-wrapper>
+        </template>
+      </ai-card>
+      <ai-card title="走访核实" v-if="info.visitTime">
+        <template #content>
+          <ai-wrapper>
+            <ai-info-item label="处理意见" :value="info.visitOpinion"></ai-info-item>
+            <ai-info-item label="处理时间" :value="info.visitTime"></ai-info-item>
+            <ai-info-item label="业务员" :value="info.visitUserName"></ai-info-item>
+            <ai-info-item label="照片">
+              <ai-uploader
+                disabled
+                :instance="instance"
+                v-model="info.visitFiles"
+                :limit="9">
+              </ai-uploader>
+            </ai-info-item>
+          </ai-wrapper>
+        </template>
+      </ai-card>
+      <ai-card title="处理结果" v-if="info.auditTime">
+        <template #content>
+          <ai-wrapper>
+            <ai-info-item label="处理意见" :value="info.auditOpinion"></ai-info-item>
+            <ai-info-item label="处理时间" :value="info.auditTime"></ai-info-item>
+            <ai-info-item label="业务员" :value="info.auditUserName"></ai-info-item>
+            <ai-info-item label="照片">
+              <ai-uploader
+                disabled
+                :instance="instance"
+                v-model="info.auditFiles"
+                :limit="9">
+              </ai-uploader>
+            </ai-info-item>
           </ai-wrapper>
         </template>
       </ai-card>
@@ -31,16 +72,20 @@
         title="审核"
         @onConfirm="onConfirm">
         <el-form class="ai-form" label-width="110px" :model="form" ref="form">
-          <el-form-item label="处理意见" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请选择处理意见' }]">
-            <el-radio-group v-model="form.pass" @change="onStatusChange">
-              <el-radio label="0">否</el-radio>
-              <el-radio label="1">是</el-radio>
+          <el-form-item label="处理意见" prop="operation" style="width: 100%;" :rules="[{ required: true, message: '请选择处理意见' }]">
+            <el-radio-group v-model="form.operation">
+              <el-radio label="0" v-if="checkType === '1'">疑似风险</el-radio>
+              <el-radio label="2" v-if="checkType === '2'">纳入监测</el-radio>
+              <el-radio label="1">解除风险</el-radio>
             </el-radio-group>
+            <!-- <span v-if="info.status != '2'">解除风险</span>
+            <span v-if="info.status === '0' && checkType === '1'">疑似风险</span>
+            <span v-if="info.status !== '2' && checkType === '2'">纳入监测</span> -->
           </el-form-item>
-          <el-form-item label="备注说明" prop="opinion" style="width: 100%;" :rules="[{ required: true, message: '请输入备注说明' }]">
+          <el-form-item label="备注说明" prop="opinion" style="width: 100%;" :rules="[{ required: form.operation === '2' ? true : false, message: '请输入备注说明' }]">
             <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入备注说明" show-word-limit></el-input>
           </el-form-item>
-          <el-form-item label="图片" prop="files" style="width: 100%;">
+          <el-form-item label="照片" prop="files" style="width: 100%;">
             <ai-uploader
               :instance="instance"
               v-model="form.files"
@@ -70,10 +115,11 @@
       return {
         info: {},
         id: '',
+        checkType: '',
         form: {
           opinion: '',
-          pass: '',
-          files: []
+          operation: '',
+          ids: ''
         },
         isShow: false
       }
@@ -88,47 +134,44 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appmininotice/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/apppreventionreturntopovertyriskperson/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
-            this.info.images = res.data.images ? JSON.parse(res.data.images) : []
+          }
+        })
+        this.instance.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
+          if (res.code == 0) {
+            this.checkType = res.data.checkType
           }
         })
       },
 
-      onStatusChange () {
-        this.form.opinion = ''
-        this.$refs.form.clearValidate()
-      },
-
       onClose () {
         this.form.opinion = ''
-        this.form.pass = ''
+        this.form.operation = ''
       },
 
       onConfirm () {
         this.$refs.form.validate(v => {
           if (v) {
-            this.instance.post('/app/appcontentinfo/examine', null, {
-              params: {
-                ...this.form,
-                id: this.id
-              }
+            this.instance.post(`/app/apppreventionreturntopovertyriskperson/monitor`, {
+              ...this.form,
+              ids: [this.params.id]
             }).then(res => {
-              if (res?.code == 0) {
+              if (res.code == 0) {
+                this.$message.success('操作成功！')
                 this.isShow = false
-                this.getList()
-                this.$message.success('审核成功!')
+                this.getInfo(this.params.id)
               }
             })
           }
         })
       },
 
-      cancel (isRefresh) {
+      cancel () {
         this.$emit('change', {
           type: 'List',
-          isRefresh: !!isRefresh
+          isRefresh: true
         })
       }
     }
diff --git a/packages/jianping/AppVisitToVerify/components/List.vue b/packages/jianping/AppVisitToVerify/components/List.vue
index 730db179..056fac58 100644
--- a/packages/jianping/AppVisitToVerify/components/List.vue
+++ b/packages/jianping/AppVisitToVerify/components/List.vue
@@ -1,27 +1,27 @@
 <template>
   <ai-list class="notice">
     <template slot="title">
-      <ai-title title="走访核实" isShowBottomBorder></ai-title>
+      <ai-title title="走访核实" isShowBottomBorder :isShowArea="true" v-model="search.areaId" :instance="instance" @change="getList"></ai-title>
     </template>
     <template slot="content">
       <ai-search-bar>
         <template #left>
           <ai-select
-            v-model="search.checkResult"
+            v-model="search.fpRiskType"
             clearable
             placeholder="请选择风险类型"
-            :selectList="dict.getDict('epidemicRecentTestResult')"
+            :selectList="dict.getDict('fpRiskType')"
             @change="search.current = 1, getList()">
           </ai-select>
           <ai-select
-            v-model="search.checkResult"
+            v-model="search.status"
             clearable
             placeholder="请选择状态"
-            :selectList="dict.getDict('epidemicRecentTestResult')"
+            :selectList="dict.getDict('fpRiskPersonStatus')"
             @change="search.current = 1, getList()">
           </ai-select>
-          <el-button size="small" :disabled="ids.length == 0" type="primary">纳入监测</el-button>
-          <el-button size="small" :disabled="ids.length == 0">解除风险</el-button>
+          <el-button size="small" v-if="checkType === '2'" :disabled="addIds.length == 0" type="primary" @click="addMonitor">纳入监测</el-button>
+          <el-button size="small" v-if="checkType === '2'" :disabled="removeIds.length == 0" @click="removeAll">解除风险</el-button>
         </template>
         <template #right>
           <el-input
@@ -42,7 +42,7 @@
         style="margin-top: 12px;"
         :current.sync="search.current"
         :size.sync="search.size"
-        @selection-change="(v) => (ids = v.map((e) => e.id))"
+        @selection-change="(v) => chooseList = v"
         @getList="getList">
         <el-table-column slot="options" width="90px" fixed="right" label="操作" align="center">
           <div class="table-options" slot-scope="{ row }">
@@ -69,10 +69,14 @@
         search: {
           current: 1,
           size: 10,
-          title: ''
+          name: '',
+          areaId: '',
+          fpRiskType: '',
+          status: ''
         },
-        ids: [],
+        chooseList: [],
         total: 10,
+        checkType: '',
         tableData: []
       }
     },
@@ -83,43 +87,46 @@
       colConfigs () {
         return [
           { type: 'selection' },
-          { prop: 'title', label: '姓名', align: 'left' },
-          { prop: 'createUserName', label: '联系方式', align: 'center' },
-          { prop: 'publishUnitName', label: '风险类型', align: 'center'},
-          { prop: 'createTime', label: '所属区域', align: 'center' },
-          { prop: 'createUserName', label: '备注说明', align: 'center' },
-          {
-            prop: 'status',
-            label: '状态',
-            align: 'center',
-            render: (h, { row }) => {
-              return h(
-                "span",
-                {
-                  style: {
-                    color: this.dict.getColor('epidemicRecentTestResult', row.status)
-                  }
-                },
-                this.dict.getLabel('epidemicRecentTestResult', row.status)
-              )
-            }
-          },
-          {prop: 'createTime', label: '处理时间', align: 'center' },
-          {prop: 'createTime', label: '处理人', align: 'center' },
-          {slot: 'options', label: '操作'}
+          { prop: 'name', label: '姓名', align: 'left'},
+          { prop: 'phone', label: '联系方式', align: 'center' },
+          { prop: 'riskType', label: '风险类型', align: 'center', formart: v => this.dict.getLabel('fpRiskType', v) },
+          { prop: 'areaName', label: '所属区域', align: 'center' },
+          { prop: 'remarks', label: '备注说明', align: 'center' },
+          { prop: 'status', label: '状态', align: 'center', formart: v => this.dict.getLabel('fpRiskPersonStatus', v) },
+          { prop: 'createTime', label: '处理时间', align: 'center' },
+          { prop: 'createUserName', label: '处理人', align: 'center' }
         ]
+      },
+
+      addIds () {
+        if (!this.chooseList.length) {
+          return []
+        }
+
+        return this.chooseList.filter(v => v.status === '0' || v.status === '1').map(v => v.id)
+      },
+
+      removeIds () {
+        if (!this.chooseList.length) {
+          return []
+        }
+
+        return this.chooseList.filter(v => v.status !== '3').map(v => v.id)
       }
     },
 
     created () {
-      this.dict.load('epidemicRecentTestResult').then(() => {
+      this.search.areaId = this.user.info.areaId
+      this.dict.load('fpRiskType', 'fpRiskPersonStatus').then(() => {
         this.getList()
       })
+
+      this.getInfo()
     },
 
     methods: {
       getList() {
-        this.instance.post(`/app/appmininotice/list`, null, {
+        this.instance.post(`/app/apppreventionreturntopovertyriskperson/list`, null, {
           params: {
             ...this.search
           }
@@ -131,16 +138,36 @@
         })
       },
 
-      removeAll () {
-        var id = this.ids.join(',')
-        this.remove(id)
+      getInfo () {
+        this.instance.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
+          if (res.code == 0) {
+            this.checkType = res.data.checkType
+          }
+        })
       },
 
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appmininotice/delete?ids=${id}`).then(res => {
+      addMonitor () {
+        this.$confirm('是否纳入监测对象？').then(() => {
+          this.instance.post(`/app/apppreventionreturntopovertyriskperson/monitor`, {
+            ids: this.addIds,
+            operation: 1
+          }).then(res => {
             if (res.code == 0) {
-              this.$message.success('删除成功！')
+              this.$message.success('操作成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      removeAll () {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/apppreventionreturntopovertyriskperson/monitor`, {
+            ids: this.removeIds,
+            operation: 2
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success('操作成功！')
               this.getList()
             }
           })