From 157d4e8a39e94da9ccd1db2046e438401e8f6827 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Wed, 25 Sep 2024 16:34:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8B=B1=E5=BE=B7?= =?UTF-8?q?=E4=B8=AD=E5=8C=BB=E9=99=A2=20pacs=20=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E4=B8=BA=E7=A9=BA=E6=9F=A5=E8=AF=A2=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E5=BA=94=E8=AF=A5=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E4=B8=BA=E7=A9=BA=E7=9A=84=E4=B8=8D=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docus/server/ydzyy/job/PacsCollectJob.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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<>();