diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java index 1ea5b5d..514b1fe 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java @@ -42,8 +42,8 @@ public class LisReport { } public void setHospitalId(String hospitalId) { - if (StringUtils.isBlank(hospitalId)) { - this.hospitalId = hospitalId; + if (StringUtils.isNotBlank(hospitalId)) { + this.hospitalId = hospitalId.trim(); } else { this.hospitalId = null; } @@ -72,8 +72,8 @@ public class LisReport { } public void setPatientFid(String patientFid) { - if (StringUtils.isBlank(patientFid)) { - this.patientFid = hospitalId; + if (StringUtils.isNotBlank(patientFid)) { + this.patientFid = patientFid.trim(); } else { this.patientFid = null; } @@ -84,8 +84,8 @@ public class LisReport { } public void setPatientHid(String patientHid) { - if (StringUtils.isBlank(patientHid)) { - this.patientHid = patientHid; + if (StringUtils.isNotBlank(patientHid)) { + this.patientHid = patientHid.trim(); } else { this.patientHid = null; } @@ -96,8 +96,8 @@ public class LisReport { } public void setVcCardNo(String vcCardNo) { - if (StringUtils.isBlank(vcCardNo)) { - this.vcCardNo = vcCardNo; + if (StringUtils.isNotBlank(vcCardNo)) { + this.vcCardNo = vcCardNo.trim(); } else { this.vcCardNo = null; } @@ -108,8 +108,8 @@ public class LisReport { } public void setName(String name) { - if (StringUtils.isBlank(name)) { - this.name = name; + if (StringUtils.isNotBlank(name)) { + this.name = name.trim(); } else { this.name = null; } @@ -120,8 +120,8 @@ public class LisReport { } public void setSex(String sex) { - if (StringUtils.isBlank(sex)) { - this.sex = sex; + if (StringUtils.isNotBlank(sex)) { + this.sex = sex.trim(); } else { this.sex = null; } @@ -140,8 +140,8 @@ public class LisReport { } public void setDeptCode(String deptCode) { - if (StringUtils.isBlank(deptCode)) { - this.deptCode = deptCode; + if (StringUtils.isNotBlank(deptCode)) { + this.deptCode = deptCode.trim(); } else { this.deptCode = null; } @@ -152,8 +152,8 @@ public class LisReport { } public void setDeptName(String deptName) { - if (StringUtils.isBlank(deptName)) { - this.deptName = deptName; + if (StringUtils.isNotBlank(deptName)) { + this.deptName = deptName.trim(); } else { this.deptName = null; } @@ -164,8 +164,8 @@ public class LisReport { } public void setApplyDoctorCode(String applyDoctorCode) { - if (StringUtils.isBlank(applyDoctorCode)) { - this.applyDoctorCode = applyDoctorCode; + if (StringUtils.isNotBlank(applyDoctorCode)) { + this.applyDoctorCode = applyDoctorCode.trim(); } else { this.applyDoctorCode = null; } @@ -176,8 +176,8 @@ public class LisReport { } public void setApplyDoctorName(String applyDoctorName) { - if (StringUtils.isBlank(applyDoctorName)) { - this.applyDoctorName = applyDoctorName; + if (StringUtils.isNotBlank(applyDoctorName)) { + this.applyDoctorName = applyDoctorName.trim(); } else { this.applyDoctorName = null; } @@ -188,8 +188,8 @@ public class LisReport { } public void setCheckDoctorCode(String checkDoctorCode) { - if (StringUtils.isBlank(checkDoctorCode)) { - this.checkDoctorCode = checkDoctorCode; + if (StringUtils.isNotBlank(checkDoctorCode)) { + this.checkDoctorCode = checkDoctorCode.trim(); } else { this.checkDoctorCode = null; } @@ -200,8 +200,8 @@ public class LisReport { } public void setCheckDoctorName(String checkDoctorName) { - if (StringUtils.isBlank(checkDoctorName)) { - this.checkDoctorName = checkDoctorName; + if (StringUtils.isNotBlank(checkDoctorName)) { + this.checkDoctorName = checkDoctorName.trim(); } else { this.checkDoctorName = null; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java index 19589c3..b7901dc 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java @@ -23,7 +23,7 @@ public class LisReportItem { } public void setId(String id) { - if (StringUtils.isBlank(id)) { + if (StringUtils.isNotBlank(id)) { this.id = id; } else { this.id = null; @@ -35,8 +35,8 @@ public class LisReportItem { } public void setCode(String code) { - if (StringUtils.isBlank(code)) { - this.code = code; + if (StringUtils.isNotBlank(code)) { + this.code = code.trim(); } else { this.code = null; } @@ -47,8 +47,8 @@ public class LisReportItem { } public void setName(String name) { - if (StringUtils.isBlank(name)) { - this.name = name; + if (StringUtils.isNotBlank(name)) { + this.name = name.trim(); } else { this.name = null; } @@ -59,8 +59,8 @@ public class LisReportItem { } public void setResult(String result) { - if (StringUtils.isBlank(result)) { - this.result = result; + if (StringUtils.isNotBlank(result)) { + this.result = result.trim(); } else { this.result = null; } @@ -71,8 +71,8 @@ public class LisReportItem { } public void setCharResult(String charResult) { - if (StringUtils.isBlank(charResult)) { - this.charResult = charResult; + if (StringUtils.isNotBlank(charResult)) { + this.charResult = charResult.trim(); } else { this.charResult = null; } @@ -83,8 +83,8 @@ public class LisReportItem { } public void setNumberResult(String numberResult) { - if (StringUtils.isBlank(numberResult)) { - this.numberResult = numberResult; + if (StringUtils.isNotBlank(numberResult)) { + this.numberResult = numberResult.trim(); } else { this.numberResult = null; } @@ -95,8 +95,8 @@ public class LisReportItem { } public void setFlag(String flag) { - if (StringUtils.isBlank(flag)) { - this.flag = flag; + if (StringUtils.isNotBlank(flag)) { + this.flag = flag.trim(); } else { this.flag = null; } @@ -107,8 +107,8 @@ public class LisReportItem { } public void setRef(String ref) { - if (StringUtils.isBlank(ref)) { - this.ref = ref; + if (StringUtils.isNotBlank(ref)) { + this.ref = ref.trim(); } else { this.ref = null; } @@ -119,8 +119,8 @@ public class LisReportItem { } public void setUnit(String unit) { - if (StringUtils.isBlank(unit)) { - this.unit = unit; + if (StringUtils.isNotBlank(unit)) { + this.unit = unit.trim(); } else { this.unit = null; } @@ -131,8 +131,8 @@ public class LisReportItem { } public void setResultType(String resultType) { - if (StringUtils.isBlank(resultType)) { - this.resultType = resultType; + if (StringUtils.isNotBlank(resultType)) { + this.resultType = resultType.trim(); } else { this.resultType = null; }