Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r15315 -r15317 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 15315) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 15317) @@ -113,6 +113,8 @@ private String chemistryResult;// 化学监测结果 private String biologyResult; // 生物监测结果 private Date biologicalMonitoringEndDate; // 生物监测的结束时间(这里要说明的是:生物监测的开始时间就是灭菌的结束时间) + private String monitorUser; //监测员 + private String monitorChecker; //监测核对员 // 统计本炉次各种包总数 private Integer tousseAmount;// 内部包总数 @@ -448,6 +450,22 @@ public void setBiologicalMonitoringEndDate(Date biologicalMonitoringEndDate) { this.biologicalMonitoringEndDate = biologicalMonitoringEndDate; } + + public String getMonitorUser() { + return monitorUser; + } + + public void setMonitorUser(String monitorUser) { + this.monitorUser = monitorUser; + } + + public String getMonitorChecker() { + return monitorChecker; + } + + public void setMonitorChecker(String monitorChecker) { + this.monitorChecker = monitorChecker; + } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r15314 -r15317 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 15314) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 15317) @@ -300,14 +300,16 @@ }; public boolean saveMonitorResult(String recordID, String physicsResult, - String chemistryResult, String biologyResult,long cycleCounter, String biologicalMonitoringEndDateString) { + String chemistryResult, String biologyResult,long cycleCounter, String biologicalMonitoringEndDateString, String monitorUser,String monitorChecker) { if (StringUtils.isNotBlank(recordID)) { SterilizationRecord record = sterilizationRecordManager .getSterilizationRecordById(Long.valueOf(recordID)); if (record != null) { try { Date biologicalMonitoringEndDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringEndDateString); record.setBiologicalMonitoringEndDate(biologicalMonitoringEndDate); + record.setMonitorUser(monitorUser); //监测员 + record.setMonitorChecker(monitorChecker); //监测核对人 } catch (ParseException e) { // TODO Auto-generated catch block System.out.println("输入的生物监测结束时间格式不对,就更新这个结束时间了"); Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp =================================================================== diff -u -r15253 -r15317 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 15253) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 15317) @@ -46,6 +46,7 @@ +