|
@@ -33,12 +33,20 @@ public class BEH0056 extends QCCatalogue {
|
|
|
}
|
|
|
|
|
|
ConjugalRelation conjugalRelation = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getConjugalRelation();
|
|
|
- long cont = inputInfo.getBeHospitalizedDoc().getMaritalLabel()
|
|
|
- .getFamily().stream()
|
|
|
- .filter(family -> family.getName().contains("配偶") && family.getDead()!=null).count();
|
|
|
+
|
|
|
if (conjugalRelation != null) {
|
|
|
- if(StringUtil.isNotBlank(conjugalRelation.getName()) || cont > 0){
|
|
|
+ if(StringUtil.isNotBlank(conjugalRelation.getName())){
|
|
|
+ status.set("0");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily() != null) {
|
|
|
+ long cont = inputInfo.getBeHospitalizedDoc().getMaritalLabel()
|
|
|
+ .getFamily().stream()
|
|
|
+ .filter(family -> family.getName().contains("配偶") && family.getDead() != null).count();
|
|
|
+ if (cont > 0) {
|
|
|
status.set("0");
|
|
|
+ return;
|
|
|
}
|
|
|
}
|
|
|
//硬规则 匹配离婚
|