fix: 修复英德中医院 pacs 身份证为空查询匹配错误,应该身份证为空的不查询

master
wyb 10 months ago
parent b28de96d0b
commit 157d4e8a39

@ -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<>();

Loading…
Cancel
Save