体检项目bug优化
This commit is contained in:
+7
-3
@@ -118,6 +118,7 @@ public class HealthCheckupListController {
|
|||||||
hcus.campus,
|
hcus.campus,
|
||||||
hcus.subjectId,
|
hcus.subjectId,
|
||||||
hcu.bz,
|
hcu.bz,
|
||||||
|
hcu.isAudit,
|
||||||
hcus.receiveAddress,
|
hcus.receiveAddress,
|
||||||
ca.campusName
|
ca.campusName
|
||||||
FROM
|
FROM
|
||||||
@@ -164,9 +165,12 @@ public class HealthCheckupListController {
|
|||||||
v.setv("optionName", subject.getOptionName());
|
v.setv("optionName", subject.getOptionName());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StrUtil.isNotBlank(v.getString("unionId"))) {
|
if (StrUtil.isNotBlank(v.getString("unionId")) && ObjectUtil.isNotEmpty(v.getBoolean("isAudit")) && v.getBoolean("isAudit")) {
|
||||||
HealthCheckupUnionConfirm confirm = confirms.stream().filter(o -> o.getUnionId().equals(v.getString("unionId"))).findFirst().orElse(null);
|
HealthCheckupUnionConfirm confirm = confirms.stream()
|
||||||
v.setv("isAudit", confirm != null ? confirm.getIsAudit() : "");
|
.filter(o -> o.getUnionId().equals(v.getString("unionId")))
|
||||||
|
.findFirst()
|
||||||
|
.orElse(null);
|
||||||
|
// v.setv("isAudit", confirm != null ? confirm.getIsAudit() : "");
|
||||||
v.setv("auditTime", confirm != null ? confirm.getAuditTime() : "");
|
v.setv("auditTime", confirm != null ? confirm.getAuditTime() : "");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user