Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/vo/SterilizationDetailsDataVo.java =================================================================== diff -u -r35445 -r35449 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/vo/SterilizationDetailsDataVo.java (.../SterilizationDetailsDataVo.java) (revision 35445) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/vo/SterilizationDetailsDataVo.java (.../SterilizationDetailsDataVo.java) (revision 35449) @@ -1,7 +1,8 @@ package com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.vo; -import java.util.HashMap; -import java.util.Map; +import net.sf.json.JSONArray; + + /** * ZSLY-388 灭菌明细vo * @author zc.li 2023-03-17 @@ -79,7 +80,7 @@ /** * 器械包名称和对应的数量 */ - private Map tousseAmountMap = new HashMap(); + private JSONArray tousseAmountArr = new JSONArray(); public String getYyyyMMdd() { return yyyyMMdd; } @@ -183,11 +184,11 @@ public void setMaxTemp(String maxTemp) { this.maxTemp = maxTemp; } - public Map getTousseAmountMap() { - return tousseAmountMap; + public JSONArray getTousseAmountArr() { + return tousseAmountArr; } - public void setTousseAmountMap(Map tousseAmountMap) { - this.tousseAmountMap = tousseAmountMap; + public void setTousseAmountArr(JSONArray tousseAmountArr) { + this.tousseAmountArr = tousseAmountArr; } } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r35447 -r35449 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 35447) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 35449) @@ -8597,7 +8597,7 @@ @Override public JSONArray getSterilizationDetailsData(String sterilizationRecordIds) { Set sterilizationRecordIdSet = SqlUtils.splitStringToSet(sterilizationRecordIds, ","); - Map> sterilizationRecordMap = getSterilizationRecordTousseAmountMap(sterilizationRecordIdSet); + Map sterilizationRecordMap = getSterilizationRecordTousseAmountMap(sterilizationRecordIdSet); String poIdSql = SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", sterilizationRecordIdSet); List sterilizationRecords = getByHql(poIdSql); boolean queryGtCom = false;//是否查询了洁定通用型 @@ -8616,7 +8616,7 @@ Sterilizer sterilizer = sr.getSterilizer(); SterilizationDetailsDataVo detailsDataVo = new SterilizationDetailsDataVo(); if(sterilizationRecordMap.containsKey(sr.getId())){ - detailsDataVo.setTousseAmountMap(sterilizationRecordMap.get(sr.getId())); + detailsDataVo.setTousseAmountArr(sterilizationRecordMap.get(sr.getId())); } //灭菌记录信息 detailsDataVo.setYyyyMMdd(sdfYMD.format(sr.getStartDate())); @@ -8917,7 +8917,7 @@ * @param sterilizationRecordIdSet 灭菌记录id * @return */ - private Map> getSterilizationRecordTousseAmountMap(Set sterilizationRecordIdSet){ + private Map getSterilizationRecordTousseAmountMap(Set sterilizationRecordIdSet){ String sql = "select sum(amount) amount,tousseName,sterilizationRecord_id from (" + "select po.tousseName,1 amount,st.sterilizationRecord_id from " + TousseInstance.class.getSimpleName() @@ -8931,22 +8931,25 @@ + "join sterilization_reviewed srd on srd.reviewedBasket_id=rb.id)t where " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("t.sterilizationRecord_id", sterilizationRecordIdSet) + "group by tousseName,sterilizationRecord_id"; - Map> sterilizationRecordMap = new HashMap>(); + Map sterilizationRecordMap = new HashMap(); ResultSet rs = null; try{ rs = objectDao.executeSql(sql); while(rs.next()){ Long sterilizationRecord_id = rs.getLong("sterilizationRecord_id"); Integer amount = rs.getInt("amount"); String tousseName = rs.getString("tousseName"); - Map tousseAmountMap = null; + JSONArray tousseAmountArr = null; if(sterilizationRecordMap.containsKey(sterilizationRecord_id)){ - tousseAmountMap = sterilizationRecordMap.get(sterilizationRecord_id); + tousseAmountArr = sterilizationRecordMap.get(sterilizationRecord_id); }else{ - tousseAmountMap = new HashMap(); - sterilizationRecordMap.put(sterilizationRecord_id, tousseAmountMap); + tousseAmountArr = new JSONArray(); } - tousseAmountMap.put(tousseName, amount); + JSONObject obj = new JSONObject(); + obj.put("tousseName", tousseName); + obj.put("amount", amount); + tousseAmountArr.add(obj); + sterilizationRecordMap.put(sterilizationRecord_id, tousseAmountArr); } }catch(Exception e){ e.printStackTrace();