|
@@ -56,15 +56,21 @@ public class BEH0375 extends QCCatalogue {
|
|
|
return;
|
|
|
}
|
|
|
List<Family> familyList = Lists.newArrayList();
|
|
|
- List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
|
|
|
- List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();
|
|
|
- if (ListUtil.isNotEmpty(familiesFl)) {
|
|
|
- familyList.addAll(familiesFl);
|
|
|
+ if (inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null){
|
|
|
+ List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
|
|
|
+ if (ListUtil.isNotEmpty(familiesFl)) {
|
|
|
+ familyList.addAll(familiesFl);
|
|
|
+ }
|
|
|
}
|
|
|
- if (ListUtil.isNotEmpty(familiesMl)) {
|
|
|
- familyList.addAll(familiesMl);
|
|
|
+
|
|
|
+ if (inputInfo.getBeHospitalizedDoc().getMaritalLabel() != null){
|
|
|
+ List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();
|
|
|
+ if (ListUtil.isNotEmpty(familiesMl)) {
|
|
|
+ familyList.addAll(familiesMl);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+
|
|
|
Pattern p = Pattern.compile("[配偶]");
|
|
|
List<Family> filterFamilies = familyList
|
|
|
.stream()
|