Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java =================================================================== diff -u -r39447 -r40683 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java (.../MaterialDefinition.java) (revision 39447) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java (.../MaterialDefinition.java) (revision 40683) @@ -247,6 +247,12 @@ * GZSLWQGSKY-1 */ private Long thirdPartyDefinitionId; + + /** + * "是否清点",默认为空则所有材料都需要清点,当设置为"否"时此材料在消毒包字典信息查询服务(FJ_DETAILQUERY)不返回 + * FSEYEQ-27 + */ + private String whetherTakeInventory; public static Map ColumnNameAndPoPropertyNameMap = new LinkedHashMap(13); @@ -778,5 +784,12 @@ this.thirdPartyDefinitionId = thirdPartyDefinitionId; } + public String getWhetherTakeInventory() { + return whetherTakeInventory; + } + public void setWhetherTakeInventory(String whetherTakeInventory) { + this.whetherTakeInventory = whetherTakeInventory; + } + } Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/HIPMessageWebServiceImplV2.java =================================================================== diff -u -r40302 -r40683 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/HIPMessageWebServiceImplV2.java (.../HIPMessageWebServiceImplV2.java) (revision 40302) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/HIPMessageWebServiceImplV2.java (.../HIPMessageWebServiceImplV2.java) (revision 40683) @@ -1,7 +1,6 @@ package com.forgon.disinfectsystem.webservice.datasync.common; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -888,14 +887,19 @@ StringBuilder materialStr = new StringBuilder(); if (CollectionUtils.isNotEmpty(materialInstances)) { for (MaterialInstance materialInstance : materialInstances) { + MaterialDefinition materialDefinition = materialInstance.getMaterialDefinition(); + // 在材料管理中针对材料定义增加字段"是否清点",默认为空则所有材料都需要清点,当设置为"否"时此材料在消毒包字典信息查询服务(FJ_DETAILQUERY)不返回FSEYEQ-27 + if(materialDefinition != null && StringUtils.equals(materialDefinition.getWhetherTakeInventory(), Constants.STR_NO)){ + continue; + } String detailspec = materialInstance.getSpecification() == null ? "" : materialInstance.getSpecification(); materialStr.append("" + materialInstance.getMaterialDefinitionId() + ""); materialStr.append("" + materialInstance.getMaterialName() + ""); materialStr.append("" + detailspec + ""); materialStr.append("" + materialInstance.getCount() + ""); } } - if (CollectionUtils.isNotEmpty(diposableGoodsInstanceList)) { + if (CollectionUtils.isNotEmpty(diposableGoodsInstanceList) && !ConfigUtils.isProject("fssdermyy")) { for (DiposableGoodsInstance disposableGoodsInstance : diposableGoodsInstanceList) { DisposableGoods diposableGoods = disposableGoodsInstance.getDiposableGoods(); String detailspec = diposableGoods.getSpecification() == null ? "" : diposableGoods.getSpecification(); @@ -994,7 +998,7 @@ StringBuilder packageStrSB = new StringBuilder(); packageStrSB.append(""); - packageStrSB.append("" + (tousseInstance.getWrapper() == null ? "" : tousseInstance.getWrapper()) + ""); + packageStrSB.append("" + (tousseInstance.getOperator() == null ? "" : tousseInstance.getOperator()) + ""); packageStrSB.append("" + (tousseInstance.getOperationTimeStr() == null ? "" : tousseInstance.getOperationTimeStr()) + ""); packageStrSB.append("" + (tousseInstance.getPackageType() == null ? "" : tousseInstance.getPackageType()) + ""); packageStrSB.append("" + (tousseInstance.getReviewer() == null ? "" : tousseInstance.getReviewer()) + "");