|
@@ -57,12 +57,12 @@ public class PushFacade {
|
|
// 获取第一个诊断
|
|
// 获取第一个诊断
|
|
String firstDisease = diags.get(0);
|
|
String firstDisease = diags.get(0);
|
|
PushDTO neoDto = map.get(firstDisease);
|
|
PushDTO neoDto = map.get(firstDisease);
|
|
- if (ruleTypeList.contains("5")) {
|
|
|
|
- pushDTO.setLis(neoDto.getLis());
|
|
|
|
|
|
+ if (ruleTypeList.contains("5") && ListUtil.isNotEmpty(neoDto.getLis())) {
|
|
|
|
+ pushDTO.setLis(neoDto.getLis().subList(0, pushVo.getLength()));
|
|
}
|
|
}
|
|
|
|
|
|
- if (ruleTypeList.contains("6")) {
|
|
|
|
- pushDTO.setPacs(neoDto.getPacs());
|
|
|
|
|
|
+ if (ruleTypeList.contains("6") && ListUtil.isNotEmpty(neoDto.getPacs())) {
|
|
|
|
+ pushDTO.setPacs(neoDto.getPacs().subList(0, pushVo.getLength()));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return pushDTO;
|
|
return pushDTO;
|