浏览代码

add:首页数据看板

Scott 2 年之前
父节点
当前提交
1a980c0821

+ 14 - 4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/HomePageServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.medical.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import org.aspectj.lang.annotation.Before;
 import org.jeecg.modules.medical.response.DashboardStatisticsBarResponse;
 import org.jeecg.modules.medical.response.DashboardStatisticsDetailedItem;
 import org.jeecg.modules.medical.response.DashboardStatisticsLineResponse;
@@ -256,11 +257,13 @@ public class HomePageServiceImpl implements IHomePageService {
      * @return
      */
     private DashboardStatisticsDetailedItem generateAfterDoctorsViolateTop(DashboardStatisticsBarResponse sourceData) {
+        Integer afterSupervisoryTotal = sourceData.getAfterSupervisoryTotal();
         DashboardStatisticsDetailedItem afterDoctorsViolateTop = new DashboardStatisticsDetailedItem();
         afterDoctorsViolateTop.setTitle("事中医生违规数排名前五");
+        afterDoctorsViolateTop.setTotal(afterSupervisoryTotal);
         ArrayList<JSONObject> rule1 = new ArrayList<>();
 
-        Integer afterSupervisoryTotal = sourceData.getAfterSupervisoryTotal();
+
         BigDecimal top1 = new BigDecimal(afterSupervisoryTotal).multiply(new BigDecimal("0.25")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
         BigDecimal top2 = new BigDecimal(afterSupervisoryTotal).multiply(new BigDecimal("0.13")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
         BigDecimal top3 = new BigDecimal(afterSupervisoryTotal).multiply(new BigDecimal("0.15")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
@@ -302,11 +305,13 @@ public class HomePageServiceImpl implements IHomePageService {
      * @return
      */
     private DashboardStatisticsDetailedItem generateMiddleDoctorsViolateTop(DashboardStatisticsBarResponse sourceData) {
+        // 事中提醒总和
+        Integer middleReviewTotal = sourceData.getMiddleReviewTotal();
         DashboardStatisticsDetailedItem middleDoctorsViolateTop = new DashboardStatisticsDetailedItem();
         middleDoctorsViolateTop.setTitle("事中医生违规数排名前五");
+        middleDoctorsViolateTop.setTotal(middleReviewTotal);
         ArrayList<JSONObject> rule1 = new ArrayList<>();
-        // 事中提醒总和
-        Integer middleReviewTotal = sourceData.getMiddleReviewTotal();
+
         BigDecimal top1 = new BigDecimal(middleReviewTotal).multiply(new BigDecimal("0.25")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
         BigDecimal top2 = new BigDecimal(middleReviewTotal).multiply(new BigDecimal("0.13")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
         BigDecimal top3 = new BigDecimal(middleReviewTotal).multiply(new BigDecimal("0.15")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
@@ -351,6 +356,7 @@ public class HomePageServiceImpl implements IHomePageService {
         afterRulesTop.setTitle("事后规则类型排名");
         ArrayList<JSONObject> rule1 = new ArrayList<>();
         Integer afterSupervisoryTotal = sourceData.getAfterSupervisoryTotal();
+        afterRulesTop.setTotal(afterSupervisoryTotal);
         BigDecimal top1 = new BigDecimal(afterSupervisoryTotal).multiply(new BigDecimal("0.25")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
         BigDecimal top2 = new BigDecimal(afterSupervisoryTotal).multiply(new BigDecimal("0.13")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
         BigDecimal top3 = new BigDecimal(afterSupervisoryTotal).multiply(new BigDecimal("0.15")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
@@ -396,6 +402,7 @@ public class HomePageServiceImpl implements IHomePageService {
         ArrayList<JSONObject> rule1 = new ArrayList<>();
 
         Integer middleReviewTotal = sourceData.getMiddleReviewTotal();
+        middleRulesTop.setTotal(middleReviewTotal);
         BigDecimal top1 = new BigDecimal(middleReviewTotal).multiply(new BigDecimal("0.23")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
         BigDecimal top2 = new BigDecimal(middleReviewTotal).multiply(new BigDecimal("0.16")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
         BigDecimal top3 = new BigDecimal(middleReviewTotal).multiply(new BigDecimal("0.14")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
@@ -431,12 +438,14 @@ public class HomePageServiceImpl implements IHomePageService {
     }
 
     private static DashboardStatisticsDetailedItem generateBeforeRuleTop(DashboardStatisticsBarResponse sourceData) {
+        Integer beforeReminderTotal = sourceData.getBeforeReminderTotal();
         // 生成事前规则类型排名
         DashboardStatisticsDetailedItem beforeRulesTop = new DashboardStatisticsDetailedItem();
         beforeRulesTop.setTitle("事前规则类型排名");
+        beforeRulesTop.setTotal(beforeReminderTotal);
         ArrayList<JSONObject> rule1 = new ArrayList<>();
 
-        Integer beforeReminderTotal = sourceData.getBeforeReminderTotal();
+
         BigDecimal top1 = new BigDecimal(beforeReminderTotal).multiply(new BigDecimal("0.23")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
         BigDecimal top2 = new BigDecimal(beforeReminderTotal).multiply(new BigDecimal("0.17")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
         BigDecimal top3 = new BigDecimal(beforeReminderTotal).multiply(new BigDecimal("0.14")).setScale(0, BigDecimal.ROUND_HALF_DOWN);
@@ -445,6 +454,7 @@ public class HomePageServiceImpl implements IHomePageService {
         JSONObject item1 = new JSONObject();
         item1.put("title", "频繁门诊");
         item1.put("total", top1);
+
         rule1.add(item1);
 
         JSONObject item2 = new JSONObject();