Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r16398 -r16417 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 16398) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 16417) @@ -593,22 +593,22 @@ List foreignMaterialDefinitions = new ArrayList(); JSONArray materialsJsonArray = obj.optJSONArray("materials"); - boolean includeImplantFlag = false; + Integer includeImplantFlag = TousseDefinition.UNINCLUDE_IMPLANT; //判断是否包含植入物(cjr) for (int n = 0; n < materialsJsonArray.size(); n++) { JSONObject materialJson = materialsJsonArray.optJSONObject(n); String materialName = materialJson.optString("materialName"); Integer amount = materialJson.optInt("amount"); String includeImplant = materialJson.optString("includeImplant"); - if (Constants.STR_YES.equals(includeImplant)) { //包含植入物(cjr) - includeImplantFlag = true; + if (Constants.STR_YES.equals(includeImplant)) { + includeImplantFlag = TousseDefinition.INCLUDE_IMPLANT; } String minDismantleAmount = materialJson .optString("minDismantleAmount"); MaterialInstance mi = new MaterialInstance(); mi.setMaterialName(materialName); mi.setCount(amount); - tousseDefinition - .setIncludeImplant(TousseDefinition.INCLUDE_IMPLANT); +// tousseDefinition +// .setIncludeImplant(TousseDefinition.INCLUDE_IMPLANT); mi.setMinDismantleAmount(minDismantleAmount); mi.setTousse(tousseDefinition); MaterialDefinition md = getMaterialDefintion(materialName, @@ -623,7 +623,7 @@ foreignMaterialDefinitions.add(mi); } tousseDefinition.setMaterialInstances(foreignMaterialDefinitions); - tousseDefinition.setIncludeImplant(includeImplantFlag ? 0 : 1); + tousseDefinition.setIncludeImplant(includeImplantFlag); return tousseDefinition; }