PC端修改

1、疫苗接种记录列表生产企业查询条件支持多选
2、疫苗接种记录列表性别显示错误问题修改

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java

@@ -48,10 +48,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -110,8 +107,13 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
         if (user == null) {
             throw new RenException("用户未登录");
         }
-        Map<String, Object> authParams = vaccinationUserRoleService.getVaccinationAuthParams(user.getId());
-        params.putAll(authParams);
+        // Map<String, Object> authParams = vaccinationUserRoleService.getVaccinationAuthParams(user.getId());
+        // params.putAll(authParams);
+        String companyId = params.get("companyId") == null ? null : params.get("companyId").toString();
+        if (StringUtils.isNotBlank(companyId)) {
+            params.put("companyIds", Arrays.asList(companyId.split(",")));
+        }
+
 
         // 街道和超管有权查看所有数据
         if (NumConstant.ZERO == user.getSuperAdmin() && !user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)) {
@@ -621,4 +623,4 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati
     public EpdcAppVimInfoResultDTO getUserVimInfo(String userName, String idCard) {
         return baseDao.getUserVimInfo(userName, idCard.toUpperCase());
     }
-}
+}

epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml

@@ -9,7 +9,7 @@
         v.REAL_NAME,
         v.IDENTITY_NO,
         v.MOBILE,
-        CASE WHEN v.SEX = 1 THEN '男' WHEN  v.SEX = 0 THEN '女' ELSE v.SEX END AS SEX,
+        CASE WHEN v.SEX = '1' THEN '男' WHEN  v.SEX = '0' THEN '女' ELSE v.SEX END AS SEX,
         v.COUNTY,
         v.STREET,
         v.COMMUNITY,
@@ -42,8 +42,11 @@
         <if test="mobile != null and mobile != ''">
             AND v.MOBILE LIKE concat('%', #{mobile}, '%')
         </if>
-        <if test="companyId != null and companyId != ''">
-            AND v.COMPANY_ID = #{companyId}
+        <if test="companyIds != null">
+            AND v.COMPANY_ID in
+            <foreach item="companyId" collection="companyIds" open="(" separator="," close=")">
+                #{companyId}
+            </foreach>
         </if>
         <if test="siteId != null and siteId != ''">
             AND v.SITE_ID = #{siteId}