修改统计

src/main/java/com/ccsens/carbasics/service/DataStatisticsService.java

@@ -45,10 +45,10 @@ public class DataStatisticsService implements IDataStatisticsService {
         List<QuestionnaireDataDatumLine> dataDatumLineList = dataDatumLineDao.queryAll((byte) 0);
         if (CollectionUtil.isNotEmpty(dataDatumLineList)) {
             for (QuestionnaireDataDatumLine dataDatumLine : dataDatumLineList) {
-                if ("基础".equals(dataDatumLine.getName())) {
+                if ("基础目标".equals(dataDatumLine.getName())) {
                     BeanUtil.copyProperties(dataDatumLine,basics);
                 }
-                if ("进阶".equals(dataDatumLine.getName())) {
+                if ("进阶目标".equals(dataDatumLine.getName())) {
                     BeanUtil.copyProperties(dataDatumLine,advance);
                 }
             }

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
+    active: prod
-    include: common, util-test
+    include: common, util-prod

src/main/resources/mapper_dao/DataStatisticsDao.xml

@@ -81,7 +81,7 @@
     <select id="queryJmrsForHospital" resultType="com.ccsens.carbasics.bean.vo.StatisticsVo$AreaResult">
         SELECT
             gediAis.hname AS `name`,
-            IFNULL(convert(gediRszs.`value` * 100 / gediAis.`value`,decimal(10,1)),0) AS `value`,
+            IFNULL(round(gediRszs.`value` * 100 / gediAis.`value`,1),0) AS `value`,
             gediRszs.`value` AS rsTotal
         FROM
         (SELECT
@@ -155,7 +155,7 @@
         SELECT
             a.id AS areaId,
             a.area_name AS `name`,
-            IFNULL(convert(gediRszs.`value` * 100 / gediAis.`value`,decimal(10,1)),0) AS `value`
+            IFNULL(round(gediRszs.`value` * 100 / gediAis.`value`,1),0) AS `value`
         FROM
         (SELECT
             qr.answer AS area,