Index: ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java =================================================================== diff -u -r17180 -r20890 --- ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java (.../BiologyMonitorWarningManagerImpl.java) (revision 17180) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java (.../BiologyMonitorWarningManagerImpl.java) (revision 20890) @@ -102,11 +102,11 @@ } @Override - public void timingUpdateBiologicalMonitoringStatus(String flag) { - //config.js配置的：生物监测结束时是否需要提示 - boolean biologicalMonitoringWarning = CssdUtils.getSystemSetConfigByNameBool("biologicalMonitoringWarning"); - if (biologicalMonitoringWarning - || Constants.TEST_NG.equals(flag)) { + public void timingUpdateBiologicalMonitoringStatus(String testNGFlag) { + //config.js配置的：在灭菌视图界面是否显示“生物监测的状态”属性 + boolean showBiologicalMonitoringStatus = CssdUtils.getSystemSetConfigByNameBool("showBiologicalMonitoringStatus"); + if (showBiologicalMonitoringStatus + || Constants.TEST_NG.equals(testNGFlag)) { 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/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r19303 -r20890 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 19303) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 20890) @@ -680,7 +680,7 @@ {header : "灭菌炉",width : 160,dataIndex : 'sterilizer.name'}, {header : "炉次",width : 40,dataIndex : 'frequency'}, {header : "灭菌状态",width : 60,dataIndex : 'status', renderer : renderColor}, - {header : "生物监测状态",width : 80,dataIndex : 'biologicalMonitoringStatus',renderer : renderBiologicalMonitoringStatus, hidden : !sstsConfig.biologicalMonitoringWarning}, + {header : "生物监测状态",width : 80,dataIndex : 'biologicalMonitoringStatus',renderer : renderBiologicalMonitoringStatus, hidden : !sstsConfig.showBiologicalMonitoringStatus}, {id : 'SterilizationType',header : "灭菌程序",width : 60,dataIndex : 'sterilizationType'}, {header : "灭菌总数量",width : 70,dataIndex : 'amount'}, {header : "灭菌器参数",width : 70,dataIndex : 'sterilizerRecordAmount',sortable :false,renderer: function(v,p,record){ Index: ssts-web/src/main/resources/spring/projects/qysrmyy/timer.xml =================================================================== diff -u --- ssts-web/src/main/resources/spring/projects/qysrmyy/timer.xml (revision 0) +++ ssts-web/src/main/resources/spring/projects/qysrmyy/timer.xml (revision 20890) @@ -0,0 +1,36 @@ + + + + + + + + + + + timingUpdateBiologicalMonitoringStatus + + + qysrmyy + + + + + + + + + 0 */1 * * * ? + + + + + + + + + + + + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js =================================================================== diff -u -r20872 -r20890 --- ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js (.../config.js) (revision 20872) +++ ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js (.../config.js) (revision 20890) @@ -60,8 +60,12 @@ disinfectionDateProcessTypeInDirectPackingView:1, //装配页面是否显示包装人,true为显示,false为不显示,默认为不显示 showWrapperField : true, - //生物监测结束时是否需要提示:true：表示要提示 false或者没有配置：都不提示 + //发货时针对包含植入物的器械包，是否要提示生物监测的情况（为true表示要提示,为false或者没有配置,都不提示） + biologicalMonitoringEnable : true, + //生物监测结束时是否需要提示（为true表示要提示,为false或者没有配置,都不提示） biologicalMonitoringWarning : true, + //在灭菌视图界面是否显示“生物监测的状态”属性(为true则显示，false或者未配置则不显示) + showBiologicalMonitoringStatus: true, //自定义装配界面是否显示选择申请科室:true：显示选择申请科室,但不是必须选择的 false或者没有配置:不显示 selectDepartInCustomPacking : true, //触摸屏清洗默认清洗机条码 @@ -80,8 +84,6 @@ canUseBarcodeTypes : ['中标签'], //是否启用回收的备注。如果为true,在装配的时候，能看到回收时添加的备注信息。回收点击申请数量可以添加备注。默认为false enableRecyclingItemRemark:true, - //发货时针对有植入物的器械包，是否要提示生物检测的情况 - biologicalMonitoringEnable:true, // 当有丢失、报损时允许不补充材料即可装配 allowPackingWhenUnSupplementMaterial:true, //发货数量依据回收单,回收后发货的情况下,打印未回收的申请单,是否打印申请数量。 Index: ssts-web/src/main/resources/spring/projects/cdlqyq1yy/timer.xml =================================================================== diff -u --- ssts-web/src/main/resources/spring/projects/cdlqyq1yy/timer.xml (revision 0) +++ ssts-web/src/main/resources/spring/projects/cdlqyq1yy/timer.xml (revision 20890) @@ -0,0 +1,36 @@ + + + + + + + + + + + timingUpdateBiologicalMonitoringStatus + + + cdlqyq1yy + + + + + + + + + 0 */1 * * * ? + + + + + + + + + + + + \ No newline at end of file Index: ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManager.java =================================================================== diff -u -r17165 -r20890 --- ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManager.java (.../BiologyMonitorWarningManager.java) (revision 17165) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManager.java (.../BiologyMonitorWarningManager.java) (revision 20890) @@ -23,7 +23,8 @@ /** * （定时器）每隔一分钟检查，有哪些灭菌记录的生物监测已经结束，并且更改其状态为“已结束”，如用户把核对员也提前填好了，那么直接修改状态为“已确认” + * @param testNGFlag testNG测试框架的标识，如果是testNG测试用例调用的，需要立即执行方法里面的代码 * */ - public void timingUpdateBiologicalMonitoringStatus(String flag); + public void timingUpdateBiologicalMonitoringStatus(String testNGFlag); } Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js =================================================================== diff -u -r20510 -r20890 --- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 20510) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 20890) @@ -90,10 +90,12 @@ saveUseRecordPrompt : false, //使用记录点击审核并生成申请时是否需要提示"手术是否已完成，不需要追加器械包？"字样,为true时才给予提示，没配或者为false则不提示 auditAndConvertUseRecordConfirmMessage : true, - //发货时针对对植入物的器械包，是否要提示生物检测的情况,为true表示要提示,为false或者没有配置,都不提示 + //发货时针对包含植入物的器械包，是否要提示生物监测的情况（为true表示要提示,为false或者没有配置,都不提示） biologicalMonitoringEnable : true, - //生物监测结束时是否需要提示,为true表示要提示,为false或者没有配置,都不提示 + //生物监测结束时是否需要提示（为true表示要提示,为false或者没有配置,都不提示） biologicalMonitoringWarning : true, + //在灭菌视图界面是否显示“生物监测的状态”属性(为true则显示，false或者未配置则不显示) + showBiologicalMonitoringStatus: true, //自定义装配界面是否选择科室 selectDepartInCustomPacking : true, Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js =================================================================== diff -u -r20651 -r20890 --- ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js (.../config.js) (revision 20651) +++ ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js (.../config.js) (revision 20890) @@ -60,6 +60,8 @@ packAmountProcessTypeInDirectPackingView:1, // 装配界面隐藏审核人 hideReviewerField:false, + //在灭菌视图界面是否显示“生物监测的状态”属性(为true则显示，false或者未配置则不显示) + showBiologicalMonitoringStatus: true, // 装配界面显示包装人 showWrapperField:false, // 自定义装配界面,灭菌日期的处理方式,,0或者未定义:清空,1:表示保留当前值,2表示设置回默认值。其他值跟1一样，保留当前值