From 737755651fdea6e3833405c74f772120a276e6da Mon Sep 17 00:00:00 2001 From: liu Date: Wed, 13 Dec 2023 15:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AskPrimaryController.java | 2 +- .../pojo/vo/SaveDiagnosisPrimaryReqVO.java | 33 +++++++++++++++---- .../service/impl/AskPrimaryServiceImpl.java | 19 +++++------ 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java index 03f58540..eea4303f 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java @@ -50,7 +50,7 @@ public class AskPrimaryController { } @ApiOperation("查询选择初步诊断关联的问诊记录") - @PostMapping("queryRecordForPrimaryChoose") + @GetMapping("queryRecordForPrimaryChoose") public RecordForPrimaryChooseVO queryRecordForPrimaryChoose(String processId){ return askPrimaryService.queryRecordForPrimaryChoose(processId); } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java index 925a8090..bc907fd0 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java @@ -1,5 +1,7 @@ package com.supervision.pojo.vo; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.supervision.model.DiagnosisPrimary; import com.supervision.model.DiagnosisPrimaryRelation; import io.swagger.annotations.ApiModel; @@ -9,14 +11,33 @@ import lombok.EqualsAndHashCode; import java.util.List; -@EqualsAndHashCode(callSuper = true) @Data -@ApiModel(parent = DiagnosisPrimary.class) -public class SaveDiagnosisPrimaryReqVO extends DiagnosisPrimary { +@ApiModel +public class SaveDiagnosisPrimaryReqVO { - // 关联的初步诊断列表 - @ApiModelProperty("关联的初步诊断列表") - private RecordForPrimaryChooseVO choose; + /** + * 诊断流程ID + */ + @ApiModelProperty("诊断流程ID") + private String processId; + + /** + * 初步诊断疾病,关联disease表ID + */ + @ApiModelProperty("初步诊断疾病ID,关联disease表ID") + private String primaryDiagnosisId; + + @ApiModelProperty("患者病情(初步诊断填写)") + private String patientDiseaseInfo; + + @ApiModelProperty("问诊ID列表") + private List askIdList; + + @ApiModelProperty("辅助检查ID列表") + private List ancillaryIdList; + + @ApiModelProperty("体格检查ID列表") + private List physicalIdList; } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java index 81ae8a61..b348606e 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java @@ -62,14 +62,13 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { diagnosisPrimary.setCreateUserId(UserUtil.getUser().getId()); diagnosisPrimaryService.save(diagnosisPrimary); // 然后开始保存初步诊断关键的诊断 - RecordForPrimaryChooseVO choose = reqVO.getChoose(); - if (CollUtil.isNotEmpty(choose.getAskList())){ - List askRelationList = choose.getAskList().stream().map(e -> { + if (CollUtil.isNotEmpty(reqVO.getAskIdList())){ + List askRelationList = reqVO.getAskIdList().stream().map(e -> { DiagnosisPrimaryRelation relation = new DiagnosisPrimaryRelation(); relation.setProcessId(diagnosisPrimary.getProcessId()); relation.setPrimaryId(diagnosisPrimary.getId()); relation.setType(1); - relation.setRelationId(e.getNodeId()); + relation.setRelationId(e); relation.setCreateUserId(UserUtil.getUser().getId()); return relation; }).collect(Collectors.toList()); @@ -77,13 +76,13 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { } - if (CollUtil.isNotEmpty(choose.getPhysicalList())){ - List physicalRelationList = choose.getPhysicalList().stream().map(e -> { + if (CollUtil.isNotEmpty(reqVO.getPhysicalIdList())){ + List physicalRelationList = reqVO.getPhysicalIdList().stream().map(e -> { DiagnosisPrimaryRelation relation = new DiagnosisPrimaryRelation(); relation.setProcessId(diagnosisPrimary.getProcessId()); relation.setPrimaryId(diagnosisPrimary.getId()); relation.setType(2); - relation.setRelationId(e.getNodeId()); + relation.setRelationId(e); relation.setCreateUserId(UserUtil.getUser().getId()); return relation; }).collect(Collectors.toList()); @@ -91,13 +90,13 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { } - if (CollUtil.isNotEmpty(choose.getAncillaryList())){ - List ancillaryRelationList = choose.getAncillaryList().stream().map(e -> { + if (CollUtil.isNotEmpty(reqVO.getAncillaryIdList())){ + List ancillaryRelationList = reqVO.getAncillaryIdList().stream().map(e -> { DiagnosisPrimaryRelation relation = new DiagnosisPrimaryRelation(); relation.setProcessId(diagnosisPrimary.getProcessId()); relation.setPrimaryId(diagnosisPrimary.getId()); relation.setType(3); - relation.setRelationId(e.getNodeId()); + relation.setRelationId(e); relation.setCreateUserId(UserUtil.getUser().getId()); return relation; }).collect(Collectors.toList());