Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java =================================================================== diff -u -r32997 -r32999 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 32997) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 32999) @@ -949,16 +949,23 @@ */ @SuppressWarnings("unchecked") private Map> getTousseInstanceList(JSONObject json) { - String type = json.optString("type"); Map> typeTousseInstanceMap = new HashMap>(); + if(json == null){ + return typeTousseInstanceMap; + } + String type = json.optString("type"); List tousseInstanceList = new ArrayList(); if(StringUtils.equals(type, BarcodeDevice.BARCODE_TYPE_PACKAGE)){ Long tousseInstanceID = json.optLong("id", 0L); TousseInstance ti = (TousseInstance) objectDao.getById(TousseInstance.class.getSimpleName(), tousseInstanceID); - tousseInstanceList.add(ti); - typeTousseInstanceMap.put(type, tousseInstanceList); + if(ti != null){ + tousseInstanceList.add(ti); + } }else if(StringUtils.equals(type, "容器") || StringUtils.equals(type, "装配记录")){ JSONArray instances = json.optJSONArray("instances"); + if(instances == null){ + return typeTousseInstanceMap; + } List tousseInstanceIDList = new ArrayList(); for(int i=0;i