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

提交评估的相关代码

Browse Source
dev_2.0.0
liu 1 year ago
parent 4bf72b2938
commit 4073d7f63d
5 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File

10
virtual-patient-model/src/main/java/com/supervision/vo/result/AncillaryRecordByResultDAO.java
Unescape Escape View File

@ -19,6 +19,16 @@ public class AncillaryRecordByResultDAO {
*/
private Integer basisConfirm;
/**
* 用户填写的证实诊断依据
*/
private Integer recordBasisConfirmFlag;
/**
* 用户填写的鉴别诊断依据
*/
private Integer recordBasisIdentificationFlag;
/**
* 鉴别依据
*/

12
virtual-patient-model/src/main/java/com/supervision/vo/result/PhysicalRecordByResultDAO.java
Unescape Escape View File

@ -5,7 +5,7 @@ import lombok.Data;
@Data
public class PhysicalRecordByResultDAO {
private String toolLocationName;
private String toolLocationName;
private String recordId;
@ -14,6 +14,16 @@ public class PhysicalRecordByResultDAO {
*/
private Integer requireCheck;
/**
* 用户填写的证实诊断依据
*/
private Integer recordBasisConfirmFlag;
/**
* 用户填写的鉴别诊断依据
*/
private Integer recordBasisIdentificationFlag;
/**
* 正式诊断依据
*/

14
virtual-patient-model/src/main/resources/mapper/DiagnosisAncillaryRecordMapper.xml
Unescape Escape View File

@ -24,12 +24,14 @@
</sql>
<select id="queryAncillaryResultByProcessId"
resultType="com.supervision.vo.result.AncillaryRecordByResultDAO">
select t3.item_name as itemName,
t2.require_check_flag as requireCheck,
t2.basis_confirm_flag as basisConfirm,
t2.basis_identification_flag as basisIdentification,
t1.id as recordId,
t3.id as itemId
select t3.item_name as itemName,
t2.require_check_flag as requireCheck,
t2.basis_confirm_flag as basisConfirm,
t2.basis_identification_flag as basisIdentification,
t1.basis_confirm_flag as recordBasisConfirmFlag,
t1.basis_identification_flag as recordBasisIdentificationFlag,
t1.id as recordId,
t3.id as itemId
from vp_diagnosis_ancillary_record t1
left join vp_disease_ancillary t2 on t1.ancillary_id = t2.id
left join vp_config_ancillary_item t3 on t2.item_id = t3.id

3
virtual-patient-model/src/main/resources/mapper/DiagnosisPhysicalRecordMapper.xml
Unescape Escape View File

@ -31,7 +31,8 @@
select (IF(t4.location_name IS NULL, t3.tool_name,
CONCAT_WS(' | ', t3.tool_name, t4.location_name))) AS toolLocationName,
t1.id as recordId,
t2.require_check_flag as requireCheck,
t1.basis_confirm_flag as recordBasisConfirmFlag,
t1.basis_identification_flag as recordBasisIdentificationFlag,
t2.basis_confirm_flag as basisConfirm,
t2.basis_identification_flag as basisIdentification,
t3.id as toolId,

22
virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java
Unescape Escape View File

@ -92,9 +92,9 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
// 2.生成初步诊断依据
diagnosisResultResVO.setBasisPrimaryResultResVO(createBasisPrimaryResult(patient, medicalRec, process));
// 3.生成证实诊断依据
diagnosisResultResVO.setBasisConfirmResultResVO(createBasisConfirmResult(medicalRec, processId, diseasesList));
diagnosisResultResVO.setBasisConfirmResultResVO(createBasisConfirmResult(medicalRec, processId));
// 4.生成鉴别诊断依据
diagnosisResultResVO.setBasisIdentificationResult(createBasisIdentificationResult(medicalRec,processId));
diagnosisResultResVO.setBasisIdentificationResult(createBasisIdentificationResult(medicalRec, processId));
// 5.全面检查-(暂无相关数据) 后面再看
diagnosisResultResVO.setFullCheck(null);
// 6.处置方案
@ -142,7 +142,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
}
private BasisIdentificationResultResVO createBasisIdentificationResult(MedicalRec medicalRec,String processId) {
private BasisIdentificationResultResVO createBasisIdentificationResult(MedicalRec medicalRec, String processId) {
BasisIdentificationResultResVO basisIdentificationResultResVO = new BasisIdentificationResultResVO();
// 鉴别诊断依据,来自于medicalRec的DifferentialDiagnosisCriteria
basisIdentificationResultResVO.setIdentificationDiagnosis(medicalRec.getDifferentialDiagnosisCriteria());
@ -155,7 +155,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
nodeResVO.setRecordName(e.getToolLocationName());
nodeResVO.setRecordId(e.getRecordId());
// 如果是必做的,则是正确
nodeResVO.setCorrect(null == e.getBasisIdentification() ? Integer.valueOf(0) : e.getBasisIdentification());
nodeResVO.setCorrect(Objects.equals(e.getBasisIdentification(), e.getRecordBasisIdentificationFlag()) ? 1 : 0);
return nodeResVO;
}).collect(Collectors.toList());
// 2.3 获取辅助检查
@ -163,7 +163,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
List<BasisDiagnosisNodeResVO> collect = ancillaryRecordList.stream()
.filter(distinctPredicateNotNull(AncillaryRecordByResultDAO::getItemName)).map(e -> {
BasisDiagnosisNodeResVO nodeResVO = new BasisDiagnosisNodeResVO();
nodeResVO.setCorrect(null == e.getBasisIdentification() ? Integer.valueOf(0) : e.getBasisIdentification());
nodeResVO.setCorrect(Objects.equals(e.getBasisIdentification(), e.getRecordBasisIdentificationFlag()) ? 1 : 0);
nodeResVO.setRecordId(e.getRecordId());
nodeResVO.setRecordName(e.getItemName());
nodeResVO.setType(2);
@ -175,11 +175,11 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
return basisIdentificationResultResVO;
}
private BasisConfirmResultResVO createBasisConfirmResult(MedicalRec medicalRec, String processId, List<Disease> diseasesList) {
private BasisConfirmResultResVO createBasisConfirmResult(MedicalRec medicalRec, String processId) {
BasisConfirmResultResVO basisConfirmResultResVO = new BasisConfirmResultResVO();
// 正式诊断依据,来自于medicalRec的ConfirmDiagnosisCriteria
// 证实诊断依据,来自于medicalRec的ConfirmDiagnosisCriteria
basisConfirmResultResVO.setConfirmingDiagnosis(medicalRec.getConfirmDiagnosisCriteria());
// 2.2 获取体格检查
// 2.2 获取体格检查的证实诊断依据
List<PhysicalRecordByResultDAO> physicalRecordList = diagnosisPhysicalRecordService.queryPhysicalResultByProcessId(processId);
List<BasisDiagnosisNodeResVO> nodeList = physicalRecordList.stream()
.filter(distinctPredicateNotNull(PhysicalRecordByResultDAO::getToolLocationName)).map(e -> {
@ -187,16 +187,16 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
nodeResVO.setType(1);
nodeResVO.setRecordName(e.getToolLocationName());
nodeResVO.setRecordId(e.getRecordId());
// 如果是必做的,则是正确
nodeResVO.setCorrect(null == e.getBasisConfirm() ? Integer.valueOf(0) : e.getBasisConfirm());
nodeResVO.setCorrect(Objects.equals(e.getBasisConfirm(), e.getRecordBasisConfirmFlag()) ? 1 : 0);
return nodeResVO;
}).collect(Collectors.toList());
// 2.3 获取辅助检查
List<AncillaryRecordByResultDAO> ancillaryRecordList = diagnosisAncillaryRecordService.queryAncillaryResultByProcessId(processId);
List<BasisDiagnosisNodeResVO> collect = ancillaryRecordList.stream()
.filter(distinctPredicateNotNull(AncillaryRecordByResultDAO::getItemName)).map(e -> {
BasisDiagnosisNodeResVO nodeResVO = new BasisDiagnosisNodeResVO();
nodeResVO.setCorrect(null == e.getBasisConfirm() ? Integer.valueOf(0) : e.getBasisConfirm());
nodeResVO.setCorrect(Objects.equals(e.getBasisConfirm(), e.getRecordBasisConfirmFlag()) ? 1 : 0);
nodeResVO.setRecordId(e.getRecordId());
nodeResVO.setRecordName(e.getItemName());
nodeResVO.setType(2);

Write Preview
Loading…
Cancel
Save