Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r16353 -r16398 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16353) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16398) @@ -515,7 +515,7 @@ long biologicalMonitoringEndDate = biologicalMonitoringStartDate + biologicalMonitoringTime*60*1000; sterilizationRecord.setBiologicalMonitoringStartDate(new Date(biologicalMonitoringStartDate)); sterilizationRecord.setBiologicalMonitoringEndDate(new Date(biologicalMonitoringEndDate)); - sterilizationRecord.setMonitorUser(sterilizationRecord.getFinishOperater()); //生物监测员默认取,灭菌完成操作人 + sterilizationRecord.setMonitorUser(sterilizationRecord.getFinishOperater()); //生物监测员默认取,灭菌完成操作人(cjr) } } } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r16384 -r16398 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 16384) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 16398) @@ -593,11 +593,15 @@ List foreignMaterialDefinitions = new ArrayList(); JSONArray materialsJsonArray = obj.optJSONArray("materials"); + boolean includeImplantFlag = false; 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; + } String minDismantleAmount = materialJson .optString("minDismantleAmount"); MaterialInstance mi = new MaterialInstance(); @@ -619,6 +623,7 @@ foreignMaterialDefinitions.add(mi); } tousseDefinition.setMaterialInstances(foreignMaterialDefinitions); + tousseDefinition.setIncludeImplant(includeImplantFlag ? 0 : 1); return tousseDefinition; }