Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r29932 -r29945 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29932) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29945) @@ -4510,6 +4510,7 @@ obj.put("urgentGrade", urgentGrade);//加急等级 obj.put("maxUrgentGrade", urgentGrade);//最高加急等级,用于排序 obj.put("sterilingMode", tousse.getSterilingMode()); + obj.put("scanAmount", itemDefinition.getScanAmount()); //覆盖 bMap.put(key, obj); } @@ -4535,6 +4536,7 @@ jsonObj.put("urgentLevel", urgentLevelInfo);//加急信息 jsonObj.put("urgentGrade", urgentGrade);//加急等级 jsonObj.put("maxUrgentGrade", urgentGrade);//最高加急等级,用于排序 + jsonObj.put("scanAmount", itemDefinition.getScanAmount()); bMap.put(tousse.getBarcode(), jsonObj); } } @@ -4942,7 +4944,7 @@ if(reviewedBasket != null && DatabaseUtil.isPoIdValid(reviewedBasket.getId())){ queryTousseSql.append("select td.id tdId, td.includeImplant, b.barcode,po.tousseName,po.depart,(case when tdAncestor.isTraceable ='" + TousseDefinition.STR_YES + "' then po.sterilingMode else s.sterilizationMode end) sterilingMode,tdAncestor.isTraceable,po.isUrgentTousse,po.sterilingType "); queryTousseSql.append(sqlSelect_UrgentLevel); - queryTousseSql.append(",po.proxyDisinfection_id,tdAncestor.tousseType,tdAncestor.isForeignTousse,po.proxyDisinfection_id " + queryTousseSql.append(",po.proxyDisinfection_id,tdAncestor.tousseType,tdAncestor.isForeignTousse,po.proxyDisinfection_id, tdAncestor.scanAmount " + "from " + TousseInstance.class.getSimpleName() + " po " + sqlJoin_UrgentLevel + "join " + BarcodeDevice.class.getSimpleName() + " b on po.id=b.id " @@ -4954,7 +4956,7 @@ }else if(sterilizationRecord != null && DatabaseUtil.isPoIdValid(sterilizationRecord.getId())){ queryTousseSql.append("select td.id tdId, td.includeImplant, b.barcode,po.tousseName,po.depart,(case when tdAncestor.isTraceable ='" + TousseDefinition.STR_YES + "' then po.sterilingMode else s.sterilizationMode end) sterilingMode,tdAncestor.isTraceable,po.isUrgentTousse,po.sterilingType "); queryTousseSql.append(sqlSelect_UrgentLevel); - queryTousseSql.append(",po.proxyDisinfection_id,tdAncestor.tousseType,tdAncestor.isForeignTousse,po.proxyDisinfection_id " + queryTousseSql.append(",po.proxyDisinfection_id,tdAncestor.tousseType,tdAncestor.isForeignTousse,po.proxyDisinfection_id, tdAncestor.scanAmount " + "from " + TousseInstance.class.getSimpleName() + " po " + sqlJoin_UrgentLevel + "join " + BarcodeDevice.class.getSimpleName() + " b on po.id=b.id " @@ -4977,6 +4979,7 @@ vo = new TousseSimpleVO(); ItemDefinitionVO itemDefinition = new ItemDefinitionVO(); itemDefinition.setIncludeImplant(rs.getInt("includeImplant")); + itemDefinition.setScanAmount(rs.getInt("scanAmount")); vo.setItemDefinition(itemDefinition); vo.setTousseDefinitionId(rs.getLong("tdId")); vo.setBarcode(rs.getString("barcode"));