diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java index a5e1796c..d7017a9a 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java @@ -44,7 +44,12 @@ public class Disease implements Serializable { @ApiModelProperty("状态 0未训练 1已训练") private Integer status; + @ApiModelProperty("疾病类型 0单一疾病 1符合疾病") + private Integer diseaseType; + @ApiModelProperty("来源的单一疾病ID-用于初步诊断判定使用") + @TableField(typeHandler = StringListTypeHandler.class) + private List containsDiseaseId; /** * 初步诊断依据 */ diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml index 77952b04..cf6b7786 100644 --- a/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml @@ -9,6 +9,11 @@ + + + @@ -20,8 +25,9 @@ - id,disease_name - ,code,status, + id + ,disease_name + ,code,status,diseaseType,containsDiseaseId,standardQuestionLibrary, expected_diagnosis_result,preliminary_diagnosis,confirming_diagnosis, basis_identification,disease_treatment_plan,other,create_user_id, create_time,update_user_id,update_time diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java index 71d53617..bbc4aa67 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java @@ -24,14 +24,14 @@ public class AskProcessController { @ApiOperation("生成诊断流程任务") @GetMapping("creatDiagnosisProcess") - public Process creatDiagnosisProcess(@ApiParam("病人ID") String patientId) { + public Process creatDiagnosisProcess(@ApiParam("病人ID") String patientId, String medicalId) { User user = UserUtil.getUser(); - return askProcessService.creatDiagnosisProcess(patientId, user); + return askProcessService.creatDiagnosisProcess(patientId, medicalId, user); } @ApiOperation("查询用户正在诊断中的诊断记录") @GetMapping("queryUserProcess") - public List queryUserProcess(String userId){ + public List queryUserProcess(String userId) { return askProcessService.queryUserProcess(userId); } } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/AskProcessService.java b/virtual-patient-web/src/main/java/com/supervision/service/AskProcessService.java index fbd5759a..7aed4d27 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/AskProcessService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/AskProcessService.java @@ -7,7 +7,7 @@ import java.util.List; public interface AskProcessService { - Process creatDiagnosisProcess(String patientId, User user); + Process creatDiagnosisProcess(String patientId,String medicalId, User user); List queryUserProcess(String userId); diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java index eacde7d5..d1157327 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskProcessServiceImpl.java @@ -16,9 +16,10 @@ public class AskProcessServiceImpl implements AskProcessService { private final ProcessService processService; @Override - public Process creatDiagnosisProcess(String patientId, User user) { + public Process creatDiagnosisProcess(String patientId,String medicalId, User user) { Process process = new Process(); process.setPatientId(patientId); + process.setMedicalRecId(medicalId); process.setUserId(user.getId()); process.setStatus(0); process.setCreateUserId(user.getId());