|
@@ -733,8 +733,8 @@ public class ApiController {
|
|
|
.collect(Collectors.toList());
|
|
|
mapOne.put("subList", subTypeList);
|
|
|
|
|
|
- // 判断是否有配置医院拜访的任务类型模板
|
|
|
- mapOne.put("checkHospitalTemplate", wmDeptTaskTypeTemplateService.checkDeptIdHospitalTemplate(sysU.getDeptId()));
|
|
|
+ // 查询配置了任务类型模板的任务类型
|
|
|
+ mapOne.put("hasTaskTypeTemplate", wmDeptTaskTypeTemplateService.listTaskTypeByDeptId(sysU.getDeptId()));
|
|
|
|
|
|
// 结算通道
|
|
|
|
|
@@ -2460,16 +2460,39 @@ public class ApiController {
|
|
|
if (null != wmTaskContent.getTemp3()) {
|
|
|
List<WmUserSign> wmUserSignList = new ArrayList<>();
|
|
|
WmUserSign userSign = wmUserSignService.getById(wmTaskContent.getTemp3());
|
|
|
- // 如果配置了医院拜访的任务类型模板,则关联保存签到详情
|
|
|
- if (wmDeptTaskTypeTemplateService.checkDeptIdHospitalTemplate(Integer.valueOf(wmTask.getDeptId()))) {
|
|
|
+ // 如果配置了医院拜访的任务类型模板,则关联查询签到详情
|
|
|
+ if (wmDeptTaskTypeTemplateService.checkDeptIdHospitalTemplate(Integer.valueOf(wmTask.getDeptId()), wmTask.getTaskTypeId())) {
|
|
|
WmUserSignDetail userSignDetail = wmUserSignDetailService.getOne(Wrappers.<WmUserSignDetail>lambdaQuery()
|
|
|
.eq(WmUserSignDetail::getSignId, userSign.getId()));
|
|
|
if (userSignDetail != null) {
|
|
|
if (ArrayUtil.isNotEmpty(userSignDetail.getPurpose())) {
|
|
|
- String[] purposeNameArr = Stream.of(userSignDetail.getPurpose())
|
|
|
- .map(s -> UserSignPurposeEnum.resolve(s).getName())
|
|
|
- .toArray(String[]::new);
|
|
|
- userSignDetail.setPurposeName(purposeNameArr);
|
|
|
+ List<Integer> purposeList = Stream.of(userSignDetail.getPurpose())
|
|
|
+ .map(Integer::parseInt)
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ String dictType = null;
|
|
|
+ switch (userSign.getSignEntType()) {
|
|
|
+ case "1":
|
|
|
+ dictType = "user_sign_detail_purpose";
|
|
|
+ break;
|
|
|
+ case "2":
|
|
|
+ dictType = "user_sign_detail_distribution_purpose";
|
|
|
+ break;
|
|
|
+ case "3":
|
|
|
+ dictType = "user_sign_detail_pharmacy_purpose";
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ dictType = "";
|
|
|
+ }
|
|
|
+ List<SysDictItem> itemList = sysDictItemService.list(Wrappers.<SysDictItem>lambdaQuery()
|
|
|
+ .in(SysDictItem::getValue, purposeList)
|
|
|
+ .eq(SysDictItem::getType, dictType)
|
|
|
+ .eq(SysDictItem::getDelFlag, DelEnum.NOT_DEL.val()));
|
|
|
+ if (CollUtil.isNotEmpty(itemList)) {
|
|
|
+ String[] purposeNameArr = itemList.stream()
|
|
|
+ .map(SysDictItem::getLabel)
|
|
|
+ .toArray(String[]::new);
|
|
|
+ userSignDetail.setPurposeName(purposeNameArr);
|
|
|
+ }
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(userSignDetail.getResult())) {
|
|
|
userSignDetail.setResultName(UserSignResultEnum.resolve(userSignDetail.getResult()).getName());
|