Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java =================================================================== diff -u -r35346 -r41472 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java (.../HerpPathManagerImpl.java) (revision 35346) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java (.../HerpPathManagerImpl.java) (revision 41472) @@ -32,6 +32,7 @@ import com.forgon.disinfectsystem.useRecord.hrepPath.CommonHerpPathManagerImpl; import com.forgon.disinfectsystem.useRecord.hrepPath.HerpPathManager; import com.forgon.disinfectsystem.useRecord.service.UseRecordManager; +import com.forgon.tools.date.DateTools; import com.forgon.tools.hibernate.ObjectDao; /** @@ -175,7 +176,7 @@ Object mainIdObj = rs.getObject("mainId"); Object useDateObj = rs.getObject("useDate"); - String useDateStr = useDateObj == null ? dateStr : sdf.format((Date)useDateObj); + String useDateStr = useDateObj == null ? dateStr : DateTools.YMDHMSFORMAT.get().format((Date)useDateObj); Object treatmentNumObj = rs.getObject("treatmentNum"); Object hospitalNumObj = rs.getObject("hospitalNum"); Object patientNameObj = rs.getObject("patientName"); @@ -267,7 +268,7 @@ Object mainIdObj = rs.getObject("mainId"); Object useDateObj = rs.getObject("useDate"); - String useDateStr = useDateObj == null ? dateStr : sdf.format((Date)useDateObj); + String useDateStr = useDateObj == null ? dateStr : DateTools.YMDHMSFORMAT.get().format((Date)useDateObj); Object treatmentNumObj = rs.getObject("treatmentNum"); Object hospitalNumObj = rs.getObject("hospitalNum"); Object patientNameObj = rs.getObject("patientName"); @@ -409,11 +410,11 @@ //录入日期取中间表的日期 try{ - useRecord.setEnteringDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(patientInfo.getOperationTime())); + useRecord.setEnteringDate(DateTools.YMDHMSFORMAT.get().parse(patientInfo.getOperationTime())); }catch(Exception e){ logger.debug("使用记录录入日期转换赋值失败"); try{ - useRecord.setEnteringDate(new SimpleDateFormat("yyyy-MM-dd").parse(patientInfo.getOperationTime())); + useRecord.setEnteringDate(DateTools.YMDFORMAT.get().parse(patientInfo.getOperationTime())); }catch(Exception e1){ useRecord.setEnteringDate(now); logger.debug("使用记录录入日期转换赋值失败");