Index: ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
===================================================================
diff -u -r20803 -r20834
--- ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 20803)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 20834)
@@ -177,6 +177,7 @@
* 测试数据初始化(初始化基础数据方法只会在容器启动时调用一次)
* initializeCSSDTestData
*/
+ @Override
public void initializeCSSDTestData() {
initCSSDDataWithTrans();
}
@@ -1103,7 +1104,7 @@
* 2、术科组（所属科室：测试供应室）
* 3、外来器械组（所属科室：测试供应室）
* 4、手术器械组（所属科室：测试手术室）
- * 5、临床器械组（所属科室：测试手术室）
+ * 5、临床器械组（所属科室：测试供应室）
*/
private void initTaskGroup() {
TaskGroup tg_常规组 = new TaskGroup();
@@ -1128,8 +1129,8 @@
TaskGroup tg_临床器械组 = new TaskGroup();
tg_临床器械组.setTaskGroupName(Constants.TASKGROUP_LINCHUANGQIXIEZU);
- tg_临床器械组.setDepartCode(Constants.ORG_UNIT_CODE_OR);
- tg_临床器械组.setDepartName(Constants.ORG_UNIT_NAME_OR);
+ tg_临床器械组.setDepartCode(Constants.ORG_UNIT_CODE_CSSD);
+ tg_临床器械组.setDepartName(Constants.ORG_UNIT_NAME_CSSD);
objectDao.saveOrUpdate(tg_常规组);
@@ -1563,8 +1564,8 @@
// 灭菌炉(属于供应室)
Sterilizer sterilizer1 = new Sterilizer();
- sterilizer1.setName("1号高温蒸汽灭菌炉");
- sterilizer1.setBarcode("010175001");
+ sterilizer1.setName(Constants.Sterilizer.STERILIZER1);
+ sterilizer1.setBarcode(Constants.Barcode.STERILIZER1);
sterilizer1.setOwnGroup("大型压力蒸汽");
// OrgUnit cssdDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_CSSD, false);
OrgUnit orgUnitCSSD = orgUnitManager.getByCode(Constants.ORG_UNIT_CODE_CSSD);
@@ -1584,8 +1585,8 @@
// 灭菌炉(属于供应室)
Sterilizer sterilizer12 = new Sterilizer();
- sterilizer12.setName("2号高温蒸汽灭菌炉");
- sterilizer12.setBarcode("010175003");
+ sterilizer12.setName(Constants.Sterilizer.STERILIZER2);
+ sterilizer12.setBarcode(Constants.Barcode.STERILIZER2);
sterilizer12.setOwnGroup("大型压力蒸汽");
sterilizer12.setDepartment(orgUnitCSSD.getName());
@@ -1603,8 +1604,8 @@
// 灭菌炉(属于二级供应室--手术室)
Sterilizer sterilizer2 = new Sterilizer();
- sterilizer2.setName("6号高温蒸汽灭菌炉");
- sterilizer2.setBarcode("010175002");
+ sterilizer2.setName(Constants.Sterilizer.STERILIZER6);
+ sterilizer2.setBarcode(Constants.Barcode.STERILIZER6);
sterilizer2.setOwnGroup("低温等离子");
// OrgUnit orDept = thTreeNodeManager.getOrgUnitByName(Constants.ORG_UNIT_NAME_OR, false);
OrgUnit orgUnitOR = orgUnitManager.getByCode(Constants.ORG_UNIT_CODE_OR);
@@ -1901,10 +1902,10 @@
* Test穿刺包（术科组）
* 【Test钳子】 * 5
* 【Test棉球】 * 4
- * TestOR胆加仪（器械组）【testOR】处理科室
+ * TestOR胆加仪（手术器械组）【testOR】处理科室
* 【Test胆道探条】 * 7
* 【Test静脉拉钩】（1对） * 2
- * TestOR甲加仪（半年期）（器械组）【testOR】处理科室
+ * TestOR甲加仪（半年期）（手术器械组）【testOR】处理科室
* 【Test胆道探条】 * 7
* 【Test静脉拉钩】（1对） * 3
* 【Test取石钳】（1对） * 4
@@ -2188,7 +2189,7 @@
TousseDefinition tousseDefinition5 = new TousseDefinition();
tousseDefinition5.setName("TestOR胆加仪");
- tousseDefinition5.setTaskGroup("器械组");
+ tousseDefinition5.setTaskGroup(Constants.TASKGROUP_SHOUSHUQIXIEZU);
tousseDefinition5.setTousseGroupID(group2.getId());
tousseDefinition5.setTousseGroupName("普通批");
tousseDefinition5.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
@@ -2226,7 +2227,7 @@
TousseDefinition tousseDefinition6 = new TousseDefinition();
tousseDefinition6.setName("TestOR甲加仪（半年期）");
- tousseDefinition6.setTaskGroup("器械组");
+ tousseDefinition6.setTaskGroup(Constants.TASKGROUP_SHOUSHUQIXIEZU);
tousseDefinition6.setTousseGroupID(group2.getId());
tousseDefinition6.setTousseGroupName("普通批");
tousseDefinition6.setExternalCode("EX001");
@@ -2333,7 +2334,7 @@
//普通器械包
tousseDefinition9.setName("Test缝合包");
tousseDefinition9.setIsCleanedEntirely("是");
- tousseDefinition9.setTaskGroup("器械组");
+ tousseDefinition9.setTaskGroup(Constants.TASKGROUP_LINCHUANGQIXIEZU);
tousseDefinition9.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
tousseDefinition9.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
tousseDefinition9.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
@@ -2363,7 +2364,7 @@
//普通器械包
tousseDefinition10.setName("Test清创包");
tousseDefinition10.setIsCleanedEntirely("是");
- tousseDefinition10.setTaskGroup("器械组");
+ tousseDefinition10.setTaskGroup(Constants.TASKGROUP_LINCHUANGQIXIEZU);
tousseDefinition10.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
tousseDefinition10.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
tousseDefinition10.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
@@ -2390,7 +2391,7 @@
//普通器械包
tousseDefinition11.setName("Test宫碘包");
tousseDefinition11.setIsCleanedEntirely("是");
- tousseDefinition11.setTaskGroup("器械组");
+ tousseDefinition11.setTaskGroup(Constants.TASKGROUP_LINCHUANGQIXIEZU);
tousseDefinition11.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
tousseDefinition11.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
tousseDefinition11.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
@@ -2512,7 +2513,7 @@
tousseDefinition1.setIsRecycling(TousseDefinition.STR_YES);
tousseDefinition1.setIsPacking(TousseDefinition.STR_YES);
tousseDefinition1.setIsTraceable(TousseDefinition.STR_NO);
- tousseDefinition1.setTaskGroup("术科组");
+ tousseDefinition1.setTaskGroup(Constants.TASKGROUP_SHUKEZU);
tousseDefinition1.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
tousseDefinition1.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
@@ -2559,7 +2560,7 @@
tousseDefinition2.setIsPacking(TousseDefinition.STR_NO);
tousseDefinition2.setIsReview(TousseDefinition.STR_NO);
tousseDefinition2.setIsTraceable(TousseDefinition.STR_NO);
- tousseDefinition2.setTaskGroup("术科组");
+ tousseDefinition2.setTaskGroup(Constants.TASKGROUP_SHUKEZU);
tousseDefinition2.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
tousseDefinition2.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
@@ -2600,7 +2601,7 @@
tousseDefinition3.setIsRecycling(TousseDefinition.STR_YES); // 需要回收
tousseDefinition3.setIsTraceable(TousseDefinition.STR_YES); // 可追溯
tousseDefinition3.setIsPacking(TousseDefinition.STR_YES); // 需要装配
- tousseDefinition3.setTaskGroup("术科组");
+ tousseDefinition3.setTaskGroup(Constants.TASKGROUP_SHUKEZU);
tousseDefinition3.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
tousseDefinition3.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
tousseDefinition3.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
@@ -2629,7 +2630,7 @@
comboTousse.setHandlerDepartCode(Constants.ORG_UNIT_CODE_NEIKE);
comboTousse.setHandlerDepartName(Constants.ORG_UNIT_NAME_NEIKE);
comboTousse.setIsCustomPacking(TousseDefinition.STR_NO);
- comboTousse.setTaskGroup("术科组");
+ comboTousse.setTaskGroup(Constants.TASKGROUP_SHUKEZU);
comboTousse.setPackageType("棉布");
objectDao.saveOrUpdate(comboTousse);
@@ -2968,6 +2969,7 @@
/*
* 初始化所有器械包定义
*/
+ @Override
public void initBasicData(){
//消毒供应室的仓库
createWareHouse(Constants.ORG_UNIT_CODE_DISINFECT);
@@ -3160,7 +3162,7 @@
tousseDefinition.setName("test骨科外来器械包");
tousseDefinition.setIsCleanedEntirely("是");
- tousseDefinition.setTaskGroup("OR器械组");
+ tousseDefinition.setTaskGroup(Constants.TASKGROUP_WAILAIQIXIEZU);
tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_FOREIGN);
List materialInstanceList = new ArrayList();
materialInstanceList.add(materialInstance);
@@ -3209,7 +3211,7 @@
tousseDefinition.setName("test骨科外来器械包");
tousseDefinition.setIsCleanedEntirely("是");
- tousseDefinition.setTaskGroup("OR器械组");
+ tousseDefinition.setTaskGroup(Constants.TASKGROUP_WAILAIQIXIEZU);
tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_FOREIGN);
List materialInstanceList = new ArrayList();
materialInstanceList.add(materialInstance);
@@ -3257,7 +3259,7 @@
tousseDefinition.setName("test胸科外来器械包");
tousseDefinition.setIsCleanedEntirely("是");
- tousseDefinition.setTaskGroup("OR器械组");
+ tousseDefinition.setTaskGroup(Constants.TASKGROUP_WAILAIQIXIEZU);
tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_FOREIGN);
List materialInstanceList = new ArrayList();
materialInstanceList.add(materialInstance);
@@ -3322,57 +3324,6 @@
objectDao.saveOrUpdate(materialInstance2);
- //普通器械包
- /*tousseDefinition1.setName("Test开胸包");
- tousseDefinition1.setIsCleanedEntirely("是");
- tousseDefinition1.setTaskGroup("灭菌组");
- tousseDefinition1.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
- tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
- tousseDefinition1.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT);
-
- tousseDefinition1.getMaterialInstances().add(materialInstance1);
- tousseDefinition1.getMaterialInstances().add(materialInstance2);
- //tousseDefinitionManager.saveOrUpdate(tousseDefinition1);
-
- TousseDefinition tousseDefinition2 = new TousseDefinition();
- //普通器械包
- tousseDefinition2.setName("Test缝合包");
- tousseDefinition2.setIsCleanedEntirely("是");
- tousseDefinition2.setTaskGroup("器械组");
- tousseDefinition2.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
- tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
- tousseDefinition2.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT);
-
- tousseDefinition2.getMaterialInstances().add(materialInstance1);
- tousseDefinition2.getMaterialInstances().add(materialInstance2);
- //tousseDefinitionManager.saveOrUpdate(tousseDefinition2);
-
- TousseDefinition tousseDefinition3 = new TousseDefinition();
- //普通器械包
- tousseDefinition3.setName("Test清创包");
- tousseDefinition3.setIsCleanedEntirely("是");
- tousseDefinition3.setTaskGroup("器械组");
- tousseDefinition3.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
- tousseDefinition3.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
- tousseDefinition3.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT);
-
- tousseDefinition3.getMaterialInstances().add(materialInstance1);
- tousseDefinition3.getMaterialInstances().add(materialInstance2);
- //tousseDefinitionManager.saveOrUpdate(tousseDefinition3);
-
- TousseDefinition tousseDefinition4 = new TousseDefinition();
- //普通器械包
- tousseDefinition4.setName("Test宫碘包");
- tousseDefinition4.setIsCleanedEntirely("是");
- tousseDefinition4.setTaskGroup("器械组");
- tousseDefinition4.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
- tousseDefinition4.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
- tousseDefinition4.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT);
-
- tousseDefinition4.getMaterialInstances().add(materialInstance1);
- tousseDefinition4.getMaterialInstances().add(materialInstance2);
- tousseDefinitionManager.saveOrUpdate(tousseDefinition4);*/
-
// 不回收的包
{
tousseDefinition.setName("不回收的包");
Index: ssts-web/src/test/java/test/forgon/constant/Constants.java
===================================================================
diff -u -r20796 -r20834
--- ssts-web/src/test/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 20796)
+++ ssts-web/src/test/java/test/forgon/constant/Constants.java (.../Constants.java) (revision 20834)
@@ -158,6 +158,18 @@
* 清洗程序手工清洗的条码，手工清洗机包含这个清洗程序
*/
public static final String CLEAN_METHOD_HAND = "010172008";
+ /**
+ * 1号高温蒸汽灭菌炉条码（所属科室：测试供应室，含有的灭菌程序：P01、P02、P03、P04、P05）
+ */
+ public static final String STERILIZER1 = "010175001";
+ /**
+ * 2号高温蒸汽灭菌炉（所属科室：测试供应室，含有的灭菌程序：P01、P02、P03、P04、P05）
+ */
+ public static final String STERILIZER2 = "010175003";
+ /**
+ * 6号高温蒸汽灭菌炉（所属科室：测试手术室，含有的灭菌程序：P06、低温等离子、高水平消毒、超大超重器械）
+ */
+ public static final String STERILIZER6 = "010175002";
}
/**
* 材料名称常量
@@ -276,6 +288,21 @@
public static final String RINSER_2 = "清洗机2";
}
+ public static final class Sterilizer{
+ /**
+ * 1号高温蒸汽灭菌炉（所属科室：测试供应室，条码：010175001，含有的灭菌程序：P01、P02、P03、P04、P05）
+ */
+ public static final String STERILIZER1 = "1号高温蒸汽灭菌炉";
+ /**
+ * 2号高温蒸汽灭菌炉（所属科室：测试供应室，条码：010175003，含有的灭菌程序：P01、P02、P03、P04、P05）
+ */
+ public static final String STERILIZER2 = "2号高温蒸汽灭菌炉";
+ /**
+ * 6号高温蒸汽灭菌炉（所属科室：测试手术室，条码：010175002，含有的灭菌程序：P06、低温等离子、高水平消毒、超大超重器械）
+ */
+ public static final String STERILIZER6 = "6号高温蒸汽灭菌炉";
+ }
+
public static final class CleanMethodName{
/**
* 清洗程序P1，清洗机1包含这个清洗程序
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java
===================================================================
diff -u -r20829 -r20834
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java (.../TousseInstanceReviewManagerTests.java) (revision 20829)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java (.../TousseInstanceReviewManagerTests.java) (revision 20834)
@@ -88,7 +88,7 @@
//4.1器械包打包审核
//tousseInstanceManager.reviewTousseInstance(tousseInstance.getId() + "", null, null, "");
packingManager.reviewTousseInstance(String.valueOf(tousseInstance.getId()), "018000001",
- "器械组", "cssduser1","cssduser1", new Date());
+ Constants.TASKGROUP_LINCHUANGQIXIEZU, "cssduser1","cssduser1", new Date());
//5.1.断言器械包实例状态
assertEquals(TousseInstance.STATUS_REVIEWED, tousseInstance.getStatus());
@@ -146,7 +146,7 @@
//4.2器械包打包审核
//tousseInstanceManager.reviewTousseInstance(tousseInstance.getId() + "", "018000001", null, "");
packingManager.reviewTousseInstance(String.valueOf(tousseInstance.getId()), "018000001",
- "器械组", "cssduser1","cssduser1", new Date());
+ Constants.TASKGROUP_LINCHUANGQIXIEZU, "cssduser1","cssduser1", new Date());
//5.2.断言器械包实例状态
assertEquals(TousseInstance.STATUS_REVIEWED, tousseInstance.getStatus());
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java
===================================================================
diff -u -r19721 -r20834
--- ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java (.../TestTousseOverLoad.java) (revision 19721)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java (.../TestTousseOverLoad.java) (revision 20834)
@@ -16,7 +16,6 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Predicate;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.Rollback;
import org.testng.annotations.Test;
import test.forgon.constant.Constants;
@@ -196,7 +195,7 @@
//自定义器械包
tousseDefinition11.setName("Test自定义包类型的器械包");
tousseDefinition11.setIsCleanedEntirely("是");
- tousseDefinition11.setTaskGroup("器械组");
+ tousseDefinition11.setTaskGroup(Constants.TASKGROUP_LINCHUANGQIXIEZU);
tousseDefinition11.setTousseType(TousseDefinition.PACKAGE_TYPE_CUSTOM);
tousseDefinition11.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
tousseDefinition11.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java
===================================================================
diff -u -r19718 -r20834
--- ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java (.../SterieRecordManagerTests.java) (revision 19718)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java (.../SterieRecordManagerTests.java) (revision 20834)
@@ -27,7 +27,6 @@
import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager;
import com.forgon.disinfectsystem.entity.basedatamanager.container.Container;
import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer;
-import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
@@ -639,6 +638,7 @@
Collection srIds = Collections.singleton(sr.getId());
Thread t1 = new Thread(){
+ @Override
public void run() {
runWithTransNewManager.runWith_TRANS_NEW(new RunWithTransNewTask() {
@Override
@@ -651,6 +651,7 @@
t1.start();
Thread t2 = new Thread(){
+ @Override
public void run() {
runWithTransNewManager.runWith_TRANS_NEW(new RunWithTransNewTask() {
@Override
@@ -663,6 +664,7 @@
t2.start();
Thread t3 = new Thread(){
+ @Override
public void run() {
runWithTransNewManager.runWith_TRANS_NEW(new RunWithTransNewTask() {
@Override
@@ -697,7 +699,7 @@
ti_开胸包.setStatus(TousseInstance.STATUS_PACKED);
tousseInstanceManager.saveOrUpdate(ti_开胸包);
//审核管理
- packingManager.reviewTousseInstance(ti_开胸包.getId().toString(), "", "手术器械组", "oruser1全名", "oruser1", new Date());
+ packingManager.reviewTousseInstance(ti_开胸包.getId().toString(), "",Constants.TASKGROUP_SHOUSHUQIXIEZU, "oruser1全名", "oruser1", new Date());
//灭菌管理
Sterilizer s_6号高温蒸汽灭菌炉 = sterilizerManager.getSterilizerByName("6号高温蒸汽灭菌炉"); //灭菌炉
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
===================================================================
diff -u -r20805 -r20834
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java (.../ApplicationGoodsVo.java) (revision 20805)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java (.../ApplicationGoodsVo.java) (revision 20834)
@@ -123,6 +123,13 @@
public void setDiposable(String diposable) {
this.diposable = diposable;
}
+ /**
+ * 是否一次性物品.如果是,返回true,否则返回false
+ * @return
+ */
+ public boolean disposable(){
+ return Constants.STR_YES.equals(diposable);
+ }
public int getApplicationAmount() {
return applicationAmount;