|
|
@@ -1,10 +1,9 @@
|
|
|
package com.nb.app.assistant.controller;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
-import com.alibaba.druid.sql.visitor.functions.Bin;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.nb.app.assistant.api.enums.ApplyEnum;
|
|
|
import com.nb.app.assistant.controller.vo.EditPatientNameVO;
|
|
|
@@ -12,7 +11,6 @@ import com.nb.app.assistant.controller.vo.InviteCodePatientVo;
|
|
|
import com.nb.app.assistant.controller.vo.MonitorAddVo;
|
|
|
import com.nb.app.assistant.api.entity.AssistantUserBindEntity;
|
|
|
import com.nb.app.assistant.api.enums.BindEnum;
|
|
|
-import com.nb.app.assistant.entity.AssistantUserEntity;
|
|
|
import com.nb.app.assistant.service.LocalAssistantUserBindService;
|
|
|
import com.nb.app.assistant.service.dto.AssistPatientResult;
|
|
|
import com.nb.app.assistant.service.dto.EditAssistBindDto;
|
|
|
@@ -26,7 +24,6 @@ import com.nb.web.api.feign.IPatientClient;
|
|
|
import com.nb.web.api.feign.result.PatientByInviteCodeResult;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
-import javassist.compiler.ast.BinExpr;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
@@ -51,7 +48,6 @@ public class PatientOperationController {
|
|
|
private final IPatientClient patientClient;
|
|
|
|
|
|
private final LocalAssistantUserBindService userBindService;
|
|
|
-
|
|
|
/**
|
|
|
* 描述: 查询当前用户所看护的所有病人信息
|
|
|
* @author lifang
|
|
|
@@ -75,8 +71,12 @@ public class PatientOperationController {
|
|
|
*/
|
|
|
@PostMapping("/view/{bindId}")
|
|
|
@ApiOperation("根据id查询绑定关系详情")
|
|
|
- public R detail(@PathVariable("bindId") String bindId){
|
|
|
- return R.success(userBindService.getById(bindId));
|
|
|
+ public R<AssistantUserBindEntity> detail(@PathVariable("bindId") String bindId){
|
|
|
+ AssistantUserBindEntity result = userBindService.getById(bindId);
|
|
|
+ if(ObjectUtil.isNotNull(result)){
|
|
|
+ result.setManageType(patientClient.getManageType(result.getPatientId()));
|
|
|
+ }
|
|
|
+ return R.success(result);
|
|
|
}
|
|
|
|
|
|
|