fix: 企业承接新增积分包-关联积分包NPE异常

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

@@ -1430,7 +1430,7 @@ public class WmScorePackageController {
 
 
 	/**
-	 * 根据上级药企获取关联积分包 二期  业务平台
+	 * 根据上级药企获取关联积分包 二期  业务平台(企业承接新增积分包的)
 	 *
 	 * @return R
 	 */
@@ -1450,13 +1450,14 @@ public class WmScorePackageController {
 			List<WmScorePackage> list = wmScorePackageService.selectByReRelatedService(wmScorePackage);
 			if (list.size() > 0) {
 				for (WmScorePackage wmScorePackage1 : list) {
-					if (wmScorePackage1.getKfpjf().equals(0)) {
+					if (wmScorePackage1.getKfpjf() == null || wmScorePackage1.getKfpjf() <= 0) {
 						// 过滤掉可分配积分值为0的积分包
 						continue;
 					}
 					Map<String, Object> map1 = new HashMap<>();
 					map1.put("relationScoreName", wmScorePackage1.getScorePackageName());
 					map1.put("drugProducerList", wmScorePackage1.getDrugProducerList());
+					map1.put("drugtable", wmScorePackage1.getDrugtable());
 					map1.put("id", wmScorePackage1.getId());
 					answerList.add(map1);
 				}
@@ -1471,13 +1472,14 @@ public class WmScorePackageController {
 			wmScorePackage.setDeptId(wmScorePackage.getRelatedService());
 			List<WmScorePackage> list = wmScorePackageService.selectByReRelatedService(wmScorePackage);
 			for (WmScorePackage wmScorePackage1 : list) {
-				if (wmScorePackage1.getKfpjf().equals(0)) {
+				if (wmScorePackage1.getKfpjf() == null || wmScorePackage1.getKfpjf() <= 0) {
 					// 过滤掉可分配积分值为0的积分包
 					continue;
 				}
 				Map<String, Object> map3 = new HashMap<>();
 				map3.put("id", wmScorePackage1.getId());
 				map3.put("drugProducerList", wmScorePackage1.getDrugProducerList());
+				map3.put("drugtable", wmScorePackage1.getDrugtable());
 				map3.put("relationScoreName", wmScorePackage1.getScorePackageName());
 				answerList.add(map3);
 			}