|
@@ -330,6 +330,9 @@ public class VerifyCaseFrontSheet {
|
|
|
|
|
|
private List<CodeName> connectedVerify(List<CodeName> array, CaseFrontsheetMain info) {
|
|
|
if (StringUtil.notBlank(info.getMarriage())) {
|
|
|
+ if (null != info.getAge() && info.getAge() < 20 && !info.getMarriage().equals("1")) {
|
|
|
+ array.add(new CodeName("marriage", "患者年龄小于20周岁,婚姻状况须填未婚。"));
|
|
|
+ }
|
|
|
if (info.getMarriage().equals("1") || info.getMarriage().equals("3") || info.getMarriage().equals("4")) {
|
|
|
if (StringUtil.notBlank(info.getContactRelation()) &&
|
|
|
info.getContactRelation().equals("1")) {
|
|
@@ -337,6 +340,7 @@ public class VerifyCaseFrontSheet {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
if (StringUtil.notBlank(info.getZyDismissWay())) {
|
|
|
if ("1".equals(info.getZyDismissWay()) || "2".equals(info.getZyDismissWay())) {
|
|
|
if (StringUtil.invalidValue(info.getDismissDestination())) {
|