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 961cb26..217d8a8 100644 --- a/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java +++ b/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java @@ -305,13 +305,14 @@ public class PacsCollectJob { pacsViewCondition.setSendDateEnd(disDateStr); // 住院pacs List zyPacsViews = ydZyyPacsViewMapper.pacsViews(pacsViewCondition); - - pacsViewCondition.setInpNo(null); - pacsViewCondition.setIdCard(idCard); - // 所有的pacs - List allPacsViews = ydZyyPacsViewMapper.pacsViews(pacsViewCondition); - allPacsViews.addAll(zyPacsViews); - + List allPacsViews = new ArrayList<>(zyPacsViews); + if(Func.isNotBlank(idCard)){ + pacsViewCondition.setInpNo(null); + pacsViewCondition.setIdCard(idCard); + // 根据患者身份证查 + List pacsViewsByIdCard = ydZyyPacsViewMapper.pacsViews(pacsViewCondition); + allPacsViews.addAll(pacsViewsByIdCard); + } List finalPacsViews = new ArrayList<>(); Set reamarks = new HashSet<>();