全景监视左下角消防巡查API修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -2144,8 +2144,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         }
         // 今日漏查率 = 今日漏查点位(JRLCDW) / 今日应巡查点(JRYXCD)
         resultMap.put("JRLCL", getPercent(resultMap.get("JRLCDW").floatValue(), resultMap.get("JRYXCD").floatValue()));
-        // 今日巡查点位合格占比 = 合格(HG) / 今日应巡查点(JRYXCD)
-        resultMap.put("JRHGZB", getPercent(resultMap.get("HG").floatValue(), resultMap.get("JRYXCD").floatValue()));
+        // 今日巡查点位合格占比 = 合格(HG) / 今日应巡查点(JRYXCD)  今日巡查点位合格占比 = 合格(HG) / 今日已巡查点(HG + BHG)
+        resultMap.put("JRHGZB", getPercent(resultMap.get("HG").floatValue(), resultMap.get("HG").floatValue() + resultMap.get("BHG").floatValue()));
         return resultMap;
     }
     @Override

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1476,7 +1476,7 @@
 		UNION ALL
 
 		SELECT
-			IFNULL(SUM(point_num), 0) AS value,
+			count( pptd.id) AS value,
 			'合格' AS name,
 			'HG' AS code
 		FROM
@@ -1492,7 +1492,7 @@
 		UNION ALL
 
 		SELECT
-			IFNULL(SUM(point_num), 0) AS value,
+			count( pptd.id) AS value,
 			'不合格' AS name,
 			'BHG' AS code
 		FROM