考情监控-预警类型分布修改

themis-business/src/main/java/com/qmth/themis/business/service/impl/TIeReportServiceImpl.java

@@ -462,11 +462,6 @@ public class TIeReportServiceImpl implements TIeReportService {
         ExaminationMonitorWarnDistributionBean ret = new ExaminationMonitorWarnDistributionBean();
         ret.setOrgDistribution(tOeExamRecordMapper.getOrgDistribution(orgId));
         List<Map<String, Object>> typeList = tOeExamRecordMapper.getTypeDistribution(orgId);
-        if (typeList != null && typeList.size() > 0) {
-            for (Map<String, Object> map : typeList) {
-                map.put("type", VerifyExceptionEnum.valueOf((String) map.get("type")).getCode());
-            }
-        }
         ret.setTypeDistribution(typeList);
         return ret;
     }

themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -796,7 +796,7 @@
 	</select>
 	<select id="getTypeDistribution" resultType="java.util.Map">
 		SELECT
-			w.type type,
+			substring(w.info,instr(w.info,"【"),instr(w.info,"】")) as type,
 			count(DISTINCT(w.id)) count
 		FROM
 			t_oe_exam_record f
@@ -811,7 +811,7 @@
 		AND w.id IS NOT NULL
 		AND w.type!='NONE'
 		GROUP BY
-			w.type
+			w.info
 	</select>
 	<select id="getWarnTrend" resultType="com.qmth.themis.business.bean.admin.ExaminationMonitorHourWarnCountBean">
 			SELECT