|
|
|
@ -10,15 +10,14 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; |
|
|
|
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|
|
|
import com.epmet.commons.tools.exception.EpmetException; |
|
|
|
import com.epmet.commons.tools.exception.ExceptionUtils; |
|
|
|
import com.epmet.commons.tools.exception.RenException; |
|
|
|
import com.epmet.commons.tools.feign.ResultDataResolver; |
|
|
|
import com.epmet.commons.tools.page.PageData; |
|
|
|
import com.epmet.commons.tools.redis.common.CustomerOrgRedis; |
|
|
|
import com.epmet.commons.tools.redis.common.CustomerStaffRedis; |
|
|
|
import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; |
|
|
|
import com.epmet.commons.tools.utils.*; |
|
|
|
import com.epmet.constants.ImportTaskConstants; |
|
|
|
import com.epmet.dao.*; |
|
|
|
import com.epmet.dto.form.*; |
|
|
|
import com.epmet.dao.*; |
|
|
|
import com.epmet.dto.IcNatDTO; |
|
|
|
import com.epmet.dto.IcNoticeDTO; |
|
|
|
import com.epmet.dto.form.AddIcNatFormDTO; |
|
|
|
@ -42,7 +41,6 @@ import com.epmet.service.UserService; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.collections4.CollectionUtils; |
|
|
|
import org.apache.commons.fileupload.FileItem; |
|
|
|
import org.apache.commons.fileupload.FileItemFactory; |
|
|
|
import org.apache.commons.fileupload.disk.DiskFileItemFactory; |
|
|
|
@ -58,7 +56,6 @@ import java.io.OutputStream; |
|
|
|
import java.nio.file.Files; |
|
|
|
import java.nio.file.Path; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
|
* 疫苗接种记录 |
|
|
|
@ -73,8 +70,6 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin |
|
|
|
@Autowired |
|
|
|
private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; |
|
|
|
@Autowired |
|
|
|
private EpmetUserOpenFeignClient epmetUserOpenFeignClient; |
|
|
|
@Autowired |
|
|
|
private IcNoticeService icNoticeService; |
|
|
|
@Autowired |
|
|
|
private OssFeignClient ossFeignClient; |
|
|
|
@ -93,55 +88,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin |
|
|
|
|
|
|
|
/** |
|
|
|
* @Author sun |
|
|
|
* @Description 核酸检测-上报核酸记录 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void add(AddIcNatFormDTO formDTO) { |
|
|
|
//0.先根据身份证号和检查时间以及检测结果校验数据是否存在
|
|
|
|
IcNatDTO icNatDTO = baseDao.getNatDTO(formDTO.getCustomerId(), null, formDTO.getIdCard(), DateUtils.format(formDTO.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE), null); |
|
|
|
//按身份证号核酸时间存在记录的 核酸结果相同的提示已存在相同记录核酸结果不同的提示已存在去修改【业务要求的】
|
|
|
|
if (null != icNatDTO && icNatDTO.getNatResult().equals(formDTO.getNatResult())) { |
|
|
|
throw new RenException(EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getCode(), EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getMsg()); |
|
|
|
} else if (null != icNatDTO && !icNatDTO.getNatResult().equals(formDTO.getNatResult())) { |
|
|
|
throw new RenException(EpmetErrorCode.IC_NAT.getCode(), EpmetErrorCode.IC_NAT.getMsg()); |
|
|
|
} |
|
|
|
//1.获取所填居民所属组织缓存信息
|
|
|
|
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId()); |
|
|
|
if (null == agencyInfo) { |
|
|
|
throw new RenException(String.format("获取组织缓存信息失败%s", formDTO.getAgencyId())); |
|
|
|
} |
|
|
|
//2.新增核酸基础信息数据
|
|
|
|
IcVaccineEntity entity = ConvertUtils.sourceToTarget(formDTO, IcVaccineEntity.class); |
|
|
|
if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(formDTO.getUserId())) { |
|
|
|
entity.setIsResiUser("1"); |
|
|
|
} |
|
|
|
insert(entity); |
|
|
|
//3.核酸记录关系表新增与组织的关系数据
|
|
|
|
IcNatRelationEntity relationEntity = ConvertUtils.sourceToTarget(formDTO, IcNatRelationEntity.class); |
|
|
|
relationEntity.setIcNatId(entity.getId()); |
|
|
|
relationEntity.setPids(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(agencyInfo.getPids()) ? agencyInfo.getPids() + ":" + formDTO.getAgencyId() : formDTO.getAgencyId()); |
|
|
|
icNatRelationDao.insert(relationEntity); |
|
|
|
|
|
|
|
//3.新增通知表信息
|
|
|
|
if (formDTO.getChannel().size() > NumConstant.ZERO) { |
|
|
|
SendNoticeFormDTO dto = new SendNoticeFormDTO(); |
|
|
|
List<SendNoticeFormDTO.UserListBean> userList = new ArrayList<>(); |
|
|
|
userList.add(ConvertUtils.sourceToTarget(formDTO, SendNoticeFormDTO.UserListBean.class)); |
|
|
|
dto.setCustomerId(formDTO.getCustomerId()); |
|
|
|
dto.setUserList(userList); |
|
|
|
dto.setChannel(formDTO.getChannel()); |
|
|
|
dto.setOrigin("2"); |
|
|
|
dto.setContent(formDTO.getContent()); |
|
|
|
dto.setStaffId(formDTO.getStaffId()); |
|
|
|
icNoticeService.sendNotice(dto); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Author sun |
|
|
|
* @Description 核酸检测-居民端我的上报 |
|
|
|
* @Description 疫苗接种-居民端我的上报 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
public List<MyNatListResultDTO> myNatList(MyNatListFormDTO formDTO) { |
|
|
|
@ -157,13 +104,14 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin |
|
|
|
|
|
|
|
/** |
|
|
|
* @Author sun |
|
|
|
* @Description 【核酸】本组织及下级核酸检测信息列表 |
|
|
|
* @Description 【疫苗】本组织及下级疫苗接种信息列表 |
|
|
|
* |
|
|
|
* @param formDTO |
|
|
|
* @return*/ |
|
|
|
@Override |
|
|
|
public PageData<NatListResultDTO> natList(MyNatListFormDTO formDTO) { |
|
|
|
public PageData<IcVaccineListResultDTO> icVaccineList(VaccineListFormDTO formDTO) { |
|
|
|
//1.根据是查询客户数据还是本辖区数据走不同逻辑
|
|
|
|
if ("current".equals(formDTO.getOrgType())) { |
|
|
|
if ("current".equals(formDTO.getSearchType())) { |
|
|
|
//本辖区数据
|
|
|
|
//2.获取工作人员缓存信息
|
|
|
|
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); |
|
|
|
@ -172,13 +120,13 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin |
|
|
|
} |
|
|
|
formDTO.setAgencyId(staffInfo.getAgencyId()); |
|
|
|
//3.按条件查询业务数据
|
|
|
|
PageInfo<NatListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) |
|
|
|
.doSelectPageInfo(() -> baseDao.getNatList(formDTO)); |
|
|
|
PageInfo<IcVaccineListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) |
|
|
|
.doSelectPageInfo(() -> baseDao.getIcVaccineList(formDTO)); |
|
|
|
return new PageData(data.getList(), data.getTotal()); |
|
|
|
} else if ("all".equals(formDTO.getOrgType())) { |
|
|
|
} else if ("all".equals(formDTO.getSearchType())) { |
|
|
|
//客户下数据
|
|
|
|
PageInfo<NatListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) |
|
|
|
.doSelectPageInfo(() -> baseDao.getCustomerNatList(formDTO)); |
|
|
|
PageInfo<IcVaccineListResultDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) |
|
|
|
.doSelectPageInfo(() -> baseDao.getCustomerIcVaccineList(formDTO)); |
|
|
|
return new PageData(data.getList(), data.getTotal()); |
|
|
|
} |
|
|
|
|
|
|
|
@ -186,93 +134,17 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Author sun |
|
|
|
* @Description 【核酸】核酸检测信息详情 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
public IcNatDTO detail(MyNatListFormDTO formDTO) { |
|
|
|
IcNatDTO resultDTO = new IcNatDTO(); |
|
|
|
//1.查询核酸记录信息
|
|
|
|
IcVaccineEntity entity = baseDao.selectById(formDTO.getIcNatId()); |
|
|
|
if (null == resultDTO) { |
|
|
|
return resultDTO; |
|
|
|
} |
|
|
|
resultDTO = ConvertUtils.sourceToTarget(entity, IcNatDTO.class); |
|
|
|
|
|
|
|
//2.查询对应的通知记录信息
|
|
|
|
IcNoticeDTO dto = icNoticeService.getNotice(entity.getCustomerId(), entity.getIdCard()); |
|
|
|
if (null != dto) { |
|
|
|
resultDTO.setChannel(dto.getChannelList()); |
|
|
|
resultDTO.setContent(dto.getContent()); |
|
|
|
} |
|
|
|
|
|
|
|
return resultDTO; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Author sun |
|
|
|
* @Description 【核酸】核酸检测信息修改 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void edit(AddIcNatFormDTO formDTO) { |
|
|
|
//0.先根据身份证号和检测时间以及检测结果校验除当前数据是否还存在相同数据
|
|
|
|
IcNatDTO icNatDTO = baseDao.getNatDTO(formDTO.getCustomerId(), formDTO.getIcNatId(), formDTO.getIdCard(), DateUtils.format(formDTO.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE), formDTO.getNatResult()); |
|
|
|
if (null != icNatDTO) { |
|
|
|
throw new RenException(EpmetErrorCode.IC_NAT.getCode(), EpmetErrorCode.IC_NAT.getMsg()); |
|
|
|
} |
|
|
|
//1.更新核酸记录基础信息表数据
|
|
|
|
IcVaccineEntity entity = ConvertUtils.sourceToTarget(formDTO, IcVaccineEntity.class); |
|
|
|
entity.setId(formDTO.getIcNatId()); |
|
|
|
if (!updateById(entity)) { |
|
|
|
log.error(String.format("数据修改失败,核酸记录Id->%s", formDTO.getIcNatId())); |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "核酸记录修改失败"); |
|
|
|
} |
|
|
|
//修改只涉及到基础信息的修改 不会修改关系数据 关系表不涉及更新
|
|
|
|
|
|
|
|
//3.新增通知表信息
|
|
|
|
if (CollectionUtils.isNotEmpty(formDTO.getChannel())) { |
|
|
|
SendNoticeFormDTO dto = new SendNoticeFormDTO(); |
|
|
|
List<SendNoticeFormDTO.UserListBean> userList = new ArrayList<>(); |
|
|
|
userList.add(ConvertUtils.sourceToTarget(formDTO, SendNoticeFormDTO.UserListBean.class)); |
|
|
|
dto.setCustomerId(formDTO.getCustomerId()); |
|
|
|
dto.setUserList(userList); |
|
|
|
dto.setChannel(formDTO.getChannel()); |
|
|
|
dto.setOrigin("2"); |
|
|
|
dto.setContent(formDTO.getContent()); |
|
|
|
dto.setStaffId(formDTO.getStaffId()); |
|
|
|
icNoticeService.sendNotice(dto); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Author sun |
|
|
|
* @Description 【核酸】核酸检测信息删除/取消同步 |
|
|
|
* @Author zxc |
|
|
|
* @Description 【疫苗】疫苗接种信息同步 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void del(MyNatListFormDTO formDTO) { |
|
|
|
//1.确定删除则需要删除基础数据以及所有可能存在的关系数据，物理删除业务数据
|
|
|
|
if (baseDao.delById(formDTO.getIcNatId()) < NumConstant.ONE) { |
|
|
|
log.error(String.format("数据删除失败,核酸记录Id->%s", formDTO.getIcNatId())); |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "数据删除失败"); |
|
|
|
} |
|
|
|
//关系数据删除
|
|
|
|
icNatRelationDao.delRelation(formDTO.getIcNatId(), null); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Author sun |
|
|
|
* @Description 【核酸】核酸检测信息同步 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void synchro(MyNatListFormDTO formDTO) { |
|
|
|
//1.检验核酸基础信息是否存在
|
|
|
|
IcVaccineEntity entity = baseDao.selectById(formDTO.getIcNatId()); |
|
|
|
public void synchro(VaccineListFormDTO formDTO) { |
|
|
|
//1.检验疫苗基础信息是否存在
|
|
|
|
IcVaccineEntity entity = baseDao.selectById(formDTO.getIcVaccineId()); |
|
|
|
if (null == entity) { |
|
|
|
log.error(String.format("核酸记录数据不存在同步失败,核酸记录Id->%s", formDTO.getIcNatId())); |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "数据同步失败，核酸记录数据不存在"); |
|
|
|
log.error(String.format("疫苗记录数据不存在同步失败,疫苗记录Id->%s", formDTO.getIcVaccineId())); |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "数据同步失败，疫苗记录数据不存在"); |
|
|
|
} |
|
|
|
//获取工作人员缓存数据
|
|
|
|
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); |
|
|
|
@ -280,32 +152,33 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin |
|
|
|
throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); |
|
|
|
} |
|
|
|
//2.不管是否已存在关系数据都是先删后增
|
|
|
|
icNatRelationDao.delRelation(formDTO.getIcNatId(), staffInfo.getAgencyId()); |
|
|
|
icVaccineRelationDao.delRelation(formDTO.getIcVaccineId(), staffInfo.getAgencyId()); |
|
|
|
//3.新增关系数据
|
|
|
|
IcNatRelationEntity relationEntity = new IcNatRelationEntity(); |
|
|
|
relationEntity.setCustomerId(formDTO.getCustomerId()); |
|
|
|
relationEntity.setIcNatId(formDTO.getIcNatId()); |
|
|
|
relationEntity.setAgencyId(staffInfo.getAgencyId()); |
|
|
|
relationEntity.setPids(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(staffInfo.getAgencyPIds())?staffInfo.getAgencyPIds()+":"+staffInfo.getAgencyId():staffInfo.getAgencyId()); |
|
|
|
relationEntity.setUserType("synchro"); |
|
|
|
icNatRelationDao.insert(relationEntity); |
|
|
|
IcVaccineRelationEntity icVaccineRelationEntity = new IcVaccineRelationEntity(); |
|
|
|
icVaccineRelationEntity.setCustomerId(formDTO.getCustomerId()); |
|
|
|
icVaccineRelationEntity.setIcVaccineId(formDTO.getIcVaccineId()); |
|
|
|
icVaccineRelationEntity.setAgencyId(staffInfo.getAgencyId()); |
|
|
|
icVaccineRelationEntity.setPids(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(staffInfo.getAgencyPIds())?staffInfo.getAgencyPIds()+":"+staffInfo.getAgencyId():staffInfo.getAgencyId()); |
|
|
|
icVaccineRelationEntity.setUserType("synchro"); |
|
|
|
icVaccineRelationDao.insert(icVaccineRelationEntity); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Author sun |
|
|
|
* @Description 【核酸】核酸检测信息取消同步 |
|
|
|
**/ |
|
|
|
* @Author zxc |
|
|
|
* @Description 【疫苗】疫苗接种信息取消同步 |
|
|
|
* |
|
|
|
* @param formDTO*/ |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void cancelSynchro(MyNatListFormDTO formDTO) { |
|
|
|
public void cancelSynchro(VaccineListFormDTO formDTO) { |
|
|
|
//1.获取工作人员缓存数据
|
|
|
|
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); |
|
|
|
if (null == staffInfo) { |
|
|
|
throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); |
|
|
|
} |
|
|
|
//1.物理删除关系数据
|
|
|
|
if (icNatRelationDao.delRelation(formDTO.getIcNatId(), staffInfo.getAgencyId()) < NumConstant.ONE) { |
|
|
|
log.error(String.format("数据取消同步失败,核酸记录Id->%s", formDTO.getIcNatId())); |
|
|
|
if (icVaccineRelationDao.delRelation(formDTO.getIcVaccineId(), staffInfo.getAgencyId()) < NumConstant.ONE) { |
|
|
|
log.error(String.format("数据取消同步失败,疫苗记录Id->%s", formDTO.getAgencyId())); |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "取消同步操作失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -314,7 +187,6 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin |
|
|
|
@Override |
|
|
|
public void execAsyncExcelImport(Path filePath, String importTaskId) { |
|
|
|
String userId = null; |
|
|
|
|
|
|
|
try { |
|
|
|
userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); |
|
|
|
String app = EpmetRequestHolder.getHeader(AppClientConstant.APP); |
|
|
|
@ -374,11 +246,11 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin |
|
|
|
|
|
|
|
Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); |
|
|
|
if (!result.success()) { |
|
|
|
log.error("【核酸检测导入】finishImportTask失败"); |
|
|
|
log.error("【疫苗接种导入】finishImportTask失败"); |
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
String errorMsg = ExceptionUtils.getErrorStackTrace(e); |
|
|
|
log.error("【核酸检测导入】出错:{}", errorMsg); |
|
|
|
log.error("【疫苗接种导入】出错:{}", errorMsg); |
|
|
|
|
|
|
|
ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); |
|
|
|
importFinishTaskForm.setTaskId(importTaskId); |
|
|
|
@ -388,7 +260,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin |
|
|
|
|
|
|
|
Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); |
|
|
|
if (!result.success()) { |
|
|
|
log.error("【核酸检测导入】导入记录状态修改为'完成'失败"); |
|
|
|
log.error("【疫苗接种导入】导入记录状态修改为'完成'失败"); |
|
|
|
} |
|
|
|
} finally { |
|
|
|
// 删除临时文件
|
|
|
|
@ -403,49 +275,6 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 核酸检测信息 |
|
|
|
* |
|
|
|
* @param idCard |
|
|
|
* @Param idCard |
|
|
|
* @Return {@link List< NatListDTO >} |
|
|
|
* @Author zhaoqifeng |
|
|
|
* @Date 2022/3/29 16:29 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public List<NatListDTO> getNatList(String customerId, String idCard) { |
|
|
|
LambdaQueryWrapper<IcVaccineEntity> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
wrapper.eq(IcVaccineEntity::getCustomerId, customerId); |
|
|
|
wrapper.eq(IcVaccineEntity::getIdCard, idCard); |
|
|
|
wrapper.orderByDesc(IcVaccineEntity::getNatTime); |
|
|
|
List<IcVaccineEntity> list = baseDao.selectList(wrapper); |
|
|
|
if (CollectionUtils.isEmpty(list)) { |
|
|
|
return Collections.emptyList(); |
|
|
|
} |
|
|
|
return list.stream().map(item -> { |
|
|
|
NatListDTO dto = new NatListDTO(); |
|
|
|
dto.setAddress(item.getNatAddress()); |
|
|
|
dto.setTestTime(DateUtils.format(item.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)); |
|
|
|
switch (item.getNatResult()) |
|
|
|
{ |
|
|
|
case NumConstant.ZERO_STR: |
|
|
|
dto.setResult("阴性"); |
|
|
|
break; |
|
|
|
case NumConstant.ONE_STR: |
|
|
|
dto.setResult("阳性"); |
|
|
|
break; |
|
|
|
default: |
|
|
|
dto.setResult("未知"); |
|
|
|
} |
|
|
|
return dto; |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Integer updateIsResiFlag(String customerId, String icResiUserId) { |
|
|
|
return baseDao.updateIsResiFlag(customerId,icResiUserId); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 批量持久化 |
|
|
|
* @param entities |
|
|
|
|
wangxianzhang
3 years ago