区域话务分布

hjzx-mapper/src/main/resources/mapper/report/ReportMapper.xml

@@ -439,7 +439,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		GROUP BY a.root_id, a.root_name;
 	</select>
 	<select id="selectTelephoneData"  parameterType="String" resultMap="RecordDateViewResult">
-		select count(1) total,
+		select count(note=${note} or null) total,
 		count(note=${note} and call_type = 1 or null )	incoming,		count(call_type = 2
 		or null )	exhalation  from rep_record
 		where 1=1

hjzx-service/src/main/java/api/service/report/impl/DataAnalysisServiceImpl.java

@@ -74,6 +74,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
         HashMap<String,Object> obj=new HashMap<>();
         RecordDateView view1=reportMapper.selectTelephoneData(time,1L);//八院话务数据
         RecordDateView view2=reportMapper.selectTelephoneData(time,2L);//九院话务数据
+        view2.setExhalation(0L);
         RecordDateView view3=new RecordDateView();
         view3.setTotal(view1.getTotal()+view2.getTotal());
         view3.setIncoming(view1.getIncoming()+view2.getIncoming());