|
|
|
@ -305,13 +305,14 @@ public class PacsCollectJob {
|
|
|
|
|
pacsViewCondition.setSendDateEnd(disDateStr);
|
|
|
|
|
// 住院pacs
|
|
|
|
|
List<YdZyyPacsView> zyPacsViews = ydZyyPacsViewMapper.pacsViews(pacsViewCondition);
|
|
|
|
|
|
|
|
|
|
pacsViewCondition.setInpNo(null);
|
|
|
|
|
pacsViewCondition.setIdCard(idCard);
|
|
|
|
|
// 所有的pacs
|
|
|
|
|
List<YdZyyPacsView> allPacsViews = ydZyyPacsViewMapper.pacsViews(pacsViewCondition);
|
|
|
|
|
allPacsViews.addAll(zyPacsViews);
|
|
|
|
|
|
|
|
|
|
List<YdZyyPacsView> allPacsViews = new ArrayList<>(zyPacsViews);
|
|
|
|
|
if(Func.isNotBlank(idCard)){
|
|
|
|
|
pacsViewCondition.setInpNo(null);
|
|
|
|
|
pacsViewCondition.setIdCard(idCard);
|
|
|
|
|
// 根据患者身份证查
|
|
|
|
|
List<YdZyyPacsView> pacsViewsByIdCard = ydZyyPacsViewMapper.pacsViews(pacsViewCondition);
|
|
|
|
|
allPacsViews.addAll(pacsViewsByIdCard);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<YdZyyPacsView> finalPacsViews = new ArrayList<>();
|
|
|
|
|
Set<String> reamarks = new HashSet<>();
|
|
|
|
|