feat: 积分包终止调整5

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -2916,7 +2916,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					.anyMatch(wmTask -> ReportEnum.REPORT_STATUS_APPROVAL.getType().equals(wmTask.getReportDrugApprovalStatus())
 							|| ReportEnum.REPORT_STATUS_APPROVAL.getType().equals(wmTask.getReportOneApprovalStatus())
 							|| ReportEnum.REPORT_STATUS_PART_APPROVAL.getType().equals(wmTask.getReportDrugApprovalStatus())
-							|| ReportEnum.REPORT_STATUS_PART_APPROVAL.getType().equals(wmTask.getReportOneApprovalStatus()));
+							|| ReportEnum.REPORT_STATUS_PART_APPROVAL.getType().equals(wmTask.getReportOneApprovalStatus())
+							|| StrUtil.isBlank(wmTask.getReportDrugApprovalOpinion())
+							|| StrUtil.isBlank(wmTask.getReportOneApprovalOpinion()));
 			if (pendingReportApprovalFlag) {
 				throw new RuntimeException("有待审批的任务,不允许终止");
 			}
@@ -2939,7 +2941,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TERMINATED.val());
 		} else {
 			// 剩余回收: 没完成的那部分(剩余回收积分值 = 积分包值 - 审核通过的任务积分值)
-			updateScorePackage.setScore(scorePackage.getScore() - approvedScore);
+			updateScorePackage.setScore(approvedScore);
 			// 根据是否存在父级包,更新积分包完成状态
 			updateScorePackage.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.val());
 		}
@@ -2984,7 +2986,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			recoveryScore = scorePackage.getScore();
 		} else {
 			// 剩余回收
-			recoveryScore = approvedScore;
+			recoveryScore = scorePackage.getScore() - approvedScore;
 		}
 		// 如果关联了大包 回收整包的积分值到大包的可分配积分值。如果没有关联大包，回收整包积分值到该企业的余额
 		if (parentScorePackage != null) {