diff --git a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue
index 6764f9df..9e0b734b 100644
--- a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue
@@ -32,8 +32,9 @@
             <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
           </AiAreaPicker>
         </div>
-        <div class="item">
-          <span @click="showGateSelect=true">{{gatewayName || '卡口选择'}}</span>
+        <div class="item" @click="showGateSelect=true">
+          <span v-if="gatewayId">{{gatewayName || '卡口选择'}}</span>
+          <span v-else>卡口选择</span>
           <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
         </div>
       </div>
@@ -111,7 +112,7 @@ export default {
       this.getList()
     },
     getList() {
-      this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0&current=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&startAreaId=${this.areaId}`)
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0&current=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&arriveAreaId=${this.areaId}`)
       .then((res) => {
         if (res.code == 0) {
           res.data.records.map((item) => {
@@ -132,6 +133,7 @@ export default {
       this.$http.post(`/app/appepidemicpreventiongateway/list?size=300&status=0`).then((res) => {
         if (res.code == 0) {
           this.gateList = res.data.records
+          this.gateList.unshift({name: '全部', id: ''})
         }
       })
     },
@@ -154,6 +156,11 @@ export default {
     toUser(row) {
       uni.navigateTo({url: `./UserInfo?id=${row.id}`})
     },
+    clearGateway() {
+      this.gatewayName = ''
+      this.gatewayId = ''
+      this.getListInit()
+    }
   },
   onReachBottom() {
     this.current ++
diff --git a/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue b/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue
index ed447e7e..2e3f1dc8 100644
--- a/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/ManagementContent.vue
@@ -112,7 +112,7 @@
           <span class="tips">*</span>交接人姓名
         </div>
         <div class="value">
-          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.handoverPersonName" />
+          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.handoverPersonName" :custom-style="{'font-size': '17px'}" />
         </div>
       </div>
       <div class="item solid">
@@ -120,7 +120,7 @@
           <span class="tips"></span>手机号码
         </div>
         <div class="value">
-          <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.handoverPersonPhone" />
+          <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.handoverPersonPhone" :custom-style="{'font-size': '17px'}" />
         </div>
       </div>
       <div class="item">
diff --git a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
index c4fb02d3..ee3bc3f6 100644
--- a/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue
@@ -114,6 +114,10 @@ export default {
   },
   methods: {
     submit(status) {
+      if(this.form.handleType == 6) {
+        this.form.quarantineBeginTime = null
+        this.form.quarantineEndTime = null
+      }
       this.form.homeQuarantineOperation = status
       this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal?homeQuarantineOperation=${this.form.homeQuarantineOperation}`, this.form).then((res) => {
         if (res.code == 0) {
diff --git a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
index 31be7062..9efd2321 100644
--- a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue
@@ -30,6 +30,10 @@
           <div class="label">人员类别</div>
           <div class="value">{{$dict.getLabel('EP_registerPersonType', info.type)}}</div>
         </div>
+        <div class="item-flex">
+          <div class="label">高危行业</div>
+          <div class="value">{{$dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)}}</div>
+        </div>
       </div>
       <div class="line-bg"></div>
       <div class="info">
@@ -61,15 +65,15 @@
           <div class="value">{{info.description}}</div>
         </div>
         <div class="item-flex">
-          <div class="label">抵达时间</div>
+          <div class="label">抵平时间</div>
           <div class="value" v-if="info.arriveTime">{{info.arriveTime.substring(0, 16)}}</div>
         </div>
         <div class="item-flex">
-          <div class="label">返乡地区</div>
+          <div class="label">到达地区</div>
           <div class="value">{{info.arriveAreaName}}</div>
         </div>
         <div class="item-flex">
-          <div class="label">返乡地址</div>
+          <div class="label">到达地址</div>
           <div class="value">{{info.arriveAddress}}</div>
         </div>
       </div>
diff --git a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
index acacb5f5..eecee62f 100644
--- a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
+++ b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue
@@ -29,6 +29,10 @@
         <div class="label">人员类别</div>
         <div class="value">{{$dict.getLabel('EP_registerPersonType', info.type)}}</div>
       </div>
+      <div class="item-flex">
+        <div class="label">高危行业</div>
+        <div class="value">{{$dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)}}</div>
+      </div>
     </div>
     <div class="line-bg"></div>
     <div class="info">
@@ -60,15 +64,15 @@
         <div class="value">{{info.description}}</div>
       </div>
       <div class="item-flex">
-        <div class="label">抵达时间</div>
+        <div class="label">抵平时间</div>
         <div class="value">{{info.arriveTime.substring(0, 16)}}</div>
       </div>
       <div class="item-flex">
-        <div class="label">返乡地区</div>
+        <div class="label">到达地区</div>
         <div class="value">{{info.arriveAreaName}}</div>
       </div>
       <div class="item-flex">
-        <div class="label">返乡地址</div>
+        <div class="label">到达地址</div>
         <div class="value">{{info.arriveAddress}}</div>
       </div>
     </div>
@@ -77,7 +81,8 @@
       <div class="title">健康状况</div>
       <div class="item-flex">
         <div class="label">是否有风险旅居史</div>
-        <div class="value" :style="info.fromHighRiskArea == 1 ? 'color:#f46;' : ''">{{$dict.getLabel('yesOrNo', info.fromHighRiskArea)}}</div>
+        <div class="value" v-if="info.fromHighRiskArea != 1">否</div>
+        <div class="value" style="'color:#f46;" v-else>{{info.highRiskAreaName}}</div>
       </div>
       <div class="item-flex">
         <div class="label" style="width:360px;">7天内是否接触新冠确诊或疑似患者</div>
@@ -126,7 +131,7 @@ export default {
     document.title = '卡口登记详情'
   },
   onLoad(option) {
-    this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen').then(() => {
+    this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen', 'EP_highRiskIndustries').then(() => {
       this.id = option.id
       // this.haveHomeQuarantineBtn = option.operation == 'reDisposal' ? true : false
       this.getDetail()
diff --git a/src/project/pingchang/AppCommunityManagement/Add.vue b/src/project/pingchang/AppCommunityManagement/Add.vue
index 2650c267..8cd4ef44 100644
--- a/src/project/pingchang/AppCommunityManagement/Add.vue
+++ b/src/project/pingchang/AppCommunityManagement/Add.vue
@@ -66,7 +66,12 @@
           <span class="tips">*</span>管控人
         </div>
         <div class="value">
-          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.controllerUserName" :custom-style="{'font-size': '17px'}" />
+          <AiPagePicker type="sysUser" single :selected.sync="form.controllerList" action="/app/wxcp/wxuser/list?status=1" nodeKey="id" @select="handleSelectUser">
+            <span style="margin-left: 4px" v-if="form.controllerList && form.controllerList.length">{{ form.controllerList[0].name }}</span>
+            <span v-else class="color-999">请选择</span>
+            <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
+          </AiPagePicker>
+          <!-- <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.controllerUserName" :custom-style="{'font-size': '17px'}" /> -->
         </div>
       </div>
       <div class="item solid">
@@ -120,7 +125,8 @@ export default {
       form: {
         homeStatus: '',
         quarantineBeginTime: '',
-        quarantineStrategy: ''
+        quarantineStrategy: '',
+        controllerList: []
       },
       showDateSelect: false,
       showDictSelect: false,
@@ -181,7 +187,16 @@ export default {
     getDetail() {
       this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
-          this.form = res.data
+          this.form = {...res.data}
+          this.form.controllerList = []
+          if(this.form.controllerUserName) {
+            var info = {
+              name: this.form.controllerUserName,
+              id: this.form.controllerUserId,
+              mobile: this.form.controllerUserPhone
+            }
+            this.form.controllerList.push(info)
+          }
           if(this.form.homeStatus === null) {
             this.form.homeStatus = ''
           }
@@ -203,6 +218,11 @@ export default {
     areaSelect(e) {
       this.form.areaId = e
     },
+    handleSelectUser(e) {
+      console.log(e)
+      this.form.controllerUserPhone = e[0].mobile
+      this.form.controllerUserId = e[0].id
+    }
   },
 }
 </script>
@@ -211,6 +231,7 @@ export default {
 .Add {
   background-color: #F3F6F9;
   padding-top: 16px;
+  overflow-x: hidden;
   .item {
     width: 100%;
     background-color: #fff;
diff --git a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
index c8b30f99..4d617e7b 100644
--- a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
+++ b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue
@@ -49,7 +49,7 @@
       </div>
     </div>
     <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
-    <u-select v-model="showTypeSelect" :list="$dict.getDict('EP_registerInfoType')" label-name="dictName" value-name="dictValue" @confirm="typeConfirm"></u-select>
+    <u-select v-model="showTypeSelect" :list="registerTypeList" label-name="dictName" value-name="dictValue" @confirm="typeConfirm"></u-select>
   </div>
 </template>
 
@@ -87,7 +87,8 @@ export default {
       activeStyle: {
         'font-weight' : '400',
       },
-      list: []
+      list: [],
+      registerTypeList: []
     }
   },
   computed: {
@@ -97,6 +98,8 @@ export default {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
     this.$dict.load('EP_CM_status', 'EP_registerInfoType').then(() => {
+      this.registerTypeList = this.$dict.getDict('EP_registerInfoType')
+      this.registerTypeList.unshift({dictValue: '', dictName: '全部'})
       this.getListInit()
     })
      uni.$on('updateList', () => {
diff --git a/src/project/pingchang/AppNucleicAcidSampling/Detail.vue b/src/project/pingchang/AppNucleicAcidSampling/Detail.vue
index 852b29b9..e293a117 100644
--- a/src/project/pingchang/AppNucleicAcidSampling/Detail.vue
+++ b/src/project/pingchang/AppNucleicAcidSampling/Detail.vue
@@ -26,7 +26,7 @@
       </div>
       <div class="item-flex">
         <div class="label">隔离时间</div>
-        <div class="value">{{info.quarantineBeginTime}}至{{info.quarantineEndTime}}</div>
+        <div class="value" v-if="info.quarantineBeginTime">{{info.quarantineBeginTime.substring(0, 10)}}至{{info.quarantineEndTime.substring(0, 10)}}</div>
       </div>
       <div class="item-flex">
         <div class="label">隔离策略</div>