20220506送测版本1.0

ht/src/main/java/com/ccsens/ht/service/StatisticsService.java

@@ -100,10 +100,13 @@ public class StatisticsService implements IStatisticsService {
         //查找各省份的数据
         List<StatisticsVo.Chart> chartList = statisticsDao.areaDistribution();
         //返回
+        StatisticsVo.AreaDistribution area = new StatisticsVo.AreaDistribution();
         if(ObjectUtil.isNotNull(areaDistribution)){
-            areaDistribution.setChartList(chartList);
+            area.setName(areaDistribution.getName());
+            area.setNum(areaDistribution.getNum());
         }
-        return areaDistribution;
+        area.setChartList(chartList);
+        return area;
     }
 
     @Override

ht/src/main/resources/mapper_dao/HtReportDao.xml

@@ -119,11 +119,12 @@
             r1.id,
             r1.`code`,
             r1.`name`,
-            r2.id as subentryId,
+            if(r2.id is null,r1.id,r2.id) as subentryId,
-            r2.`code` as subentryCode,
+            if(r2.`code` is null,r1.`code`,r2.`code`)  as subentryCode,
-            r2.`name` as subentryName
+            if(r2.`name` is null,r1.`name`,r2.`name`)  as subentryName
         FROM
-        t_ht_report r1,
+        t_ht_report r1
+				LEFT JOIN
         (
             SELECT
             id,
@@ -136,10 +137,9 @@
             type = 3
             and is_show = 1
             and is_del = 0
-        ) r2
+        ) r2 on r1.`code` = r2.parent_code
         WHERE
-        r1.`code` = r2.parent_code
+         r1.type = 2
-        and r1.type = 2
         and r1.is_show = 1
         and r1.is_del = 0
     </select>

ht/src/main/resources/mapper_dao/StatisticsDao.xml

@@ -178,6 +178,7 @@
         and r.is_del = 0
         GROUP BY r.clinical_diagnosis
         ORDER BY num DESC
+        limit 70
     </select>
     <select id="areaDistribution" resultType="com.ccsens.ht.bean.vo.StatisticsVo$Chart">
 		SELECT
@@ -196,6 +197,7 @@
 		and r.is_del = 0
 		and i.is_del = 0
 		GROUP BY i.province
+		ORDER BY num DESC
     </select>
     <select id="hospitalProvince" resultType="com.ccsens.ht.bean.vo.StatisticsVo$AreaDistribution">
         SELECT