diff --git a/src/main/java/com/docus/server/archive/service/impl/MzsyPatientInfoSyncServiceImpl.java b/src/main/java/com/docus/server/archive/service/impl/MzsyPatientInfoSyncServiceImpl.java index d593a5b..4c54ddb 100644 --- a/src/main/java/com/docus/server/archive/service/impl/MzsyPatientInfoSyncServiceImpl.java +++ b/src/main/java/com/docus/server/archive/service/impl/MzsyPatientInfoSyncServiceImpl.java @@ -5,7 +5,9 @@ import com.docus.core.util.ObjectUtil; import com.docus.infrastructure.redis.service.IdService; import com.docus.server.archive.constans.SyncConstant; import com.docus.server.archive.converter.MzsyPatientInfoConverter; +import com.docus.server.archive.entity.PowerUser; import com.docus.server.archive.entity.TBasic; +import com.docus.server.archive.mapper.PowerUserMapper; import com.docus.server.archive.mapper.TBasicMapper; import com.docus.server.archive.service.PatientInfoSyncService; import com.docus.server.mzsy.entity.MzsyPatientInfoView; @@ -30,6 +32,8 @@ public class MzsyPatientInfoSyncServiceImpl implements PatientInfoSyncService { private MzsyPatientInfoViewMapper mzsyPatientInfoViewMapper; @Resource private IdService idService; + @Resource + private PowerUserMapper powerUserMapper; @Override public void syncByDisDate(LocalDateTime start, LocalDateTime end) { @@ -53,6 +57,17 @@ public class MzsyPatientInfoSyncServiceImpl implements PatientInfoSyncService { List basicList = patientInfoViews.stream() .map(MzsyPatientInfoConverter::convertPatientInfo) .collect(Collectors.toList()); + List collect = basicList.stream().map(TBasic::getAttending).collect(Collectors.toList()); + List byUserNames = powerUserMapper.findByUserNames(collect); + if(ObjectUtil.isNotEmpty(byUserNames)){ + Map map = byUserNames.stream().collect(Collectors.toMap(PowerUser::getUserName, PowerUser::getName)); + for (TBasic tBasic : basicList) { + String attending = tBasic.getAttending(); + if(ObjectUtil.isNotEmpty(attending)) { + tBasic.setAttendingName(map.get(attending)); + } + } + } saveOrUpdate(basicList); } if (Func.isEmpty(patientInfoViews) || patientInfoViews.size() < size) { diff --git a/src/main/java/com/docus/server/mzsy/mapper/MzsyPatientInfoViewMapper.java b/src/main/java/com/docus/server/mzsy/mapper/MzsyPatientInfoViewMapper.java index 3ddd169..c5723fb 100644 --- a/src/main/java/com/docus/server/mzsy/mapper/MzsyPatientInfoViewMapper.java +++ b/src/main/java/com/docus/server/mzsy/mapper/MzsyPatientInfoViewMapper.java @@ -15,4 +15,7 @@ public interface MzsyPatientInfoViewMapper { * @return 患者视图数据根据上次同步时间往后查询 */ List pageByViwe(@Param("cyrqStart") String cyrqStart,@Param("startTime") String startTime,@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize); + + + }