Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r29583 -r29627 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 29583) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 29627) @@ -169,6 +169,7 @@ import com.forgon.disinfectsystem.useRecord.service.UseRecordToJson; import com.forgon.disinfectsystem.useRecord.util.UseRecordUtil; import com.forgon.disinfectsystem.vo.ApplicationItemVO; +import com.forgon.disinfectsystem.vo.ItemDefinitionVO; import com.forgon.disinfectsystem.vo.RecyclingApplicationVo; import com.forgon.disinfectsystem.vo.TousseSimpleVO; import com.forgon.disinfectsystem.washTransition.service.WashTransitionItemManager; @@ -1498,7 +1499,7 @@ JsonConfig config = new JsonConfig(); config.registerJsonValueProcessor(Date.class, _defaultDateJsonValueProcessor3); - final String[] retainPropertys = { "id", "tousseDefinition", + final String[] retainPropertys = { "id", "tousseDefinition","itemDefinition", "tousseName", "barcode", "validUntil", "sterilingType","sterilingMode", "orgUnitCoding", "orgUnitName","sterilizerPosition","actualUsed","operator" }; PropertyFilter filter = new PropertyFilter() { @@ -1520,7 +1521,7 @@ Class clazz = source.getClass(); - if (clazz == TousseDefinition.class) { + if (clazz == TousseDefinition.class || clazz == ItemDefinitionVO.class) { String[] retainPropertys = { "name","tousseType","id","isTraceable","includeImplant" }; if (ArrayUtils.contains(retainPropertys, name)) { return false; @@ -2629,9 +2630,15 @@ } } - JSONArray tousseInstance = JSONArray.fromObject(vos, + JSONArray tousseInstanceJSONArray = JSONArray.fromObject(vos, buildJsonConfigForTousseInstance()); - result.put("tousseInstanceList", tousseInstance); + if(CollectionUtils.isNotEmpty(tousseInstanceJSONArray)){ + for(int i = 0;i < tousseInstanceJSONArray.size();i++){ + JSONObject tousseInstanceJSONObject = tousseInstanceJSONArray.optJSONObject(i); + tousseInstanceJSONObject.put("tousseDefinition", tousseInstanceJSONObject.optJSONObject("itemDefinition")); + } + } + result.put("tousseInstanceList", tousseInstanceJSONArray); return result; } @@ -6455,4 +6462,12 @@ } } + /** + * 查看质量监测明细 + */ + @SuppressWarnings("unused") + private String getQualityMonitoringGoodsDetails(JSONObject params){ + return JSONUtil.buildJsonObject(false, "查看质量监测明细功能正在完善中...").toString(); + } + }