fix(controller): 1.修复已结算没有值问题；2.修复二级cso积分规则回显；3.过滤关联积分包为0的。

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

@@ -780,7 +780,7 @@ public class WmDaAgentController {
 		List wmDaDrugEnts = null;
 		if (byId.getLevel() == 2) {
 			wmDaDrugEnts = wmDaAgentService.selectWmDaDrugEntByDeptId(byId.getDeptId());
-		} else if (byId.getLevel() == 3) {
+		} else if (byId.getLevel() == 3 || byId.getLevel() == 4) {
 			wmDaDrugEnts = wmDaAgentService.selectWmDaAgentByRelationId(byId.getDeptId());
 		}
 		return R.ok(wmDaDrugEnts);

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

@@ -1399,6 +1399,10 @@ public class WmScorePackageController {
 			List<WmScorePackage> list = wmScorePackageService.selectByReRelatedService(wmScorePackage);
 			if (list.size() > 0) {
 				for (WmScorePackage wmScorePackage1 : list) {
+					if (wmScorePackage1.getKfpjf().equals(0)) {
+						// 过滤掉可分配积分值为0的积分包
+						continue;
+					}
 					Map<String, Object> map1 = new HashMap<>();
 					map1.put("relationScoreName", wmScorePackage1.getScorePackageName());
 					map1.put("id", wmScorePackage1.getId());
@@ -1415,6 +1419,10 @@ public class WmScorePackageController {
 			wmScorePackage.setDeptId(wmScorePackage.getRelatedService());
 			List<WmScorePackage> list = wmScorePackageService.selectByReRelatedService(wmScorePackage);
 			for (WmScorePackage wmScorePackage1 : list) {
+				if (wmScorePackage1.getKfpjf().equals(0)) {
+					// 过滤掉可分配积分值为0的积分包
+					continue;
+				}
 				Map<String, Object> map3 = new HashMap<>();
 				map3.put("id", wmScorePackage1.getId());
 				map3.put("relationScoreName", wmScorePackage1.getScorePackageName());
@@ -1683,32 +1691,6 @@ public class WmScorePackageController {
 				} else {
 					return R.failed("cso没有分配积分规则");
 				}
-//				WmScorePackage wmScorePackageRule = new WmScorePackage();
-//				wmScorePackageRule.setDelFlag("0");
-//				List<WmScorePackage> wmScorePackageRuleList = wmScorePackageService.list(Wrappers.query(wmScorePackageRule));
-//				for (WmScorePackage wm : wmScorePackageRuleList) {
-//					if (wmScorePackage.getRelationScoreId().equals(wm.getId())) {
-//						WmTaskType wmTaskType = new WmTaskType();
-//						wmTaskType.setRuleId(wm.getRuleId());
-//						List<WmTaskType> wmTaskTypeList = wmTaskTypeService.selectByRuleId(wmTaskType);
-//						if (wmTaskTypeList.size() > 0) {
-//							wmScorePackage.setRuleId(wm.getRuleId());
-//							wmScorePackage.setDrugEntId(wm.getDrugEntId());
-//						} else {
-//							return R.failed("需要药企给下级cso分配积分规则");
-//						}
-//					} else if ("".equals(wmScorePackage.getRelationScoreId())) {
-//						WmTaskType wmTaskType = new WmTaskType();
-//						wmTaskType.setRuleId(wmScorePackage.getAcceptSug());
-//						List<WmTaskType> wmTaskTypeList = wmTaskTypeService.selectByRuleId(wmTaskType);
-//						if (wmTaskTypeList.size() > 0) {
-//							wmScorePackage.setRuleId(wmScorePackage.getAcceptSug());
-//							wmScorePackage.setDrugEntId("");
-//						} else {
-//							return R.failed("cso没有分配积分呢规则");
-//						}
-//					}
-//				}
 			} else {
 				// 没有关联积分包的情况
 				List<WmTaskType> taskTypeList = wmTaskTypeService.list(Wrappers.<WmTaskType>lambdaQuery()
@@ -1720,10 +1702,7 @@ public class WmScorePackageController {
 					return R.failed("cso没有分配积分规则");
 				}
 			}
-		}/* else if (sysDeptRuleId.getLevel() == 3 && "".equals(wmScorePackage.getRelationScoreId())) {
-			wmScorePackage.setRuleId(wmScorePackage.getAcceptSug());
-			wmScorePackage.setDrugEntId("");
-		}*/
+		}
 
 		boolean isAnswer = wmScorePackageService.save(wmScorePackage);
 

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -898,8 +898,9 @@
 			 )a,wm_score_package b, wm_score_package c where a.score_package_id=b.id and b.relation_score_id=c.id and
 				(b.relation_score_id = #{query.id} or c.relation_score_id = #{query.id})
 			 union all
-				select sum(score) as payScore,0 as ysh from wm_task  where report_drug_approval_opinion=1 and  (report_one_id in (
-				    select id from wm_report where report_status=6 and score_id=#{query.id})
+				select sum(score) as payScore,0 as ysh from wm_task  where
+				    (report_drug_approval_opinion=1 or report_one_approval_opinion=1) and (report_one_id in (
+				    	select id from wm_report where report_status=6 and score_id=#{query.id})
 					or report_second_id in (select id from wm_report where report_status=6 and score_id=#{query.id})
 					or report_drug_id in (select id from wm_report where report_status=6 and score_id=#{query.id})
 				)