diff --git a/docker/生产环境服务部署文档.md b/docker/生产环境服务部署文档.md index 2c6a2dad..c08f689a 100644 --- a/docker/生产环境服务部署文档.md +++ b/docker/生产环境服务部署文档.md @@ -168,7 +168,7 @@ mv virtual-patient-bucket-prod /data/vp/minio/data # 运行容器 docker run --name virtual-patient-web -p 8899:8899 -d virtual-patient-web # **启用网络环境服务,生产环境请使用** - docker run --name virtual-patient-web -p 8899:8899 -v /data/vp:/data/vp --network virtual-patient-network -d virtual-patient-web --spring.profiles.active=prod + docker run --name virtual-patient-web -p 8899:8899 -v /data/vp:/data/vp --network virtual-patient-network -d virtual-patient-web:1.0.0 --spring.profiles.active=prod # 验证容器运行 docker ps | grep virtual-patient-web # 查看日志是否正常 diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java index c521abc9..7546b7d3 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/PhysicalToolManageServiceImpl.java @@ -57,10 +57,16 @@ public class PhysicalToolManageServiceImpl implements PhysicalToolManageService ConfigPhysicalTool configPhysicalTool = configPhysicalToolService.getById(id); PhysicalToolVO bean = BeanUtil.toBean(configPhysicalTool, PhysicalToolVO.class); List list = defaultPhysicalIndicatorService.lambdaQuery().eq(DefaultPhysicalIndicator::getItemId, id).list(); - if (CollUtil.isNotEmpty(list)) { - bean.setDefaultPhysicalIndicatorList(list); + // 如果需要检查位 + if (configPhysicalTool.getRequireLocation() == 1) { + if (CollUtil.isNotEmpty(list)) { + bean.setDefaultPhysicalIndicatorList(list); + } else { + bean.setDefaultPhysicalIndicatorList(new ArrayList<>()); + } } else { - bean.setDefaultPhysicalIndicatorList(new ArrayList<>()); + // 如果不需要检查位 + list.stream().findFirst().ifPresent(bean::setNoLocationDefaultPhysicalIndicator); } return bean; }