Merge branch 'feat-20230329-mazhou' into temp-pre

db/v2.0/230330.sql

@@ -1,5 +1,5 @@
 INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp32', '关联积分包', 1, 'domain', 1, 200, null, '', 'package_list', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
-INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp12', '药品', 2, 'domain', 1, 200, null, '', 'package_drug_list', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
+INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp12', '药品', 2, 'select', 1, 200, null, '', 'package_drug_list', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
 INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp13', '数量', 4, 'number', 1, 20, null, '', '', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
 INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp4', '时间', 5, 'datetime', 1, 200, null, '', '', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);
 INSERT INTO wm_task_content_config ( base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('47', '47', 'temp7', '现场照片', 6, 'img', 1, 5, null, '', '', '1', null, '0', '0', 1, '2023-03-16 15:59:15', null, null, null);

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

@@ -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);
 	}