diff --git a/src/main/java/com/docus/server/ydzyy/dto/YdZyyPacsViewCondition.java b/src/main/java/com/docus/server/ydzyy/dto/YdZyyPacsViewCondition.java index 8c287b7..816d5ba 100644 --- a/src/main/java/com/docus/server/ydzyy/dto/YdZyyPacsViewCondition.java +++ b/src/main/java/com/docus/server/ydzyy/dto/YdZyyPacsViewCondition.java @@ -37,4 +37,9 @@ public class YdZyyPacsViewCondition { * 身份证号码 */ private String idCard; + + /** + * 报告唯一值 + */ + private String remark; } diff --git a/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java b/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java index 3302f36..045ca65 100644 --- a/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java +++ b/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java @@ -194,6 +194,16 @@ public class PacsCollectJob { List reCollectTask = tasks.stream().filter(task -> !notReCollectState.contains(task.getState())).collect(Collectors.toList()); for (AfCollectTask task : reCollectTask) { String remark = task.getC1(); + YdZyyPacsViewCondition viewCondition = new YdZyyPacsViewCondition(); + viewCondition.setRemark(remark); + List pacsViews = ydZyyPacsViewMapper.pacsViews(viewCondition); + if(Func.isEmpty(pacsViews)){ + tBasicMapper.delTaskById(task.getId()); + tBasicMapper.flushPatTaskEndTime (patientId, Func.formatDateTime(new Date())); + log.warn("remark:{} ,patientId:{} 视图已经不存在pacs报告信息,删除任务!", remark,patientId); + continue; + } + String base64 = ydZyyPacsService.getJpgReportBase64(remark); if (Func.isBlank(base64)) { log.info("remark:{} 获取pacs图片报告base64失败!", remark); diff --git a/src/main/resources/mapper/YdZyyPacsViewMapper.xml b/src/main/resources/mapper/YdZyyPacsViewMapper.xml index 5f6afa5..dd99d91 100644 --- a/src/main/resources/mapper/YdZyyPacsViewMapper.xml +++ b/src/main/resources/mapper/YdZyyPacsViewMapper.xml @@ -40,6 +40,9 @@ and IDCARD = #{condition.idCard} + + and REMARK=#{condition.remark} + order by CREATETIMESTR asc