Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/ReviewedBasket.java =================================================================== diff -u -r16508 -r16900 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/ReviewedBasket.java (.../ReviewedBasket.java) (revision 16508) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/ReviewedBasket.java (.../ReviewedBasket.java) (revision 16900) @@ -85,7 +85,8 @@ public Set getTousseInstances(ObjectDao dao) { if(id != null){ - List tousseInstances = dao.findByProperty(TousseInstance.class.getSimpleName(), "reviewBasket_id", ""+id); + //过滤掉聚合包内的普通器械包实例 + List tousseInstances = dao.findBySql(TousseInstance.class.getSimpleName(), " where comboTousseInstanceId is null and reviewBasket_id="+id); return new HashSet(tousseInstances); } return null; Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r16891 -r16900 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16891) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16900) @@ -579,10 +579,10 @@ String fmt = "yyyy-MM-dd HH24:MI:SS"; SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj(); String sql = "select alias.name , alias.reviewer , alias.isTraceable ,count(alias.name) amount from"; - //普通器械包、消毒物品、敷料包的查询 + //聚合包及不属于任务聚合包实例的普通器械包、消毒物品、敷料包的查询 sql += "(select d.name,i.reviewer as reviewer,d.isTraceable " + "from tousseInstance i,tousseDefinition d,cssdHandleTousses t where i.toussedefinition_id = d.id and d.id=t.tousseDefinitionId " - + "and i.reviewTime between "+dateQueryAdapter.dateConverAdapter2(startDateTime, fmt)+" and " + + "and i.comboTousseInstanceId is null and i.reviewTime between "+dateQueryAdapter.dateConverAdapter2(startDateTime, fmt)+" and " + dateQueryAdapter.dateConverAdapter2(endDateTime, fmt) + " and t.taskGroup = '" + taskGroup Index: ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java =================================================================== diff -u -r16812 -r16900 --- ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java (.../GridManagerImpl.java) (revision 16812) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java (.../GridManagerImpl.java) (revision 16900) @@ -223,19 +223,21 @@ else if(TousseInstance.class.getSimpleName().equals(poClass)){ Map sqlWhereParamMap = getParamFromView(parameterMap); String taskGroup = sqlWhereParamMap.get("taskGroup"); - String hqlCondition = "";//用于查询记录的hql语句条件 - String sqlCondition = "";//用于查询数量的sql语句条件 + String hqlCondition = " and comboTousseInstanceId is null ";//用于查询记录的hql语句条件(聚合包内的普通包实例不显示出来) + String sqlCondition = "and comboTousseInstanceId is null ";//用于查询数量的sql语句条件(聚合包内的普通包实例不显示出来) if (StringUtils.isNotBlank(taskGroup)) { //科室供应室配置 SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj(); hqlCondition += " and ("; sqlCondition += " and ("; //器械包、消毒物品、敷料包根据任务组进行过滤 - hqlCondition += "(tousseDefinition.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"') " + hqlCondition += "(tousseDefinition.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+ + TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"','"+TousseDefinition.PACKAGE_TYPE_COMBO+"') " + "and tousseDefinition in (select td from TousseDefinition td where td.ancestorID in (select ct.tousseDefinitionId from CssdHandleTousses ct " + "where ct.taskGroup='" + taskGroup + "' and ct.orgUnitCode='" + orgUnitCoding + "')))"; - sqlCondition += "(tousseDefinition_id in (select id from tousseDefinition where tousseType in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"') " + sqlCondition += "(tousseDefinition_id in (select id from tousseDefinition where tousseType in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+ + TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"','"+TousseDefinition.PACKAGE_TYPE_COMBO+"') " + "and ancestorID in (select ct.tousseDefinitionId from CssdHandleTousses ct " + "where ct.taskGroup='" + taskGroup + "' and ct.orgUnitCode='" + orgUnitCoding + "')))"; if(taskGroup.equals(supplyRoomConfig.getCustomTousseDefaultTaskGroup())){ Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r16828 -r16900 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 16828) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 16900) @@ -377,6 +377,10 @@ .getTousseInstanceList(); if(CollectionUtils.isNotEmpty(tousseInstanceList)){ for (TousseInstance tousse : tousseInstanceList) { + //如果为聚合包内的包实例,则过滤掉 + if(tousse.getComboTousseInstanceId() != null){ + continue; + } // 外来器械包去掉下划线ID String tousseName = tousse.getTousseName(); JSONObject jsonObj = new JSONObject(); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16894 -r16900 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16894) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16900) @@ -626,7 +626,7 @@ */ public List getAllReviewedTousseInstanceWithOutBasket( String orgUnitCode , String beginDate , String endDate , String start , String limit, String searchKeyWord, Map sqlCondition){ - String sql = " where po.status = '" + TousseInstance.STATUS_REVIEWED + String sql = " where po.comboTousseInstanceId is null and po.status = '" + TousseInstance.STATUS_REVIEWED + "' and reviewBasket_id is null"; //已审核并且还未入审核篮筐 if(StringUtils.isNotBlank(beginDate)){ sql += " and po.reviewTime >= " @@ -825,7 +825,7 @@ + "from tousseinstance t, barcodedevice b , cssdHandleTousses tt , TousseDefinition td " + "where t.id = b.id and tt.tousseDefinitionId=td.ancestorID and t.tousseDefinition_id=td.id and t.reviewBasket_id =" + reviewedBasket.getId() - + " and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"') " + + " and t.comboTousseInstanceId is null and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"','"+TousseDefinition.PACKAGE_TYPE_COMBO+"') " + " and t.orgUnitCoding='"+currentOrgUnitCode+"' and tt.orgUnitCode='"+currentOrgUnitCode+"'" + " and t.status <> '" + TousseInstance.STATUS_DISCARD + "'";