Преглед изворни кода

数据看板,心理健康查询调整

dzx пре 6 месеци
родитељ
комит
d5065bab13

+ 1 - 1
src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -328,7 +328,7 @@ public class DataboardController {
         list = SqlRunnerAdapter.db().selectList(sql);
         for (Map<String, Object> objectMap : list) {
             if (objectMap.get("gender") != null && GenderDictionaryEnum.FEMALE.getCode().equals(objectMap.get("gender").toString())) {
-                result.setInfectionFemaleCount(Integer.parseInt(objectMap.get("a_count").toString()));
+                result.setPsychologicalFemaleCount(Integer.parseInt(objectMap.get("a_count").toString()));
             }
             if (objectMap.get("gender") != null && GenderDictionaryEnum.MALE.getCode().equals(objectMap.get("gender").toString())) {
                 result.setPsychologicalMaleCount(Integer.parseInt(objectMap.get("a_count").toString()));

+ 2 - 2
src/main/java/com/xjrsoft/module/databoard/controller/DatadetailController.java

@@ -196,7 +196,7 @@ public class DatadetailController {
     @SaCheckPermission("datadetail:detail")
     @XjrLog(value = "学生健康统计", saveResponseData = true)
     public RT<HealthStatisticsDetailVo> healthStatistics(@Valid StatisticsDetailDto dto) {
-        String sql = "SELECT t1.gender,COUNT(t1.*) AS a_count FROM student_infection t1" +
+        String sql = "SELECT t1.gender,COUNT(t1.id) AS a_count FROM student_infection t1" +
                 " INNER JOIN xjr_workflow_form_relation t2 ON t1.id = t2.form_key_value" +
                 " WHERE t2.current_state = 'COMPLETED' GROUP BY t1.gender";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql);
@@ -210,7 +210,7 @@ public class DatadetailController {
             }
         }
 
-        sql = "SELECT t1.gender,COUNT(t1.*) AS a_count FROM student_psychological t1" +
+        sql = "SELECT t1.gender,COUNT(t1.id) AS a_count FROM student_psychological t1" +
                 " INNER JOIN xjr_workflow_form_relation t2 ON t1.id = t2.form_key_value" +
                 " WHERE t2.current_state = 'COMPLETED' GROUP BY t1.gender";
         list = SqlRunnerAdapter.db().selectList(sql);