feat: 多人积分包发包

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2574,8 +2574,12 @@ public class WmScorePackageController {
 			List<String> split = StrUtil.split(typeId, StrUtil.COMMA);
 			queryWrapper.in(WmScorePackage::getTypeid, split);
 		}
-		if (PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(String.valueOf(packageType1))
-				&& PackageTypeEnum.TYPE2_TASK_PACKAGE.val().equals(String.valueOf(packageType2))) {
+
+		boolean onePersonScorePackageFlag = PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(String.valueOf(packageType1))
+				&& PackageTypeEnum.TYPE2_TASK_PACKAGE.val().equals(String.valueOf(packageType2));
+		boolean multiPersonScorePackageFlag = PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(String.valueOf(packageType1))
+				&& PackageTypeEnum.TYPE2_TASK_PACKAGE.val().equals(String.valueOf(packageType2));
+		if (onePersonScorePackageFlag || multiPersonScorePackageFlag) {
 			// 如果是个人承接-按积分值，判断当前用户是否配置了团队负责人
 			List<WmTeam> teamList = wmTeamService.list(Wrappers.<WmTeam>lambdaQuery()
 					.eq(WmTeam::getDeptId, sendDeptId)

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/PackageTypeEnum.java

@@ -27,6 +27,11 @@ public enum PackageTypeEnum {
 	 * type1问诊包（患者教育）
 	 */
 	TYPE1_HCP_PACKAGE("5", "患者教育", "问诊包"),
+	/**
+	 * type1积分包+任务包
+	 */
+	TYPE1_SCORE_AND_TASK_PACKAGE("6", "定额定量", "积分任务包"),
+
 	/**
 	 * type2任务包（定额、定量、通用）
 	 */

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

@@ -713,6 +713,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		if (PackageTypeEnum.TYPE1_HCP_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
 			// 患者教育，固定只能一人领取
 			wmScorePackage.setUserNum(1);
+		} else if (PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
+			// 多人承接-按积分值
+			wmScorePackage.setUserNum(9999);
 		}
 		wmScorePackage.setCreateUser(currentUser.getId());
 		wmScorePackage.setCreateTime(LocalDateTime.now());
@@ -792,8 +795,10 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					}
 				}
 			} else {
-				if (wmScorePackage.getPackageType1().equals("5") || wmScorePackage.getPackageType1().equals("4")
-						|| wmScorePackage.getPackageType2().equals("2")) {
+				if (wmScorePackage.getPackageType1().equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val())
+						|| wmScorePackage.getPackageType1().equals(PackageTypeEnum.TYPE1_HCP_PACKAGE.val())
+						|| wmScorePackage.getPackageType1().equals(PackageTypeEnum.TYPE1_SETTLE_PACKAGE.val())
+						|| wmScorePackage.getPackageType2().equals(PackageTypeEnum.TYPE2_SETTLE_PACKAGE.val())) {
 					//结算包
 					WmScoreTaskType wmScoreTaskType = new WmScoreTaskType();
 					wmScoreTaskType.setScoreId(wmScorePackage.getId());