|
|
@@ -125,7 +125,7 @@ public class HealthCodeServiceImpl implements HealthCodeService {
|
|
|
|
|
|
@Override
|
|
|
public RestResult getShortTerm(ShortTermDTO shortTermDTO) {
|
|
|
- log.info("");
|
|
|
+ log.info("健康码查询入参信息：{}", JSON.toJSONString(shortTermDTO));
|
|
|
if (StrUtil.isEmpty(shortTermDTO.getHealthCode())) {
|
|
|
if (StringUtils.isBlank(shortTermDTO.getIdNumber()) && StringUtils.isBlank(shortTermDTO.getName())) {
|
|
|
throw new ServiceException(701, "身份证和姓名为空哦");
|
|
|
@@ -351,7 +351,8 @@ public class HealthCodeServiceImpl implements HealthCodeService {
|
|
|
HealtCodeNucleinVO nucleinVO = nucleinList.stream().findFirst().get();
|
|
|
nucleinVO.setTitle("核酸检测").setContentColor(nucleicExpirationFlag ? ColorEnum.YELLOW.getValue() : ColorEnum.GREEN.getValue()).setIconUrl(nucleicExpirationFlag ? NucleicStatusEnum.NOT_AVAILABLE.getUrl() : NucleicStatusEnum.NEGATIVE.getUrl());
|
|
|
if (nucleinVO.getReportTime() != null && DateUtil.compare(nucleinVO.getChecktime(), nucleinVO.getReportTime()) > 0) {
|
|
|
- nucleinVO.setContent(new StringBuilder().append(NucleicRuleEnum.TWENTY_FOUR.getValue()).append("H").append(" 结果未出").toString());
|
|
|
+// nucleinVO.setContent(new StringBuilder().append(NucleicRuleEnum.TWENTY_FOUR.getValue()).append("H").append(" 结果未出").toString());
|
|
|
+ nucleinVO.setContent(new StringBuilder().append("结果未出").toString());
|
|
|
} else {
|
|
|
long betweenHour = DateUtil.between(nucleinVO.getShowTime(), DateUtil.date(), DateUnit.HOUR);
|
|
|
if (betweenHour < NucleicRuleEnum.TWENTY_FOUR.getValue()) {
|
lileilei