Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/CssdMessageWebServiceV4Impl.java =================================================================== diff -u -r41003 -r41102 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/CssdMessageWebServiceV4Impl.java (.../CssdMessageWebServiceV4Impl.java) (revision 41003) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/CssdMessageWebServiceV4Impl.java (.../CssdMessageWebServiceV4Impl.java) (revision 41102) @@ -807,7 +807,9 @@ boolean isOperationEndStatus = (StringUtils.equals(newUseRecord.getOperationStatus(), UseRecord.OPERATION_STATUS_END_OPERATION) || StringUtils.equals(newUseRecord.getOperationStatus(), UseRecord.OPERATION_STATUS_OUT_OPERATIONROOM) || StringUtils.equals(newUseRecord.getOperationStatus(), UseRecord.OPERATION_STATUS_END_ANESTHESIA)); - if(isOperationEndStatus){ + //QHRSGZZYY-22当手麻系统调用此接口传输到我们系统生成的使用记录单需直接进行回收单的转换操作 + boolean enableTheDirectConversionOfPushedUseRecordsIntoRecycleRecord = ConfigUtils.getSystemSetConfigByNameBool("enableTheDirectConversionOfPushedUseRecordsIntoRecycleRecord"); + if(isOperationEndStatus || enableTheDirectConversionOfPushedUseRecordsIntoRecycleRecord){ // 手术状态为“手术结束”或者手术结束之后的状态的使用记录,也需要自动审核并生成申请单 String applicationFormType = ConfigUtils.getSystemSetConfigByName("applicationFormType", ""); String appType = InvoicePlan.TYPE_COMBO_FORM; Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/CssdUseRecordServiceV4Impl.java =================================================================== diff -u -r41002 -r41102 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/CssdUseRecordServiceV4Impl.java (.../CssdUseRecordServiceV4Impl.java) (revision 41002) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/CssdUseRecordServiceV4Impl.java (.../CssdUseRecordServiceV4Impl.java) (revision 41102) @@ -669,7 +669,9 @@ boolean isOperationEndStatus = (StringUtils.equals(newUseRecord.getOperationStatus(), UseRecord.OPERATION_STATUS_END_OPERATION) || StringUtils.equals(newUseRecord.getOperationStatus(), UseRecord.OPERATION_STATUS_OUT_OPERATIONROOM) || StringUtils.equals(newUseRecord.getOperationStatus(), UseRecord.OPERATION_STATUS_END_ANESTHESIA)); - if(isOperationEndStatus){ + //QHRSGZZYY-22当手麻系统调用此接口传输到我们系统生成的使用记录单需直接进行回收单的转换操作 + boolean enableTheDirectConversionOfPushedUseRecordsIntoRecycleRecord = ConfigUtils.getSystemSetConfigByNameBool("enableTheDirectConversionOfPushedUseRecordsIntoRecycleRecord"); + if(isOperationEndStatus || enableTheDirectConversionOfPushedUseRecordsIntoRecycleRecord){ String applicationFormType = ConfigUtils.getSystemSetConfigByName("applicationFormType", ""); String appType = InvoicePlan.TYPE_COMBO_FORM; if(StringUtils.equals(applicationFormType, "2")){ Index: ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/config.js =================================================================== diff -u -r40302 -r41102 --- ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/config.js (.../config.js) (revision 40302) +++ ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/config.js (.../config.js) (revision 41102) @@ -151,5 +151,7 @@ //启用灭菌结果判定功能 enableTheSterilizationResultJudgmentFunction:true, //灭菌记录待灭菌物品列表显示方式 - listDisplayOfItemsToBeSterilized:3 + listDisplayOfItemsToBeSterilized:3, + //启用接口传输的使用记录直接转换回收记录功能 + enableTheDirectConversionOfPushedUseRecordsIntoRecycleRecord:true } \ No newline at end of file