|
@@ -332,7 +332,8 @@ public class VerifyCaseFrontSheet {
|
|
|
private List<CodeName> connectedVerify(List<CodeName> array, CaseFrontsheetMain info, Integer opType) {
|
|
|
if (StringUtil.notBlank(info.getMarriage())) {
|
|
|
if (info.getMarriage().equals("1") || info.getMarriage().equals("3") || info.getMarriage().equals("4")) {
|
|
|
- if (info.getContactRelation().equals("1")) {
|
|
|
+ if (StringUtil.notBlank(info.getContactRelation()) &&
|
|
|
+ info.getContactRelation().equals("1")) {
|
|
|
array.add(new CodeName("contactRelation", "当婚姻状况为未婚、丧偶、离婚时,患者联系人关系不允许为配偶!"));
|
|
|
}
|
|
|
}
|