Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r28629 -r28640 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 28629) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 28640) @@ -7285,6 +7285,22 @@ if (bd instanceof TousseInstance) { TousseInstance ti = (TousseInstance) bd; + // 获取器械包的祖先包 + TousseDefinition ancestor = ti.getTousseDefinition(); + if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(ancestor.getTousseType()) + || TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(ancestor.getTousseType())){ + // 消毒物品、外来器械包需要根据祖先包进行判断 + if(ancestor.getAncestorID() != null && ancestor.getAncestorID().intValue() != 0){ + ancestor = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), ancestor.getAncestorID()); + } + } else if(ancestor.isSplit()){ + // 外来器械拆分小包 + TousseDefinition td = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), ancestor.getParentID()); + if(td.getAncestorID() != null && td.getAncestorID().intValue() != 0){ + ancestor = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), td.getAncestorID()); + } + } + //判断该条码的包实例是否为固定条码包实例(如果为固定条码则找出该包定义符合录使用记录条件的且失效期还未过且最早失效的包实例) if(ti.getTousseFixedBarcode()){ ti = getTousseInstanceForUseRecord(ti.getTousseDefinition(), scanedBarcodes, currentOrgUnitCode); @@ -7372,6 +7388,9 @@ } else if(!TousseInstance.STATUS_SHIPPED.equals(ti.getStatus()) && !TousseInstance.STATUS_SIGNED.equals(ti.getStatus())){ obj.put(JSONUtil.JSON_KEY_MESSAGE, "该器械包状态为" + ti.getStatus() + ",不能录入使用记录！"); return obj; + } else if(!TousseInstance.STATUS_SIGNED.equals(ti.getStatus()) && Constants.STR_YES.equals(ancestor.getRegistUseRecordAfterSigned())){ + obj.put(JSONUtil.JSON_KEY_MESSAGE, "【" + ti.getTousseName() + "】没有签收，必须签收后才允许使用！"); + return obj; //是否开启配置项，验证添加使用记录时物品是否已位于手术间；（物品位于手术间，或者流转位置类型为手术间） } else if(CssdUtils.getSystemSetConfigByNameBool("checkTousseLocatedInOperatingRoomWhenAddUseRecord", false) && StringUtils.isBlank(ti.getOperationRoomName()) && !"手术间".equals(ti.getLocation2Type())){ @@ -7380,8 +7399,11 @@ }else { List acceptStatus = new ArrayList<>(); //已发货未签收的包是否可以录使用记录 - boolean notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByNameBool("notSignedItemsCanRegistUseRecord"); - if(notSignedItemsCanRegistUseRecord){ + //boolean notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByNameBool("notSignedItemsCanRegistUseRecord"); + //if(notSignedItemsCanRegistUseRecord){ + // acceptStatus.add(TousseInstance.STATUS_SHIPPED); + //} + if(!Constants.STR_YES.equals(ancestor.getRegistUseRecordAfterSigned())){ acceptStatus.add(TousseInstance.STATUS_SHIPPED); } acceptStatus.add(TousseInstance.STATUS_SIGNED); @@ -7429,6 +7451,8 @@ JSONUtil.addProperty(obj, "operator", ti.getOperator()); JSONUtil.addProperty(obj, "remark", ti.getRemark()); JSONUtil.addProperty(obj, "materialInstances", td.getMaterialInstancesJsonArray()); + //签收后录入使用记录 + obj.put("registUseRecordAfterSigned", StringUtils.isBlank(ancestor.getRegistUseRecordAfterSigned()) ? Constants.STR_NO : ancestor.getRegistUseRecordAfterSigned()); }else{ obj.put(JSONUtil.JSON_KEY_MESSAGE, "该器械包所属科室为" + ti.getLocationForDisplay() + ",未配置与当前科室共用,不能录入使用记录！"); return obj; @@ -7480,6 +7504,8 @@ JSONUtil.addProperty(obj, "operator", ti.getOperator()); JSONUtil.addProperty(obj, "remark", ti.getRemark()); JSONUtil.addProperty(obj, "materialInstances", td.getMaterialInstancesJsonArray()); + //签收后录入使用记录 + obj.put("registUseRecordAfterSigned", StringUtils.isBlank(ancestor.getRegistUseRecordAfterSigned()) ? Constants.STR_NO : ancestor.getRegistUseRecordAfterSigned()); }else{ obj.put(JSONUtil.JSON_KEY_MESSAGE, "该器械包所属科室为" + ti.getLocationForDisplay() + ",不能录入使用记录！"); return obj; @@ -7758,6 +7784,8 @@ JSONUtil.addProperty(data, "operator", obj.opt("operator")); JSONUtil.addProperty(data, "remark", obj.opt("remark")); JSONUtil.addProperty(data, "materialInstances", obj.opt("materialInstances")); + //签收后录入使用记录 + JSONUtil.addProperty(data, "registUseRecordAfterSigned", obj.opt("registUseRecordAfterSigned")); JSONUtil.addDataProperty(obj, data); return obj; } @@ -7851,10 +7879,17 @@ } String statusCondition = "'"+ TousseInstance.STATUS_SIGNED +"'"; //已发货未签收的包是否可以录使用记录 - boolean notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByNameBool("notSignedItemsCanRegistUseRecord" , true); + /*boolean notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByNameBool("notSignedItemsCanRegistUseRecord" , true); if(notSignedItemsCanRegistUseRecord){ statusCondition += ",'"+ TousseInstance.STATUS_SHIPPED +"'"; + }*/ + TousseDefinition ancestor = td; + if(td.getAncestorID() != null && td.getAncestorID().intValue() != 0){ + ancestor = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), td.getAncestorID()); } + if(!Constants.STR_YES.equals(ancestor.getRegistUseRecordAfterSigned())){ + statusCondition += ",'"+ TousseInstance.STATUS_SHIPPED +"'"; + } sql += " and status in ("+ statusCondition +")"; sql += " order by validUntil "; return (TousseInstance)objectDao.getBySql(TousseInstance.class.getSimpleName(), sql); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r28631 -r28640 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 28631) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 28640) @@ -662,6 +662,12 @@ */ private Long foreignComboId; + /** + * 签收后录入使用记录(JMSZXYY-88 器械包定义增加【签收后录入使用记录】字段) + * 为“是”时，该器械包必须签收后才能录入使用记录;默认为“否” + */ + private String registUseRecordAfterSigned = Constants.STR_NO; + @Override @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -2174,6 +2180,15 @@ this.foreignComboId = foreignComboId; } + public String getRegistUseRecordAfterSigned() { + return registUseRecordAfterSigned; + } + + + public void setRegistUseRecordAfterSigned(String registUseRecordAfterSigned) { + this.registUseRecordAfterSigned = registUseRecordAfterSigned; + } + @Override public String toString() { return "{\"id\":\"" + id + "\", \"name\":\"" + name Index: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r28587 -r28640 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 28587) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 28640) @@ -25,7 +25,7 @@ "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3","4.9.4","4.9.5","4.9.6", "4.9.7","4.9.8","4.9.9","4.9.10","4.9.11","4.9.12","4.9.13","4.9.14","4.9.15","4.9.16","4.9.17","4.9.18","4.9.19","4.9.20","4.9.21","4.9.22","4.9.23","4.9.24", "4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35","4.9.36","4.9.37","4.9.38","4.9.39","4.9.40","4.9.41","4.9.42","4.9.43","4.9.44", - "4.9.45","4.9.46","4.9.47"}; + "4.9.45","4.9.46","4.9.47","4.9.48"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r28631 -r28640 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 28631) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 28640) @@ -3538,6 +3538,9 @@ if(!StringUtils.equals(origineTd.getExplain(), tousseDefinition.getExplain())){ modifyContent.append("字段：清洗消毒特别要求和说明，原值：").append(origineTd.getExplain()).append("，新值：").append(tousseDefinition.getExplain()).append("。"); } + if(!StringUtils.equals(origineTd.getRegistUseRecordAfterSigned(), tousseDefinition.getRegistUseRecordAfterSigned())){ + modifyContent.append("字段：签收后录入使用记录，原值：").append(origineTd.getRegistUseRecordAfterSigned()).append("，新值：").append(tousseDefinition.getRegistUseRecordAfterSigned()).append("。"); + } return modifyContent.toString(); } Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/mobilenursing/common/service/MobileNursingWebServiceImpl.java =================================================================== diff -u -r27414 -r28640 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/mobilenursing/common/service/MobileNursingWebServiceImpl.java (.../MobileNursingWebServiceImpl.java) (revision 27414) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/mobilenursing/common/service/MobileNursingWebServiceImpl.java (.../MobileNursingWebServiceImpl.java) (revision 28640) @@ -14,6 +14,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import com.forgon.Constants; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.model.OrgUnit; @@ -24,6 +25,7 @@ import com.forgon.disinfectsystem.datasynchronization.service.DataSynchronizationManager; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance; import com.forgon.disinfectsystem.entity.useRecord.UseDiposableGoodsItem; @@ -297,10 +299,28 @@ if(bd instanceof TousseInstance || bd instanceof IDCardInstance || bd instanceof ExpensiveDisposablegoods || bd instanceof DisposableGoodsBatch){ //未签收的包能否录使用记录 - boolean notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByNameBool("notSignedItemsCanRegistUseRecord"); + //boolean notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByNameBool("notSignedItemsCanRegistUseRecord"); if(bd instanceof TousseInstance){ TousseInstance ti = (TousseInstance)bd; - if(notSignedItemsCanRegistUseRecord){ + + // 获取器械包的祖先包 + TousseDefinition ancestor = ti.getTousseDefinition(); + if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(ancestor.getTousseType()) + || TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(ancestor.getTousseType())){ + // 消毒物品、外来器械包需要根据祖先包进行判断 + if(ancestor.getAncestorID() != null && ancestor.getAncestorID().intValue() != 0){ + ancestor = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), ancestor.getAncestorID()); + } + } else if(ancestor.isSplit()){ + // 外来器械拆分小包 + TousseDefinition td = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), ancestor.getParentID()); + if(td.getAncestorID() != null && td.getAncestorID().intValue() != 0){ + ancestor = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), td.getAncestorID()); + } + } + + //if(notSignedItemsCanRegistUseRecord){ + if(!Constants.STR_YES.equals(ancestor.getRegistUseRecordAfterSigned())){ if(ti.isShipped() || ti.isSigned()){ ti.setStatus(TousseInstance.STATUS_USED); ti.setUseRecord_id(useRecord.getId()); @@ -329,7 +349,23 @@ if(bd instanceof IDCardInstance){ IDCardInstance ii = (IDCardInstance)bd; TousseInstance ti = tousseInstanceManager.get(ii.getLastTousseInstanceId()); - if(notSignedItemsCanRegistUseRecord){ + // 获取器械包的祖先包 + TousseDefinition ancestor = ti.getTousseDefinition(); + if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(ancestor.getTousseType()) + || TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(ancestor.getTousseType())){ + // 消毒物品、外来器械包需要根据祖先包进行判断 + if(ancestor.getAncestorID() != null && ancestor.getAncestorID().intValue() != 0){ + ancestor = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), ancestor.getAncestorID()); + } + } else if(ancestor.isSplit()){ + // 外来器械拆分小包 + TousseDefinition td = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), ancestor.getParentID()); + if(td.getAncestorID() != null && td.getAncestorID().intValue() != 0){ + ancestor = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), td.getAncestorID()); + } + } + //if(notSignedItemsCanRegistUseRecord){ + if(!Constants.STR_YES.equals(ancestor.getRegistUseRecordAfterSigned())){ if(ti.isShipped() || ti.isSigned()){ ti.setStatus(TousseInstance.STATUS_USED); ti.setUseRecord_id(useRecord.getId()); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r28446 -r28640 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 28446) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 28640) @@ -2352,7 +2352,7 @@ foreignTousseApplications.get(application).add(instance); } } - String notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByName("notSignedItemsCanRegistUseRecord"); + //String notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByName("notSignedItemsCanRegistUseRecord"); for (ForeignTousseApplication application : foreignTousseApplications .keySet()) { Invoice invoice = new Invoice(); @@ -2420,7 +2420,17 @@ for (TousseInstance tousseInstance : tousseInstanceList) { tousseInstance.setStatus(TousseInstance.STATUS_SHIPPED); //如果config.js配置需要签收才能录使用记录时,则该包自动发货后状态变为已签收(仅针对二级供应室自动发货的情况做如此处理) - if("false".equalsIgnoreCase(notSignedItemsCanRegistUseRecord)){ + //if("false".equalsIgnoreCase(notSignedItemsCanRegistUseRecord)){ + TousseDefinition td = tousseInstance.getTousseDefinition(); + TousseDefinition ancestor = td; + if(td.isSplit() && DatabaseUtil.isPoIdValid(td.getParentID())){ + td = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), td.getParentID()); + } + Long ancestorId = td.getAncestorID(); + if(DatabaseUtil.isPoIdValid(ancestorId)){ + ancestor = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), ancestorId); + } + if(Constants.STR_YES.equals(ancestor.getRegistUseRecordAfterSigned())){ tousseInstance.setStatus(TousseInstance.STATUS_SIGNED); tousseInstance.setSignedDate(new Date()); tousseInstance.setSignedUser("二级供应室发货系统自动签收"); @@ -2463,12 +2473,17 @@ Map> tousseNameTousseInstances = new HashMap>(); Map proxyDisinfectionMap = new HashMap(); boolean containTousseInstance = false; - String notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByName("notSignedItemsCanRegistUseRecord"); + //String notSignedItemsCanRegistUseRecord = CssdUtils.getSystemSetConfigByName("notSignedItemsCanRegistUseRecord"); Map tousseNameAndIdMap = new HashMap(); for (TousseInstance tousseInstance : tousseInstances) { //如果该器械包实例是代理灭菌单内的包实例、且代理灭菌单的是否二次发货为"是",包实例的状态修改为"已灭菌",否则修改为"已发货" Long proxyDisinfectionId = tousseInstance.getProxyDisinfection_id(); TousseDefinition td = tousseInstance.getTousseDefinition(); + TousseDefinition ancestor = td; + Long ancestorId = td.getAncestorID(); + if(DatabaseUtil.isPoIdValid(ancestorId)){ + ancestor = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), ancestorId); + } if(DatabaseUtil.isPoIdValid(proxyDisinfectionId)){ ProxyDisinfection proxyDisinfection = null; if(proxyDisinfectionMap.containsKey(proxyDisinfectionId)){ @@ -2482,7 +2497,8 @@ }else{ tousseInstance.setStatus(TousseInstance.STATUS_SHIPPED); //如果config.js配置需要签收才能录使用记录时,则该包自动发货后状态变为已签收(仅针对二级供应室自动发货的情况做如此处理) - if("false".equalsIgnoreCase(notSignedItemsCanRegistUseRecord)){ + //if("false".equalsIgnoreCase(notSignedItemsCanRegistUseRecord)){ + if(Constants.STR_YES.equals(ancestor.getRegistUseRecordAfterSigned())){ tousseInstance.setStatus(TousseInstance.STATUS_SIGNED); tousseInstance.setSignedDate(new Date()); tousseInstance.setSignedUser("二级供应室发货系统自动签收"); @@ -2494,7 +2510,8 @@ }else{ tousseInstance.setStatus(TousseInstance.STATUS_SHIPPED); //如果config.js配置需要签收才能录使用记录时,则该包自动发货后状态变为已签收(仅针对二级供应室自动发货的情况做如此处理) - if("false".equalsIgnoreCase(notSignedItemsCanRegistUseRecord)){ + //if("false".equalsIgnoreCase(notSignedItemsCanRegistUseRecord)){ + if(Constants.STR_YES.equals(ancestor.getRegistUseRecordAfterSigned())){ tousseInstance.setStatus(TousseInstance.STATUS_SIGNED); tousseInstance.setSignedDate(new Date()); tousseInstance.setSignedUser("二级供应室发货系统自动签收"); Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java =================================================================== diff -u -r27531 -r28640 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 27531) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 28640) @@ -208,6 +208,7 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.db.InitDbConnection; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.util.ConfigUtils; import com.forgon.tools.util.FileUtils; /** @@ -1542,6 +1543,9 @@ case "4.9.25_4.9.26": UpdateData_4_9_25_4_9_26(updateDataContext); break; + case "4.9.47_4.9.48": + UpdateData_4_9_47_4_9_48(updateDataContext); + break; } return false; } @@ -2710,6 +2714,25 @@ } dataUpdater.logInfo(msg); } + + /** + * 如果现有项目配置项 notSignedItemsCanRegistUseRecord 值为 false，可通过升级脚本将所有包定义中【签收后录入使用记录】设置为“是”。 + * @param updateDataContext + */ + private void UpdateData_4_9_47_4_9_48(UpdateDataContext updateDataContext) { + DataUpdater dataUpdater = updateDataContext.getDataUpdater(); + String msg = null; + msg = String + .format("已执行方法(%s.%s)!", MaintainManagerImpl.class.getName(), + "UpdateData_4_9_47_4_9_48()"); + // 如果现有项目配置项 notSignedItemsCanRegistUseRecord 值为 false，可通过升级脚本将所有包定义中【签收后录入使用记录】设置为“是”。 + Boolean notSignedItemsCanRegistUseRecord = ConfigUtils.getSystemSetConfigByNameBool("notSignedItemsCanRegistUseRecord", true); + if(!notSignedItemsCanRegistUseRecord){ + String sql = "update TousseDefinition set registUseRecordAfterSigned = '是' where registUseRecordAfterSigned is null"; + objectDao.excuteSQL(sql); + } + dataUpdater.logInfo(msg); + } @Override public void updateForeignTousseInfo() { Index: ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java =================================================================== diff -u -r28312 -r28640 --- ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java (.../TestSecondSupplyRoom.java) (revision 28312) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java (.../TestSecondSupplyRoom.java) (revision 28640) @@ -153,7 +153,8 @@ sterilizationRecord.getStatus()); tousseInstance1 = tousseInstanceManager.get(tousseInstance1.getId()); //如果config.js配置需要签收才能录使用记录时,则该包自动发货后状态变为已签收(仅针对二级供应室自动发货的情况做如此处理) - if("false".equalsIgnoreCase(CssdUtils.getSystemSetConfigByName("notSignedItemsCanRegistUseRecord"))){ + //if("false".equalsIgnoreCase(CssdUtils.getSystemSetConfigByName("notSignedItemsCanRegistUseRecord"))){ + if(Constants.STR_YES.equals(tousseInstance1.getTousseDefinition().getRegistUseRecordAfterSigned())){ assertEquals(tousseInstance1.getStatus(), TousseInstance.STATUS_SIGNED); }else{ assertEquals(tousseInstance1.getStatus(), TousseInstance.STATUS_SHIPPED);