Yaxin
/
virtual-patient
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manage：添加体格检查、辅助检查 诊断依据视图字段

Browse Source
dev_2.0.0
xueqingkun 1 year ago
parent 41dd81ac3f
commit c81b4055b2
10 changed files with 172 additions and 10 deletions
Show Stats Download Patch File Download Diff File

8
virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseAncillaryManageController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.supervision.manage.controller.diseasemanage;
import com.supervision.manage.service.DiseaseAncillaryManageService;
import com.supervision.model.DiseaseAncillary;
import com.supervision.vo.manage.DiseaseAncillaryReqVo;
import com.supervision.vo.manage.DiseaseAncillaryResVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -21,8 +22,9 @@ public class DiseaseAncillaryManageController {
@ApiOperation("新增辅助检查信息")
@PostMapping("/save")
public String saveAncillary(@RequestBody DiseaseAncillary diseaseAncillary) {
public String saveAncillary(@RequestBody DiseaseAncillaryReqVo diseaseAncillary) {
diseaseAncillary.dispersedDiagnosticCriteria();
DiseaseAncillary result = diseaseAncillaryManageService.saveAncillary(diseaseAncillary);
return result.getId();
@ -40,8 +42,9 @@ public class DiseaseAncillaryManageController {
@ApiOperation("修改辅助检查信息")
@PutMapping("/update")
public boolean updateAncillary(@RequestBody DiseaseAncillary diseaseAncillary) {
public boolean updateAncillary(@RequestBody DiseaseAncillaryReqVo diseaseAncillary) {
diseaseAncillary.dispersedDiagnosticCriteria();
return diseaseAncillaryManageService.updateAncillary(diseaseAncillary);
}
@ -54,6 +57,7 @@ public class DiseaseAncillaryManageController {
}
// todo： 根据疾病id 查询辅助检查项树
}

9
virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseasePhysicalManageController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.supervision.manage.controller.diseasemanage;
import com.supervision.manage.service.DiseasePhysicalManageService;
import com.supervision.vo.manage.DiseasePhysicalLocationNodeVo;
import com.supervision.vo.manage.DiseasePhysicalReqVo;
import com.supervision.vo.manage.DiseasePhysicalResVo;
import com.supervision.model.DiseasePhysical;
import com.supervision.vo.manage.PhysicalLocationNode;
@ -24,8 +25,9 @@ public class DiseasePhysicalManageController {
@ApiOperation("新增体格检查信息")
@PostMapping("/save")
public String savePhysical(@RequestBody DiseasePhysical diseasePhysical) {
public String savePhysical(@RequestBody DiseasePhysicalReqVo diseasePhysical) {
diseasePhysical.dispersedDiagnosticCriteria();
DiseasePhysical result = diseasePhysicalManageService.savePhysical(diseasePhysical);
return result.getId();
}
@ -40,15 +42,16 @@ public class DiseasePhysicalManageController {
@ApiOperation("修改体格检查信息")
@PutMapping("/update")
public boolean updatePhysical(@RequestBody DiseasePhysical diseasePhysical) {
public boolean updatePhysical(@RequestBody DiseasePhysicalReqVo diseasePhysical) {
diseasePhysical.dispersedDiagnosticCriteria();
return diseasePhysicalManageService.updatePhysical(diseasePhysical);
}
@ApiOperation("根据疾病id查询体格检查列表")
@GetMapping("/queryListByDiseaseId")
public List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId) {
public List<DiseasePhysicalResVo> queryListByDiseaseId(@RequestParam String diseaseId) {
return diseasePhysicalManageService.queryListByDiseaseId(diseaseId);

1
virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java
Unescape Escape View File

@ -46,6 +46,7 @@ public class DiseaseQuestionManageController {
}
// todo: 根据疾病id 打标问题库列表
}

7
virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java
Unescape Escape View File

@ -25,7 +25,10 @@ public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManage
public List<DiseaseAncillaryResVo> queryListByDiseaseId(String diseaseId) {
Assert.isTrue(StrUtil.isNotEmpty(diseaseId),"diseaseId不能为空");
return diseaseAncillaryService.queryListByDiseaseId(diseaseId);
List<DiseaseAncillaryResVo> diseaseAncillaryResVos = diseaseAncillaryService.queryListByDiseaseId(diseaseId);
diseaseAncillaryResVos.forEach(DiseaseAncillaryResVo::aggregationDiagnosticCriteria);
return diseaseAncillaryResVos;
}
@Override
@ -91,7 +94,7 @@ public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManage
private boolean checkIfPresent(DiseaseAncillary diseaseAncillary){
return Objects.isNull(findByDiseaseIdAndItemId(diseaseAncillary.getDiseaseId(), diseaseAncillary.getItemId()));
return !Objects.isNull(findByDiseaseIdAndItemId(diseaseAncillary.getDiseaseId(), diseaseAncillary.getItemId()));
}

9
virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseasePhysicalManageServiceImpl.java
Unescape Escape View File

@ -34,8 +34,10 @@ public class DiseasePhysicalManageServiceImpl implements DiseasePhysicalManageSe
public List<DiseasePhysicalResVo> queryListByDiseaseId(String diseaseId) {
Assert.isTrue(StrUtil.isNotEmpty(diseaseId),"id不能为空");
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(diseaseId);
return diseasePhysicalService.queryListByDiseaseId(diseaseId);
diseasePhysicalResVos.forEach(DiseasePhysicalResVo::aggregationDiagnosticCriteria);
return diseasePhysicalResVos;
}
@Override
@ -72,6 +74,7 @@ public class DiseasePhysicalManageServiceImpl implements DiseasePhysicalManageSe
@Override
public List<DiseasePhysicalLocationNodeVo> queryTree(String diseaseId) {
// 1. 查询体格检查工具树
List<PhysicalLocationNode> physicalLocationNodes = physicalToolManageService.queryTree();
if (CollectionUtil.isEmpty(physicalLocationNodes)){
return CollectionUtil.newArrayList();
@ -81,14 +84,16 @@ public class DiseasePhysicalManageServiceImpl implements DiseasePhysicalManageSe
physicalLocationNode.setChild(physicalLocationNodes);
DiseasePhysicalLocationNodeVo bean = BeanUtil.toBean(physicalLocationNode, DiseasePhysicalLocationNodeVo.class);
// 2. 根据疾病id查询疾病体格检查项
List<DiseasePhysicalResVo> diseasePhysicalResVos = diseasePhysicalService.queryListByDiseaseId(diseaseId);
if (CollectionUtil.isEmpty(diseasePhysicalResVos)){
return bean.getChild();
}
// 3. 填充疾病体格检查树中的flag属性
List<String> toolIds = diseasePhysicalResVos.stream().map(DiseasePhysical::getToolId).distinct().collect(Collectors.toList());
populateDiseasePhysicalLocationNodeFlag(bean,toolIds);
return bean.getChild();
}

2
virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java
Unescape Escape View File

@ -68,6 +68,7 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl
@Override
public List<DiseaseTreatmentPlanTreeNode> queryDiseaseTreatmentPlanTree(Integer disposalMethod, String diseaseId) {
// 1. 查询处置计划树
List<TreatmentPlanTreeNode> treatmentPlanTreeNodes = configTreatmentPlanManageService.queryTree(disposalMethod);
if (CollUtil.isEmpty(treatmentPlanTreeNodes)){
return CollectionUtil.newArrayList();
@ -77,6 +78,7 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl
treatmentPlanTreeNode.setChild(treatmentPlanTreeNodes);
DiseaseTreatmentPlanTreeNode rootNode = new DiseaseTreatmentPlanTreeNode(treatmentPlanTreeNode);
// 2.
List<DiseaseTreatmentPlanResVo> diseaseTreatmentPlanResVos = this.queryListByDiseaseId(diseaseId);
if (CollUtil.isNotEmpty(diseaseTreatmentPlanResVos)){
rootNode.initFlag(diseaseTreatmentPlanResVos.stream().map(DiseaseTreatmentPlanResVo::getPlanId).collect(Collectors.toList()));

37
virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryReqVo.java
Unescape Escape View File

@ -0,0 +1,37 @@
package com.supervision.vo.manage;
import com.supervision.model.DiseaseAncillary;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.ArrayList;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class DiseaseAncillaryReqVo extends DiseaseAncillary {
@ApiModelProperty("诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据")
private List<Integer> diagnosticCriteria;
/**
* 离散诊断依据 通过诊断依据中的数据设置 primarilyDiagnosisCriteriaFlag basisConfirmFlag basisIdentificationFlag fullCheckFlag
*/
public void dispersedDiagnosticCriteria(){
if (null == diagnosticCriteria){
diagnosticCriteria = new ArrayList<>();
}
super.setPrimarilyDiagnosisCriteriaFlag(diagnosticCriteria.contains(0) ? 1 : 0);
super.setBasisConfirmFlag(diagnosticCriteria.contains(1) ? 1 : 0);
super.setBasisIdentificationFlag(diagnosticCriteria.contains(2) ? 1 : 0);
super.setFullCheckFlag(diagnosticCriteria.contains(3) ? 1 : 0);
}
}

35
virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryResVo.java
Unescape Escape View File

@ -5,10 +5,45 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.ArrayList;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class DiseaseAncillaryResVo extends DiseaseAncillary {
@ApiModelProperty("项目名称")
private String itemName;
@ApiModelProperty("诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据")
private List<Integer> diagnosticCriteria;
/**
* 聚合诊断依据 通过 primarilyDiagnosisCriteriaFlag basisConfirmFlag basisIdentificationFlag fullCheckFlag
* 属性值设置 诊断依据的值
*/
public void aggregationDiagnosticCriteria(){
if (null == diagnosticCriteria){
diagnosticCriteria = new ArrayList<>();
}
if (Integer.valueOf(1).equals(super.getPrimarilyDiagnosisCriteriaFlag())){
diagnosticCriteria.add(0);
}
if (Integer.valueOf(1).equals(super.getBasisConfirmFlag())){
diagnosticCriteria.add(1);
}
if (Integer.valueOf(1).equals(super.getBasisIdentificationFlag())){
diagnosticCriteria.add(2);
}
if (Integer.valueOf(1).equals(super.getFullCheckFlag())){
diagnosticCriteria.add(3);
}
}
}

38
virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalReqVo.java
Unescape Escape View File

@ -0,0 +1,38 @@
package com.supervision.vo.manage;
import com.supervision.model.DiseasePhysical;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.ArrayList;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class DiseasePhysicalReqVo extends DiseasePhysical {
@ApiModelProperty("诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据")
private List<Integer> diagnosticCriteria;
/**
* 离散诊断依据 通过诊断依据中的数据设置 primarilyDiagnosisCriteriaFlag basisConfirmFlag basisIdentificationFlag fullCheckFlag
*/
public void dispersedDiagnosticCriteria(){
if (null == diagnosticCriteria){
diagnosticCriteria = new ArrayList<>();
}
super.setPrimarilyDiagnosisCriteriaFlag(diagnosticCriteria.contains(0) ? 1 : 0);
super.setBasisConfirmFlag(diagnosticCriteria.contains(1) ? 1 : 0);
super.setBasisIdentificationFlag(diagnosticCriteria.contains(2) ? 1 : 0);
super.setFullCheckFlag(diagnosticCriteria.contains(3) ? 1 : 0);
}
}

36
virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalResVo.java
Unescape Escape View File

@ -5,8 +5,11 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
import java.util.ArrayList;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class DiseasePhysicalResVo extends DiseasePhysical {
@ApiModelProperty("工具名称")
@ -14,4 +17,35 @@ public class DiseasePhysicalResVo extends DiseasePhysical {
private String itemId;
@ApiModelProperty("诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据")
private List<Integer> diagnosticCriteria;
/**
* 聚合诊断依据 通过 primarilyDiagnosisCriteriaFlag basisConfirmFlag basisIdentificationFlag fullCheckFlag
* 属性值设置 诊断依据的值
*/
public void aggregationDiagnosticCriteria(){
if (null == diagnosticCriteria){
diagnosticCriteria = new ArrayList<>();
}
if (Integer.valueOf(1).equals(super.getPrimarilyDiagnosisCriteriaFlag())){
diagnosticCriteria.add(0);
}
if (Integer.valueOf(1).equals(super.getBasisConfirmFlag())){
diagnosticCriteria.add(1);
}
if (Integer.valueOf(1).equals(super.getBasisIdentificationFlag())){
diagnosticCriteria.add(2);
}
if (Integer.valueOf(1).equals(super.getFullCheckFlag())){
diagnosticCriteria.add(3);
}
}
}

Write Preview
Loading…
Cancel
Save