大屏疫情防控模块数据修改

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java

@@ -284,7 +284,7 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl<EpdcScreenDao, EpdcSc
 
     @Override
     public List<EpdcScreenVaccinationDeptStatisticsDTO> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) {
-        if (OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(formDto.getTypeKey())) {
+        if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(formDto.getTypeKey())) {
             return baseDao.streetVaccinationData();
         } else {
             return baseDao.communityVaccinationData();

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

@@ -372,7 +372,7 @@
         SELECT IFNULL(SUM(t.age <![CDATA[ >= ]]> 3 AND t.age <![CDATA[ <= ]]> 12), 0) AS ageThreeTwelve,
         IFNULL(SUM(t.age <![CDATA[ >= ]]> 13 AND t.age <![CDATA[ <= ]]> 17), 0) AS ageThirteenSeventeen,
         IFNULL(SUM(t.age <![CDATA[ >= ]]> 18 AND t.age <![CDATA[ <= ]]> 30), 0) AS ageEighteenThirty,
-        IFNULL(SUM(t.age <![CDATA[ >= ]]> 31 AND t.age <![CDATA[ <= ]]> 40), 0) AS ageThirtyOneForty,
+        IFNULL(SUM((t.age <![CDATA[ >= ]]> 31 AND t.age <![CDATA[ <= ]]> 40) OR t.age IS NULL OR t.age <![CDATA[ < ]]> 3), 0) AS ageThirtyOneForty,
         IFNULL(SUM(t.age <![CDATA[ >= ]]> 41 AND t.age <![CDATA[ <= ]]> 50), 0) AS ageFortyOneFifty,
         IFNULL(SUM(t.age <![CDATA[ >= ]]> 51 AND t.age <![CDATA[ <= ]]> 60), 0) AS ageFiftyOneSixty,
         IFNULL(SUM(t.age <![CDATA[ >= ]]> 61), 0) AS ageOverSixty
@@ -381,10 +381,10 @@
         FROM `esua_epdc_custom`.`epidemic_user_info`
         WHERE `DEL_FLAG`= '0'
         AND `PARENT_DEPT_IDS` <![CDATA[ <> ]]> ''
-        <if test="statisticType == '0'">
+        <if test="statisticType == 0">
             AND `VACCINATION_STATE` IN(1, 2)
         </if>
-        <if test="statisticType == '1'">
+        <if test="statisticType == 1">
             AND `VACCINATION_STATE` = 0
         </if>
         ) t
@@ -398,10 +398,10 @@
         FROM `esua_epdc_custom`.`epidemic_user_info`
         WHERE `DEL_FLAG`= '0'
         AND `PARENT_DEPT_IDS` <![CDATA[ <> ]]> ''
-        <if test="statisticType == '0'">
+        <if test="statisticType == 0">
             AND `VACCINATION_STATE` IN(1, 2)
         </if>
-        <if test="statisticType == '1'">
+        <if test="statisticType == 1">
             AND `VACCINATION_STATE` = 0
         </if>
     </select>

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit bc0cbaaf7a57c09b50240fac88b9d03a1f8b41e8
+Subproject commit d81d0d313a4556e4c6317e7924f98a8b0f6ce2ff