Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r33042 -r33062 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 33042) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 33062) @@ -609,7 +609,7 @@ String biologicalObserveDateString, String biologicalMonitoringStartDateString, String biologicalMonitoringEndDateString, String monitorUser,String monitorChecker,String monitorAuditor,String remark, String cardPosition, String monitoringTubeResult, String monitoringBatchNum, String monitoringTubeExpiryDate, - String cardPositionOfControlTube, String controlTubeResult, String controlBatchNum, String controlTubeExpiryDate); + String cardPositionOfControlTube, String controlTubeResult, String controlBatchNum, String controlTubeExpiryDate, String pcdMonitoringResult); /** * 灭菌中断的灭菌记录如果已经有重新灭菌的灭菌记录了,就不能再点重新灭菌 继续灭菌 * @param sterilizationRecordId Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r32652 -r33062 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 32652) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 33062) @@ -494,10 +494,10 @@ String biologicalObserveDateString, String biologicalMonitoringStartDateString, String biologicalMonitoringEndDateString, String monitorUser,String monitorChecker,String monitorAuditor,String remark, String cardPosition, String monitoringTubeResult, String monitoringBatchNum, String monitoringTubeExpiryDate, - String cardPositionOfControlTube, String controlTubeResult, String controlBatchNum, String controlTubeExpiryDate) { + String cardPositionOfControlTube, String controlTubeResult, String controlBatchNum, String controlTubeExpiryDate, String pcdMonitoringResult) { JSONObject obj = new JSONObject(); try { - obj = sterilizationRecordManager.saveMonitorResult(bioreaderId, recordID, physicsResult, chemistryResult, biologyResult, cycleCounter, biologicalObserveDateString, biologicalMonitoringStartDateString, biologicalMonitoringEndDateString, monitorUser, monitorChecker, monitorAuditor, remark, cardPosition, monitoringTubeResult, monitoringBatchNum, monitoringTubeExpiryDate, cardPositionOfControlTube, controlTubeResult, controlBatchNum, controlTubeExpiryDate); + obj = sterilizationRecordManager.saveMonitorResult(bioreaderId, recordID, physicsResult, chemistryResult, biologyResult, cycleCounter, biologicalObserveDateString, biologicalMonitoringStartDateString, biologicalMonitoringEndDateString, monitorUser, monitorChecker, monitorAuditor, remark, cardPosition, monitoringTubeResult, monitoringBatchNum, monitoringTubeExpiryDate, cardPositionOfControlTube, controlTubeResult, controlBatchNum, controlTubeExpiryDate, pcdMonitoringResult); } catch (Exception e) { e.printStackTrace(); obj.put("success", false); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r33042 -r33062 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 33042) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 33062) @@ -7215,7 +7215,7 @@ String cardPosition, String monitoringTubeResult, String monitoringBatchNum, String monitoringTubeExpiryDate, String cardPositionOfControlTube, String controlTubeResult, - String controlBatchNum, String controlTubeExpiryDate) { + String controlBatchNum, String controlTubeExpiryDate, String pcdMonitoringResult) { JSONObject obj = new JSONObject(); if (StringUtils.isNotBlank(recordID)) { SterilizationRecord record = getSterilizationRecordById(Long.valueOf(recordID)); @@ -7256,6 +7256,9 @@ if("".equals(controlTubeExpiryDate)){ controlTubeExpiryDate = null; } + if("pcdMonitoringResult".equals(pcdMonitoringResult)){ + pcdMonitoringResult = null; + } //解决:ASSLQYQRZ-26 监测核对员未录入,生物监测状态变成已确认 if("".equals(monitorUser)){ monitorUser = null; @@ -7271,6 +7274,7 @@ bioreader.setId(Long.valueOf(bioreaderId)); record.setBioreader(bioreader); } + record.setPcdMonitoringResult(pcdMonitoringResult); record.setCardPosition(cardPosition); record.setMonitoringTubeResult(monitoringTubeResult); record.setMonitoringBatchNum(monitoringBatchNum); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java =================================================================== diff -u -r29470 -r33062 --- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java (.../BiologyMonitoringWarningTest.java) (revision 29470) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java (.../BiologyMonitoringWarningTest.java) (revision 33062) @@ -97,7 +97,7 @@ c.add(Calendar.MINUTE, 5); String time = ForgonDateUtils.safelyFormatDate(c.getTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, ""); sterilizationRecordTableManager.saveMonitorResult(null,sr1.getId().toString(), SterilizationRecord.MONITOR_RESULT_QUALIFIED, SterilizationRecord.MONITOR_RESULT_QUALIFIED, - SterilizationRecord.MONITOR_RESULT_NO, 10, null,time, time, null, null, null, "备注",null,null,null,null,null,null,null,null); + SterilizationRecord.MONITOR_RESULT_NO, 10, null,time, time, null, null, null, "备注",null,null,null,null,null,null,null,null,null); session.flush(); biologyMonitorWarningManager.timingUpdateBiologicalMonitoringStatus(Constants.TEST_NG); session.refresh(sr1); @@ -123,7 +123,7 @@ //模拟生物监测“已确认”的场景(此时生物监测状态为“已确认”,定时器不会修改其生物监测的状态) time = ForgonDateUtils.safelyFormatDate(c.getTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, ""); sterilizationRecordTableManager.saveMonitorResult(null,sr1.getId().toString(), SterilizationRecord.MONITOR_RESULT_QUALIFIED, SterilizationRecord.MONITOR_RESULT_QUALIFIED, - SterilizationRecord.MONITOR_RESULT_QUALIFIED, 10, null, time, time, userName, userName, userName, "备注", null,null,null,null,null,null,null,null); + SterilizationRecord.MONITOR_RESULT_QUALIFIED, 10, null, time, time, userName, userName, userName, "备注", null,null,null,null,null,null,null,null,null); session.flush(); assertEquals(sr1.getBiologicalMonitoringStatus(), SterilizationRecord.BIOLOGICALMONITORING_STATUS_CHECK); objectDao.executeUpdate(String.format("delete from BiologyMonitorWarning where userName='%s' and departCode='%s'", userName, currentOrgUnitCode)); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r33037 -r33062 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 33037) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 33062) @@ -406,7 +406,11 @@ /** * 灭菌器运行记录表体现内容(自定义表单) */ - public FormInstance runTableRecordFormInstance; + public FormInstance runTableRecordFormInstance; + /** + * PCD监测结果 + */ + public String pcdMonitoringResult; @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { @@ -1111,4 +1115,13 @@ public void setRunTableRecordFormInstance(FormInstance runTableRecordFormInstance) { this.runTableRecordFormInstance = runTableRecordFormInstance; } + + public String getPcdMonitoringResult() { + return pcdMonitoringResult; + } + + public void setPcdMonitoringResult(String pcdMonitoringResult) { + this.pcdMonitoringResult = pcdMonitoringResult; + } + }