From 386a817d42107f3e41a861486e8d897e91604cd0 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 29 Mar 2022 10:07:16 +0800
Subject: [PATCH] 28612

---
 src/apps/AppMonitoringObject/Detail.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index 79dce804..cf8854e0 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -248,7 +248,7 @@ export default {
         return false
       }
 
-      return this.info.income6 > 0 && this.info.income7 > 0;
+      return this.info.income8 > 0 || this.info.income8 > 0;
 
 
     },
@@ -258,7 +258,8 @@ export default {
         return false
       }
 
-      return !!this.info.riskEliminationMethod;
+      return (this.info.industrialAssistance || this.info.healthAssistance || this.info.employmentAssistance || this.info.educationalAssistance
+      || this.info.financialAssistance || this.info.socialAssistance || this.info.publicWelfarePostAssistance);
 
 
     },
@@ -268,7 +269,7 @@ export default {
         return false
       }
 
-      return !!(this.info.drinkingWaterSafety && this.info.dilapidatedHouse && this.info.move);
+      return (this.info.drinkingWaterSafety || this.info.dilapidatedHouse && this.info.move);
 
 
     }