Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r33427 -r33522 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 33427) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 33522) @@ -16,6 +16,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import net.sf.json.JsonConfig; import org.apache.commons.collections.MapUtils; import org.apache.commons.collections4.CollectionUtils; @@ -86,6 +87,7 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.BasePoManagerImpl; import com.forgon.tools.json.JSONUtil; +import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.ConfigUtils; import com.forgon.tools.util.ForgonDateUtils; @@ -2399,15 +2401,11 @@ result.put("orgUnitGroupID", orgUnitGroup.getId()); result.put("orgUnitGroupName", orgUnitGroup.getName()); JSONArray ftaJSONArray = new JSONArray(); + JsonConfig config = new JsonConfig(); + config.setJsonPropertyFilter(new JsonPropertyFilter(new String[] { + "applicationItems", "invoice"})); for (ForeignTousseApplication fta : foreignTousseApplicationList) { - JSONObject json = new JSONObject(); - json.put("applicationTime", fta.getApplicationTimeStr()); - json.put("depart", fta.getDepart()); - json.put("bedNumber", StringUtils.defaultString(fta.getBedNumber())); - json.put("patient", StringUtils.defaultString(fta.getPatient())); - json.put("hospitalNumber", StringUtils.defaultString(fta.getHospitalNumber())); - json.put("surgery", StringUtils.defaultString(fta.getSurgery())); - json.put("doctor", StringUtils.defaultString(fta.getDoctor())); + JSONObject json = JSONObject.fromObject(fta, config); //物品名称 List applicationItems = fta.getApplicationItems(); JSONArray tousseArray = new JSONArray();