|
@@ -4,9 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.nb.app.assistant.api.bean.HandleBindResult;
|
|
import com.nb.app.assistant.api.bean.HandleBindResult;
|
|
|
-import com.nb.app.assistant.api.entity.AssistantUserBindEntity;
|
|
|
|
|
import com.nb.app.assistant.api.feign.IAssistantUserBindClient;
|
|
import com.nb.app.assistant.api.feign.IAssistantUserBindClient;
|
|
|
-import com.nb.app.assistant.api.feign.result.ContactQuery;
|
|
|
|
|
import com.nb.app.assistant.api.feign.result.PatientBindAssistantResult;
|
|
import com.nb.app.assistant.api.feign.result.PatientBindAssistantResult;
|
|
|
import com.nb.app.assistant.api.feign.result.UpdateBindPatientParam;
|
|
import com.nb.app.assistant.api.feign.result.UpdateBindPatientParam;
|
|
|
import com.nb.app.doctor.controller.vo.ChangeManageVo;
|
|
import com.nb.app.doctor.controller.vo.ChangeManageVo;
|
|
@@ -24,6 +22,7 @@ import com.nb.web.api.feign.query.GetPatientInfoVo;
|
|
|
import com.nb.web.api.feign.query.PatientMonitorQuery;
|
|
import com.nb.web.api.feign.query.PatientMonitorQuery;
|
|
|
import com.nb.web.api.feign.result.InviteCodeResult;
|
|
import com.nb.web.api.feign.result.InviteCodeResult;
|
|
|
import com.nb.web.api.feign.result.PatientMonitorDetailResult;
|
|
import com.nb.web.api.feign.result.PatientMonitorDetailResult;
|
|
|
|
|
+import com.nb.web.api.feign.result.PatientMonitorResult;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
import io.swagger.annotations.ApiParam;
|
|
@@ -57,9 +56,10 @@ public class PatientMonitorController {
|
|
|
@PostMapping("/monitor/{consult}/no_page")
|
|
@PostMapping("/monitor/{consult}/no_page")
|
|
|
@Log(title = "医生端获取病人输注列表")
|
|
@Log(title = "医生端获取病人输注列表")
|
|
|
@ApiOperation(value = "输注监控列表")
|
|
@ApiOperation(value = "输注监控列表")
|
|
|
- public R<List<PatientMonitorConsultResult>> selectPagePatient(@PathVariable("consult")@ApiParam("是否为咨询模式") boolean consult,@RequestBody PatientMonitorQuery query) {
|
|
|
|
|
|
|
+ public R<List<PatientMonitorResult>> selectPagePatient(@PathVariable("consult")@ApiParam("是否为咨询模式") boolean consult, @RequestBody PatientMonitorQuery query) {
|
|
|
log.info("医生查看输注监控列表,【{}】", JSONUtil.toJsonStr(query));
|
|
log.info("医生查看输注监控列表,【{}】", JSONUtil.toJsonStr(query));
|
|
|
- List<PatientMonitorConsultResult> results = BeanUtil.copyToList(patientClient.selectAll(query), PatientMonitorConsultResult.class);
|
|
|
|
|
|
|
+// List<PatientMonitorConsultResult> results = BeanUtil.copyToList(patientClient.selectAll(query), PatientMonitorConsultResult.class);
|
|
|
|
|
+ return R.success(patientClient.selectAll(query));
|
|
|
// if(consult){
|
|
// if(consult){
|
|
|
// if (CollectionUtil.isNotEmpty(results)) {
|
|
// if (CollectionUtil.isNotEmpty(results)) {
|
|
|
// Map<String, List<PatientMonitorConsultResult>> resultGroupByPatientId = results.stream().collect(Collectors.groupingBy(PatientMonitorConsultResult::getPatientId));
|
|
// Map<String, List<PatientMonitorConsultResult>> resultGroupByPatientId = results.stream().collect(Collectors.groupingBy(PatientMonitorConsultResult::getPatientId));
|
|
@@ -86,7 +86,6 @@ public class PatientMonitorController {
|
|
|
// }
|
|
// }
|
|
|
// }
|
|
// }
|
|
|
// }
|
|
// }
|
|
|
- return R.success(results);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@ApiOperation("修改看护位置")
|
|
@ApiOperation("修改看护位置")
|