Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r15350 -r15369 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 15350) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 15369) @@ -59,6 +59,7 @@ import com.forgon.tools.GB2WB; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.string.StringTools; /** * @author panhaowen @@ -185,15 +186,15 @@ JSONObject obj = new JSONObject(); ForeignTousseApplication app = getById(id); - String clinicNumber = CssdUtils.null2emptyString(app + String clinicNumber = StringTools.defaultString(app .getClinicNumber()); - String hospitalNumber = CssdUtils.null2emptyString(app.getHospitalNumber()); - String doctor = CssdUtils.null2emptyString(app.getDoctor()); - String patient = CssdUtils.null2emptyString(app.getPatient()); + String hospitalNumber = StringTools.defaultString(app.getHospitalNumber()); + String doctor = StringTools.defaultString(app.getDoctor()); + String patient = StringTools.defaultString(app.getPatient()); String applicationItemTotal = ""; - String patientArea = CssdUtils.null2emptyString(app.getPatientArea()); - String bedNumber = CssdUtils.null2emptyString(app.getBedNumber()); - String ascriptionDepartment = CssdUtils.null2emptyString(app.getAscriptionDepartment()); + String patientArea = StringTools.defaultString(app.getPatientArea()); + String bedNumber = StringTools.defaultString(app.getBedNumber()); + String ascriptionDepartment = StringTools.defaultString(app.getAscriptionDepartment()); List ls = app .getApplicationItems(); int toolsAmount = 0; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r15356 -r15369 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 15356) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 15369) @@ -735,17 +735,4 @@ } return vos; } - /** - * 如果字符串为null,则输出"",否则返回原始字符串 - * @param text 原始字符串 - * @return - */ - public static String null2emptyString(String text){ - if (text == null){ - return ""; - } - else{ - return text; - } - } }