Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/controller/WashAndDisinfectRecordController.java =================================================================== diff -u -r34972 -r35467 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/controller/WashAndDisinfectRecordController.java (.../WashAndDisinfectRecordController.java) (revision 34972) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/controller/WashAndDisinfectRecordController.java (.../WashAndDisinfectRecordController.java) (revision 35467) @@ -252,9 +252,9 @@ } catch (Exception e) { result = buildJsonObject(1, "保存失败:" + e.getMessage()); } finally { - if(inputStreamReader != null){ + if(streamReader != null){ try { - inputStreamReader.close(); + streamReader.close(); } catch (Exception e) {} } if(inputStreamReader != null){ Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r34972 -r35467 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 34972) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 35467) @@ -5419,10 +5419,10 @@ washRecord.setOrgUnitCoding(rinser.getOrgUnitCoding()); washRecord.setDisinfectIdentification(washMachineName); washRecord.setDisinfectProgram(processStepName); - washRecord.setEndDate(new Date(startTime)); + washRecord.setEndDate(new Date(finishTime)); washRecord.setOperator(operator); washRecord.setOperatorCode(operatorCode); - washRecord.setStartDate(new Date(finishTime)); + washRecord.setStartDate(new Date(startTime)); //清洗责任人默认取清洗操作人 washRecord.setWashPersonInCharge(operator); washRecord.setWashPersonInChargeCode(operatorCode);