|
@@ -129,6 +129,7 @@ public class ApiController {
|
|
private final SysPublicParamService sysPublicParamService;
|
|
private final SysPublicParamService sysPublicParamService;
|
|
private final WmWkAlbumService wmWkAlbumService;
|
|
private final WmWkAlbumService wmWkAlbumService;
|
|
private final WmDeptTaskTypeTemplateService wmDeptTaskTypeTemplateService;
|
|
private final WmDeptTaskTypeTemplateService wmDeptTaskTypeTemplateService;
|
|
|
|
+ private final WmUserSignDetailService wmUserSignDetailService;
|
|
|
|
|
|
@SysLog("通过任务类型获取表单配置")
|
|
@SysLog("通过任务类型获取表单配置")
|
|
@ApiOperation(value = "任务类型表单配置-通过任务类型获取表单配置", notes = "根据任务类型获取表单配置")
|
|
@ApiOperation(value = "任务类型表单配置-通过任务类型获取表单配置", notes = "根据任务类型获取表单配置")
|
|
@@ -2218,7 +2219,16 @@ public class ApiController {
|
|
if (null != wmTaskContent) {
|
|
if (null != wmTaskContent) {
|
|
if (null != wmTaskContent.getTemp3()) {
|
|
if (null != wmTaskContent.getTemp3()) {
|
|
List<WmUserSign> wmUserSignList = new ArrayList<>();
|
|
List<WmUserSign> wmUserSignList = new ArrayList<>();
|
|
- wmUserSignList.add(wmUserSignService.getById(wmTaskContent.getTemp3()));
|
|
|
|
|
|
+ WmUserSign userSign = wmUserSignService.getById(wmTaskContent.getTemp3());
|
|
|
|
+ // 如果配置了医院拜访的任务类型模板,则关联保存签到详情
|
|
|
|
+ if (wmDeptTaskTypeTemplateService.checkDeptIdHospitalTemplate(Integer.valueOf(wmTask.getDeptId()))) {
|
|
|
|
+ WmUserSignDetail userSignDetail = wmUserSignDetailService.getOne(Wrappers.<WmUserSignDetail>lambdaQuery()
|
|
|
|
+ .eq(WmUserSignDetail::getSignId, userSign.getId()));
|
|
|
|
+ if (userSignDetail != null) {
|
|
|
|
+ userSign.setUserSignDetail(userSignDetail);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ wmUserSignList.add(userSign);
|
|
return R.ok(wmUserSignList);
|
|
return R.ok(wmUserSignList);
|
|
}
|
|
}
|
|
}
|
|
}
|