|
@@ -141,12 +141,16 @@ public class BEH0011 extends QCCatalogue {
|
|
|
addInitDiagHospitalName(initDiags, initialDiagDiags);
|
|
|
|
|
|
/* 取修正诊断中疾病名称 */
|
|
|
- List<Diag> revisedDiagDiags = revisedDiagLabel.getDiags();
|
|
|
- addInitDiagHospitalName(initDiags, revisedDiagDiags);
|
|
|
+ if (revisedDiagLabel != null) {
|
|
|
+ List<Diag> revisedDiagDiags = revisedDiagLabel.getDiags();
|
|
|
+ addInitDiagHospitalName(initDiags, revisedDiagDiags);
|
|
|
+ }
|
|
|
|
|
|
/* 取补充诊断中疾病名称 */
|
|
|
- List<Diag> suppleDiagDiags = suppleDiagLabel.getDiags();
|
|
|
- addInitDiagHospitalName(initDiags, suppleDiagDiags);
|
|
|
+ if (suppleDiagLabel != null) {
|
|
|
+ List<Diag> suppleDiagDiags = suppleDiagLabel.getDiags();
|
|
|
+ addInitDiagHospitalName(initDiags, suppleDiagDiags);
|
|
|
+ }
|
|
|
|
|
|
if (initDiags.size() > 0) {
|
|
|
initDiags = initDiags.stream().distinct().collect(Collectors.toList());
|