Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java =================================================================== diff -u -r17643 -r17675 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 17643) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 17675) @@ -221,15 +221,20 @@ this.editTime = editTime; } + /** + * 查询该使用记录所有的包实例(不限器械包类型、是否回收、是否转换申请单等条件) + * @param dao + * @return + */ public List getTousseInstanceList(ObjectDao dao) { //改为按使用记录顺序号排序 List tousseInstanceList = dao.findBySql(TousseInstance.class.getSimpleName(), " where useRecord_id=" + id + " order by useRecordSortNumber"); return tousseInstanceList; } /** - * 查询该使用记录里可以被转换至申请单的申请项的包实例集合 - * 条件如下:包类型为器械包、消毒物品、敷料包中的一种并且(包实例的是否真正使用为否或者包定义的是否转换为是) + * 查询该使用记录里会被转换至申请单的申请项的包实例集合 + * 条件如下:包类型为器械包、敷料包中的一种并且(包实例的是否真正使用为否或者包定义的是否转换为是) * @param dao * @return */ @@ -241,6 +246,19 @@ + " order by useRecordSortNumber"); return tousseInstanceList; } + + /** + * 查询该使用记录里所有类型为器械包的包实例集合(只限类型为器械包,不限是否回收、是否转换申请单等条件) + * @param dao + * @return + */ + public List getTousseInstanceOnlyInsideTousseList(ObjectDao dao) { + //改为按使用记录顺序号排序 + List tousseInstanceList = dao.findBySql(TousseInstance.class.getSimpleName(), " where useRecord_id=" + id + + " and tousseDefinition.tousseType = '"+ TousseDefinition.PACKAGE_TYPE_INSIDE +"'" + + " order by useRecordSortNumber"); + return tousseInstanceList; + } public String getRemark() { return remark; Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r17667 -r17675 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 17667) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 17675) @@ -1630,6 +1630,7 @@ if(StringUtils.isNotBlank(useRecord.getPatientName())){ useRecordConvertRecyclingApplicationRemark += "病人:" + useRecord.getPatientName() + ";"; } + useRecordConvertRecyclingApplicationRemark += "器械包数量:" + String.valueOf(useRecord.getTousseInstanceOnlyInsideTousseList(objectDao).size()); } return useRecordConvertRecyclingApplicationRemark; }