|
|
@@ -284,9 +284,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
|
|
|
if (wmScorePackage.getLocation() != null) {
|
|
|
wmScorePackage.setSubjectLocation(wmScorePackage.getLocation().name());
|
|
|
}
|
|
|
- if (StrUtil.isBlank(wmScorePackage.getSubjectLocation())){
|
|
|
- return R.failed("结算积分包未勾选税源地");
|
|
|
- }
|
|
|
+// if (StrUtil.isBlank(wmScorePackage.getSubjectLocation())){
|
|
|
+// return R.failed("结算积分包未勾选税源地");
|
|
|
+// }
|
|
|
|
|
|
// 按结算对象分组，统计分别对应的结算信息
|
|
|
for (String userId : userTaskMap.keySet()) {
|
|
|
@@ -347,29 +347,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
|
|
|
resultMap.put("wsp", wmScorePackage);
|
|
|
resultMap.put("notes", toSettleNotes);
|
|
|
resultMap.put("userNotes", userNotes);
|
|
|
- // 显示实际完成积分值
|
|
|
-// resultMap.put("finishScore", "0");
|
|
|
-
|
|
|
-// if (PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(wmScorePackage.getPackageType1()) || PackageTypeEnum.TYPE1_HCP_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
|
|
|
-//
|
|
|
-// List<WmTask> tasks = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
|
|
|
-// .eq(WmTask::getRealFlag, "0")
|
|
|
-// .eq(WmTask::getScorePackageId, wmScorePackage.getId())
|
|
|
-// .eq(WmTask::getTaskStatus, "3"));
|
|
|
-//
|
|
|
-// BigDecimal total = BigDecimal.ZERO;
|
|
|
-//
|
|
|
-// for (WmTask task : tasks) {
|
|
|
-// total = total.add(new BigDecimal(task.getScore()));
|
|
|
-// }
|
|
|
-//
|
|
|
-// if (PackageTypeEnum.TYPE1_HCP_PACKAGE.val().equals(wmScorePackage.getPackageType1())) {
|
|
|
-// // 如果是患者教育，则转换积分值 '分'->'元'
|
|
|
-// resultMap.put("finishScore", total.divide(new BigDecimal("100"), mc));
|
|
|
-// } else {
|
|
|
-// resultMap.put("finishScore", total.intValue());
|
|
|
-// }
|
|
|
-// }
|
|
|
|
|
|
return R.ok(resultMap);
|
|
|
}
|
