Index: ssts-web/src/test/java/test/forgon/constant/Constants.java =================================================================== diff -u -r16891 -r17178 --- ssts-web/src/test/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 16891) +++ ssts-web/src/test/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 17178) @@ -50,4 +50,8 @@ * 测试外科名称 */ public static final String ORG_UNIT_NAME_WAIKE= "测试外科"; + /** + * testNG测试框架的标识 + */ + public static final String TEST_NG= "testNG"; } Index: ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java =================================================================== diff -u -r17165 -r17178 --- ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java (.../BiologyMonitorWarningManagerImpl.java) (revision 17165) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java (.../BiologyMonitorWarningManagerImpl.java) (revision 17178) @@ -106,7 +106,7 @@ //config.js配置的:生物监测结束时是否需要提示 boolean biologicalMonitoringWarning = CssdUtils.getSystemSetConfigByNameBool("biologicalMonitoringWarning"); if (biologicalMonitoringWarning - || "testNG".equals(flag)) { + || test.forgon.constant.Constants.TEST_NG.equals(flag)) { String nowTimeSqlStr = dateQueryAdapter.dateAdapter(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(new Date())); String sql = String.format("update SterilizationRecord set biologicalMonitoringStatus=case when monitorChecker is null then '%s' else '%s' end " + "where biologicalMonitoringEndDate<=%s and biologicalMonitoringStatus='%s'", Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java =================================================================== diff -u -r17167 -r17178 --- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java (.../BiologyMonitoringWarningTest.java) (revision 17167) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java (.../BiologyMonitoringWarningTest.java) (revision 17178) @@ -78,7 +78,7 @@ Collection srIds = Collections.singleton(sr1.getId()); sterilizationRecordManager.completeSterilization(srIds, currentOrgUnitCode, userFullName, userFullName, false); session.flush(); - biologyMonitorWarningManager.timingUpdateBiologicalMonitoringStatus("testNG"); + biologyMonitorWarningManager.timingUpdateBiologicalMonitoringStatus(test.forgon.constant.Constants.TEST_NG); session.refresh(sr1); assertEquals(sr1.getBiologicalMonitoringStatus(), SterilizationRecord.BIOLOGICALMONITORING_STATUS_NOTDO); result = biologyMonitorWarningManager.getBiologyMonitorWarningByUserNameAndCurrentDepartCode(userName, currentOrgUnitCode); @@ -90,7 +90,7 @@ sterilizationRecordTableManager.saveMonitorResult(sr1.getId().toString(), SterilizationRecord.MONITOR_RESULT_QUALIFIED, SterilizationRecord.MONITOR_RESULT_QUALIFIED, SterilizationRecord.MONITOR_RESULT_NO, 10, time, time, null, null, null, "备注"); session.flush(); - biologyMonitorWarningManager.timingUpdateBiologicalMonitoringStatus("testNG"); + biologyMonitorWarningManager.timingUpdateBiologicalMonitoringStatus(test.forgon.constant.Constants.TEST_NG); session.refresh(sr1); assertEquals(sr1.getBiologicalMonitoringStatus(), SterilizationRecord.BIOLOGICALMONITORING_STATUS_BEGIN); result = biologyMonitorWarningManager.getBiologyMonitorWarningByUserNameAndCurrentDepartCode(userName, currentOrgUnitCode); @@ -100,7 +100,7 @@ c.add(Calendar.MINUTE, -6); sr1.setBiologicalMonitoringEndDate(c.getTime()); session.flush(); - biologyMonitorWarningManager.timingUpdateBiologicalMonitoringStatus("testNG"); + biologyMonitorWarningManager.timingUpdateBiologicalMonitoringStatus(test.forgon.constant.Constants.TEST_NG); session.refresh(sr1); assertEquals(sr1.getBiologicalMonitoringStatus(), SterilizationRecord.BIOLOGICALMONITORING_STATUS_END); result = biologyMonitorWarningManager.getBiologyMonitorWarningByUserNameAndCurrentDepartCode(userName, currentOrgUnitCode);