|
@@ -757,6 +757,15 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
tasktypeList.add(addTaskTypeTree40);
|
|
tasktypeList.add(addTaskTypeTree40);
|
|
tasktypeList.add(addTaskTypeTree41);
|
|
tasktypeList.add(addTaskTypeTree41);
|
|
}
|
|
}
|
|
|
|
+ // 如果存在taskTypeId=42 则同时增加手术跟台-一级/手术跟台-二级/手术跟台-三级任务类型(42/43/44)
|
|
|
|
+ if (tasktypeList.stream().anyMatch(wmTaskTypeTree -> "42".equals(wmTaskTypeTree.getTaskTypeId()))) {
|
|
|
|
+ WmTaskTypeTree addTaskTypeTree43 = new WmTaskTypeTree();
|
|
|
|
+ addTaskTypeTree43.setTaskTypeId("43");
|
|
|
|
+ WmTaskTypeTree addTaskTypeTree44 = new WmTaskTypeTree();
|
|
|
|
+ addTaskTypeTree44.setTaskTypeId("44");
|
|
|
|
+ tasktypeList.add(addTaskTypeTree43);
|
|
|
|
+ tasktypeList.add(addTaskTypeTree44);
|
|
|
|
+ }
|
|
|
|
|
|
for (WmTaskTypeTree type : tasktypeList) {
|
|
for (WmTaskTypeTree type : tasktypeList) {
|
|
WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
|
|
WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
|
|
@@ -1363,6 +1372,15 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
wmScorePackage.getTaskTypeList().add(addTaskTypeTree40);
|
|
wmScorePackage.getTaskTypeList().add(addTaskTypeTree40);
|
|
wmScorePackage.getTaskTypeList().add(addTaskTypeTree41);
|
|
wmScorePackage.getTaskTypeList().add(addTaskTypeTree41);
|
|
}
|
|
}
|
|
|
|
+ // 如果存在taskTypeId=42 则同时增加手术跟台-一级/手术跟台-二级/手术跟台-三级任务类型(42/43/44)
|
|
|
|
+ if (wmScorePackage.getTaskTypeList().stream().anyMatch(wmTaskTypeTree -> "42".equals(wmTaskTypeTree.getTaskTypeId()))) {
|
|
|
|
+ WmTaskTypeTree addTaskTypeTree43 = new WmTaskTypeTree();
|
|
|
|
+ addTaskTypeTree43.setTaskTypeId("43");
|
|
|
|
+ WmTaskTypeTree addTaskTypeTree44 = new WmTaskTypeTree();
|
|
|
|
+ addTaskTypeTree44.setTaskTypeId("44");
|
|
|
|
+ wmScorePackage.getTaskTypeList().add(addTaskTypeTree43);
|
|
|
|
+ wmScorePackage.getTaskTypeList().add(addTaskTypeTree44);
|
|
|
|
+ }
|
|
|
|
|
|
for (WmTaskTypeTree type : tasktypeList) {
|
|
for (WmTaskTypeTree type : tasktypeList) {
|
|
WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
|
|
WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
|