Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java =================================================================== diff -u -r41472 -r41475 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java (.../HerpPathManagerImpl.java) (revision 41472) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java (.../HerpPathManagerImpl.java) (revision 41475) @@ -176,7 +176,7 @@ Object mainIdObj = rs.getObject("mainId"); Object useDateObj = rs.getObject("useDate"); - String useDateStr = useDateObj == null ? dateStr : DateTools.YMDHMSFORMAT.get().format((Date)useDateObj); + String useDateStr = DateTools.formatObjectDate(dateStr, useDateObj); Object treatmentNumObj = rs.getObject("treatmentNum"); Object hospitalNumObj = rs.getObject("hospitalNum"); Object patientNameObj = rs.getObject("patientName"); @@ -268,7 +268,7 @@ Object mainIdObj = rs.getObject("mainId"); Object useDateObj = rs.getObject("useDate"); - String useDateStr = useDateObj == null ? dateStr : DateTools.YMDHMSFORMAT.get().format((Date)useDateObj); + String useDateStr = DateTools.formatObjectDate(dateStr, useDateObj); Object treatmentNumObj = rs.getObject("treatmentNum"); Object hospitalNumObj = rs.getObject("hospitalNum"); Object patientNameObj = rs.getObject("patientName"); Index: forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java =================================================================== diff -u -r40612 -r41475 --- forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java (.../DateTools.java) (revision 40612) +++ forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java (.../DateTools.java) (revision 41475) @@ -1247,4 +1247,25 @@ return syncDateTime.getTime(); } + /** + * 转换日期 变为字符串 + * @param defaultValue 默认值 + * @param dateObj + * @return + */ + public static String formatObjectDate(String defaultValue, Object dateObj){ + String useDateStr; + if (dateObj == null) { + useDateStr = defaultValue; + } else if (dateObj instanceof Date) { + useDateStr = YMDHMSFORMAT.get().format((Date) dateObj); + } else if (dateObj instanceof String) { + // 如果是字符串,直接使用或进行格式转换 + useDateStr = (String) dateObj; + } else { + // 其他类型处理 + useDateStr = String.valueOf(dateObj); + } + return useDateStr; + } } Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/CommonHerpPathManagerImpl.java =================================================================== diff -u -r35346 -r41475 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/CommonHerpPathManagerImpl.java (.../CommonHerpPathManagerImpl.java) (revision 35346) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/CommonHerpPathManagerImpl.java (.../CommonHerpPathManagerImpl.java) (revision 41475) @@ -30,6 +30,7 @@ import com.forgon.disinfectsystem.entity.useRecord.UseRecord; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager; import com.forgon.disinfectsystem.useRecord.service.UseRecordManager; +import com.forgon.tools.date.DateTools; import com.forgon.tools.hibernate.ObjectDao; /** @@ -149,7 +150,7 @@ Object mainIdObj = rs.getObject("mainId"); Object useDateObj = rs.getObject("useDate"); - String useDateStr = useDateObj == null ? dateStr : sdf.format((Date)useDateObj); + String useDateStr = DateTools.formatObjectDate(dateStr, useDateObj); Object treatmentNumObj = rs.getObject("treatmentNum"); Object hospitalNumObj = rs.getObject("hospitalNum"); Object patientNameObj = rs.getObject("patientName"); @@ -241,7 +242,7 @@ Object mainIdObj = rs.getObject("mainId"); Object useDateObj = rs.getObject("useDate"); - String useDateStr = useDateObj == null ? dateStr : sdf.format((Date)useDateObj); + String useDateStr = DateTools.formatObjectDate(dateStr, useDateObj); Object treatmentNumObj = rs.getObject("treatmentNum"); Object hospitalNumObj = rs.getObject("hospitalNum"); Object patientNameObj = rs.getObject("patientName");