20220513

ht/src/main/java/com/ccsens/ht/config/SpringConfig.java

@@ -92,6 +92,6 @@ public class SpringConfig implements WebMvcConfigurer {
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("/uploads/**")
-                .addResourceLocations("file:///home/cloud/ht/uploads/");
+                .addResourceLocations("file:///home/cloud/ht_visual/uploads/");
     }
 }

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

@@ -119,6 +119,7 @@ public class StatisticsService implements IStatisticsService {
         if(StrUtil.isEmpty(report.getReportCode())){
             return null;
         }
+        long s = System.currentTimeMillis();
         //生成横坐标（年龄分类 0~18未成年   19~44青年   45~59中年   60~74老人        75~89老年人    90以上长寿老年人）
         List<String> xAxis = new ArrayList<>();
         xAxis.add("0~18");
@@ -143,8 +144,12 @@ public class StatisticsService implements IStatisticsService {
             scoreTypes.add((totalScore - i));
         }
         scoreTypes.add(totalScore);
+        long s1 = System.currentTimeMillis();
+        System.out.println("生成类型时间==================" + (s1 - s));
         //根据类型和医院id查询各个类型分数的人数
         List<StatisticsVo.SundryNum> sundryNumList = statisticsDao.querySundryNumList(report.getReportCode(),report.getHospitalId(),scoreTypes);
+        long s2 = System.currentTimeMillis();
+        System.out.println("查询数据时间==================" + (s2 - s1));
         //封装数据
         List<StatisticsVo.ChartManWoman> chartList = new ArrayList<>();
         xAxis.forEach(ageType ->{
@@ -170,6 +175,8 @@ public class StatisticsService implements IStatisticsService {
             chartManWoman.setWomanList(womanList);
             chartList.add(chartManWoman);
         });
+        long s3 = System.currentTimeMillis();
+        System.out.println("封装数据时间==================" + (s3 - s2));
         //修改分数分类返回
         List<String> types = new ArrayList<>();
         String type1 = "0~" + scoreTypes.get(0);

ht/src/main/resources/application-prod.yml

@@ -33,9 +33,9 @@ file:
 #  path: /home/cloud/ht/uploads/
 #  domain: https://sd.tall.wiki/gateway/ht/
 #  imgDomain: https://sd.tall.wiki/gateway/ht/uploads
-  path: /home/cloud/ht/uploads/
-  domain: https://www.tall.wiki/gateway/ht_visual//
-  imgDomain: https://www.tall.wiki/gateway/ht_visual//uploads
+  path: /home/cloud/ht_visual/uploads/
+  domain: https://www.tall.wiki/gateway/ht-visual/
+  imgDomain: https://www.tall.wiki/gateway/ht-visual/uploads
 ht:
   project:
     patientUrl: https://www.tall.wiki/ht-dev/htPatientRegister

ht/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
-    include: common, util-prod
+    active: dev
+    include: common, util-dev
 

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

@@ -135,6 +135,7 @@
             t_ht_report
             WHERE
             type = 3
+            and total_score > 0
             and is_show = 1
             and is_del = 0
         ) r2 on r1.`code` = r2.parent_code

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

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