Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r40390 -r40487 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40390) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 40487) @@ -39,6 +39,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.ArrayUtils; @@ -2717,21 +2718,24 @@ newTousseInstanceMap.put(tousseInstance.getId(), tiObj); } } - // 找出新增的包(在新Map中存在但在旧Map中不存在) - for (Map.Entry entry : newTousseInstanceMap.entrySet()) { - if (!oldTisMap.containsKey(entry.getKey())) { - JSONObject tiObj = entry.getValue(); - addedList.add(tiObj.getString("tousseName") + "(" + tiObj.getString("barcode") + ")"); - } - } + if(MapUtils.isNotEmpty(oldTisMap)){ + // 找出新增的包(在新Map中存在但在旧Map中不存在) + for (Map.Entry entry : newTousseInstanceMap.entrySet()) { + if (!oldTisMap.containsKey(entry.getKey())) { + JSONObject tiObj = entry.getValue(); + addedList.add(tiObj.getString("tousseName") + "(" + tiObj.getString("barcode") + ")"); + } + } - // 找出减少的包(在旧Map中存在但在新Map中不存在) - for (Map.Entry entry : oldTisMap.entrySet()) { - if (!newTousseInstanceMap.containsKey(entry.getKey())) { - JSONObject tiObj = entry.getValue(); - removedList.add(tiObj.getString("tousseName") + "(" + tiObj.getString("barcode") + ")"); - } + // 找出减少的包(在旧Map中存在但在新Map中不存在) + for (Map.Entry entry : oldTisMap.entrySet()) { + if (!newTousseInstanceMap.containsKey(entry.getKey())) { + JSONObject tiObj = entry.getValue(); + removedList.add(tiObj.getString("tousseName") + "(" + tiObj.getString("barcode") + ")"); + } + } } + String lineSeparator = "
"; // 按照要求格式拼接结果 StringBuilder addInfo = new StringBuilder(); @@ -2785,7 +2789,12 @@ excludedFields.add("safetyCheckFormInstance"); excludedFields.add("runTableRecordFormInstance"); excludedFields.add("startDateStr"); + excludedFields.add("endDateStr"); excludedFields.add("sterilizationParaType"); + excludedFields.add("sterilizerName"); + excludedFields.add("bioreaderName"); + excludedFields.add("reviewedBasketAmount"); + excludedFields.add("includeImplant"); return excludedFields; } @@ -9225,6 +9234,13 @@ if (StringUtils.isNotBlank(recordID)) { SterilizationRecord record = getSterilizationRecordById(Long.valueOf(recordID)); if (record != null) { + SterilizationRecord origineSterilizationRecord = new SterilizationRecord(); + try{ + BeanUtils.copyProperties(origineSterilizationRecord, record); + } catch ( Exception e){ + logger.error(e); + } + record.setBiologyResult(biologyResult); if(SterilizationRecord.MONITOR_RESULT_NO.equals(biologyResult)){ record.setBiologicalMonitoringStatus(SterilizationRecord.BIOLOGICALMONITORING_STATUS_NULL); @@ -9353,6 +9369,7 @@ obj.put("sterilizationResult", record.getSterilizationResult()); } obj.put("success", true); + sterilizationRecordChanges(origineSterilizationRecord, record, null, null); return obj; } }