Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java =================================================================== diff -u -r38442 -r40806 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java (.../TousseSimpleVO.java) (revision 38442) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java (.../TousseSimpleVO.java) (revision 40806) @@ -163,8 +163,11 @@ * 任务组 */ private String taskGroup; - /** + * 包定义任务组 + */ + private String tdTaskGroup; + /** * 接收状态(GDSZYY-102)，"待接收"的物品，字段值为“否” * 1、目前只用于代理灭菌单上物品的接收核对； * 2、一级供应室打开在装配记录里生成的代理灭菌单扫描就是接收； @@ -184,6 +187,15 @@ * 等于UrgentLevel.grade */ private Integer grade; + + public String getTdTaskGroup() { + return tdTaskGroup; + } + + public void setTdTaskGroup(String tdTaskGroup) { + this.tdTaskGroup = tdTaskGroup; + } + public int getAmount() { return amount; } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r40702 -r40806 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 40702) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 40806) @@ -2468,7 +2468,7 @@ //1、普通器械包、消毒物品、敷料包 String sql = "select * from (select t.reviewBasket_id,t.id id,t.departCoding, t.tousseName name, td.includeImplant, b.barcode, t.sterilingType,tdAncestor.sterilingMethod,t.sterilingMode," + " t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable, tdAncestor.id tdAncestorId " - + ",t.urgentLevel_id " + + ",t.urgentLevel_id,tdAncestor.taskGroup " + sqlSelect_SpellingSql + " from tousseinstance t" + " join barcodedevice b on b.id=t.id " @@ -2494,7 +2494,7 @@ if(foreignTousseHandleDepartAndTaskGroupJsonobject != null && StringTools.equals(taskGroup, foreignTousseHandleDepartAndTaskGroupJsonobject.optString("taskGroup"))){ sql += " union all select t.reviewBasket_id,t.id id,t.departCoding, t.tousseName name, td.includeImplant, b.barcode, t.sterilingType,null sterilingMethod,t.sterilingMode," + " t.reviewTime,t.isUrgentTousse, '"+ Constants.STR_YES +"' isTraceable, null tdAncestorId " - + ",t.urgentLevel_id " + + ",t.urgentLevel_id,td.taskGroup " + sqlSelect_SpellingSql + " from tousseinstance t " + " join barcodedevice b on b.id=t.id " @@ -2511,7 +2511,7 @@ if(taskGroup.equals(supplyRoomConfig.getCustomTousseDefaultTaskGroup())){ sql += " union all select reviewBasket_id,t.id id,t.departCoding , t.tousseName name, td.includeImplant, b.barcode, t.sterilingType,null sterilingMethod,t.sterilingMode," + " t.reviewTime,t.isUrgentTousse , '"+ Constants.STR_YES +"' isTraceable, null tdAncestorId " - + ",t.urgentLevel_id " + + ",t.urgentLevel_id,td.taskGroup " + sqlSelect_SpellingSql + " from tousseinstance t" + " join barcodedevice b on b.id=t.id " @@ -2526,7 +2526,7 @@ //4、外部代理灭菌 sql += " union all select t.reviewBasket_id,t.id id,t.departCoding ,t.tousseName name, td.includeImplant, b.barcode, t.sterilingType,tdAncestor.sterilingMethod,t.sterilingMode," + " t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable, tdAncestor.id tdAncestorId " - + ",t.urgentLevel_id " + + ",t.urgentLevel_id,tdAncestor.taskGroup " + sqlSelect_SpellingSql + "from tousseinstance t" + " left join " + InvoicePlan.class.getSimpleName() @@ -2544,7 +2544,7 @@ //2、外来器械包、外来器械拆分小包 sql += " union all select t.reviewBasket_id,t.id id,t.departCoding , t.tousseName name, td.includeImplant, b.barcode, t.sterilingType,null sterilingMethod,t.sterilingMode," + "t.reviewTime,t.isUrgentTousse , '"+ Constants.STR_YES +"' isTraceable, null tdAncestorId " - + ",t.urgentLevel_id " + + ",t.urgentLevel_id,td.taskGroup " + sqlSelect_SpellingSql + "from tousseinstance t " + " join barcodedevice b on b.id=t.id join TousseDefinition td on td.id=t.tousseDefinition_id " @@ -2558,7 +2558,7 @@ //3、自定义器械包 sql += " union all select t.reviewBasket_id,t.id id,t.departCoding , t.tousseName name, td.includeImplant, b.barcode, t.sterilingType,null sterilingMethod,t.sterilingMode," + "t.reviewTime,t.isUrgentTousse , '"+ Constants.STR_YES +"' isTraceable, null tdAncestorId " - + ",t.urgentLevel_id " + + ",t.urgentLevel_id,td.taskGroup " + sqlSelect_SpellingSql + " from tousseinstance t " + " join barcodedevice b on b.id=t.id join TousseDefinition td on td.id=t.tousseDefinition_id " @@ -2571,7 +2571,7 @@ //4、外部代理灭菌 sql += " union all select t.reviewBasket_id,t.id id,t.departCoding ,t.tousseName name, td.includeImplant, b.barcode, t.sterilingType,tdAncestor.sterilingMethod,t.sterilingMode," + "t.reviewTime,t.isUrgentTousse,tdAncestor.isTraceable, tdAncestor.id tdAncestorId " - + ",t.urgentLevel_id " + + ",t.urgentLevel_id,tdAncestor.taskGroup " + sqlSelect_SpellingSql + "from tousseinstance t" + " left join " + InvoicePlan.class.getSimpleName() @@ -2737,7 +2737,8 @@ vo.setId(rs.getLong("id")); vo.setSterilingType(rs.getString("SterilingType")); - + vo.setTaskGroup(rs.getString("taskGroup")); + //如果是否追溯为否,则设置为否,否则都为是 String isTraceable = rs.getString("isTraceable"); if(StringUtils.equals(Constants.STR_NO, isTraceable)){ @@ -7601,6 +7602,7 @@ obj.put("uiProvider", "col"); obj.put("leaf", true); obj.put("iconCls", "task"); + obj.put("taskGroup", vo.getTaskGroup()); obj.put("objName",objName ); if(openGoodsSearch){ obj.put("wbCode", vo.getWbCode()); @@ -7633,6 +7635,7 @@ tousseInBasket.put("uiProvider", "col"); tousseInBasket.put("leaf", true); tousseInBasket.put("iconCls", "task"); + tousseInBasket.put("taskGroup", vo.getTaskGroup()); tousseInBasket.put("cls", isTimeout ? "itemTimeout" : ""); //加急信息 tousseInBasket.put("urgentLevel", urgentLevelInfo);//加急信息 @@ -7734,6 +7737,7 @@ obj.put("uiProvider", "col"); obj.put("leaf", true); obj.put("cls", isTimeout ? "itemTimeout" : "master-task"); + obj.put("taskGroup", tousseOutsideBasket.getTdTaskGroup()); obj.put("iconCls", "task"); obj.put("isTimeout", isTimeout); //加急信息 @@ -8575,6 +8579,7 @@ ti.setUrgentLevelInfo(urgentLevelVo); } ti.setTaskGroup(rs.getString("taskGroup")); + ti.setTdTaskGroup(rs.getString("tdTaskGroup")); if(openGoodsSearch){ ti.setSpelling(rs.getString("spelling")); ti.setWbCode(rs.getString("wbCode")); @@ -8596,6 +8601,7 @@ ti.setSterilingType(rs.getString("sterilingType")); ti.setIsUrgentTousse(rs.getString("IsUrgentTousse")); ti.setTaskGroup(rs.getString("taskGroup")); + ti.setTdTaskGroup(rs.getString("tdTaskGroup")); if(openGoodsSearch){ ti.setSpelling(rs.getString("spelling")); ti.setWbCode(rs.getString("wbCode")); @@ -8730,7 +8736,7 @@ + "IsUrgentTousse,b.barcode,ti.reviewTime,1 amount, td.includeImplant " + sqlSelect_UrgentLevel + sqlSelect_SpellingSql - + " from "+ TousseInstance.class.getSimpleName() +" ti " + + " ,tdancestor.taskGroup tdTaskGroup from "+ TousseInstance.class.getSimpleName() +" ti " + sqlJoin_UrgentLevel + departJoinSql + " join "+ BarcodeDevice.class.getSimpleName() +" b on b.id=ti.id " + "join "+ TousseDefinition.class.getSimpleName() +" td on ti.tousseDefinition_id=td.id join "+ TousseDefinition.class.getSimpleName() +" tdancestor on "