From 6e15cbe3ba9f5519c8a23fda47cf333fbbddf3a0 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Thu, 23 Nov 2023 11:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supervision/mapper/CommonDicMapper.java | 18 ++++
.../mapper/DefaultItemIndicatorMapper.java | 18 ++++
.../mapper/ProcessEvaluationMapper.java | 18 ++++
.../mapper/TreatmentPlanMapper.java | 18 ++++
.../VpDiseaseTreatmenRelationMapper.java | 18 ++++
.../supervision/model/AskPatientAnswer.java | 5 ++
.../java/com/supervision/model/CommonDic.java | 81 +++++++++++++++++
.../model/ConfigAncillaryItem.java | 14 +++
.../supervision/model/ConfigPhysicalTool.java | 6 ++
.../model/DefaultItemIndicator.java | 67 +++++++++++++++
.../java/com/supervision/model/Disease.java | 40 ++-------
.../supervision/model/DiseaseAncillary.java | 13 ++-
.../supervision/model/DiseasePhysical.java | 17 +++-
.../model/DiseaseTreatmentRelation.java | 51 +++++++++++
.../com/supervision/model/MedicalRec.java | 18 +++-
.../java/com/supervision/model/Patient.java | 3 +
.../java/com/supervision/model/Process.java | 3 +
.../supervision/model/ProcessEvaluation.java | 86 +++++++++++++++++++
.../com/supervision/model/TreatmentPlan.java | 76 ++++++++++++++++
.../supervision/service/CommonDicService.java | 13 +++
.../service/DefaultItemIndicatorService.java | 13 +++
.../supervision/service/DiseaseService.java | 4 +
.../service/ProcessEvaluationService.java | 13 +++
.../service/TreatmentPlanService.java | 13 +++
.../VpDiseaseTreatmenRelationService.java | 13 +++
.../service/impl/CommonDicServiceImpl.java | 22 +++++
.../impl/DefaultItemIndicatorServiceImpl.java | 22 +++++
.../service/impl/DiseaseServiceImpl.java | 35 ++++++++
.../impl/ProcessEvaluationServiceImpl.java | 22 +++++
.../impl/TreatmentPlanServiceImpl.java | 22 +++++
.../VpDiseaseTreatmenRelationServiceImpl.java | 22 +++++
.../mapper/AskPatientAnswerMapper.xml | 3 +-
.../main/resources/mapper/CommonDicMapper.xml | 28 ++++++
.../mapper/DefaultItemIndicatorMapper.xml | 27 ++++++
.../mapper/DiagnosisPhysicalRecordMapper.xml | 3 +
.../mapper/DiseaseAncillaryMapper.xml | 13 +--
.../main/resources/mapper/DiseaseMapper.xml | 19 ++--
.../mapper/DiseasePhysicalMapper.xml | 16 ++--
.../resources/mapper/MedicalRecMapper.xml | 8 +-
.../main/resources/mapper/PatientMapper.xml | 3 +-
.../mapper/ProcessEvaluationMapper.xml | 30 +++++++
.../main/resources/mapper/ProcessMapper.xml | 6 +-
.../resources/mapper/TreatmentPlanMapper.xml | 27 ++++++
.../VpDiseaseTreatmenRelationMapper.xml | 20 +++++
.../service/impl/AskAncillaryServiceImpl.java | 2 +-
.../impl/AskDiagnosisResultServiceImpl.java | 11 ++-
.../service/impl/AskPhysicalServiceImpl.java | 2 +-
47 files changed, 927 insertions(+), 75 deletions(-)
create mode 100644 virtual-patient-model/src/main/java/com/supervision/mapper/CommonDicMapper.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/mapper/DefaultItemIndicatorMapper.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/mapper/ProcessEvaluationMapper.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/mapper/TreatmentPlanMapper.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/mapper/VpDiseaseTreatmenRelationMapper.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/model/CommonDic.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/model/DefaultItemIndicator.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentRelation.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/model/TreatmentPlan.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/CommonDicService.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/DefaultItemIndicatorService.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/ProcessEvaluationService.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/TreatmentPlanService.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/VpDiseaseTreatmenRelationService.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/impl/CommonDicServiceImpl.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/impl/DefaultItemIndicatorServiceImpl.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/impl/ProcessEvaluationServiceImpl.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java
create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/impl/VpDiseaseTreatmenRelationServiceImpl.java
create mode 100644 virtual-patient-model/src/main/resources/mapper/CommonDicMapper.xml
create mode 100644 virtual-patient-model/src/main/resources/mapper/DefaultItemIndicatorMapper.xml
create mode 100644 virtual-patient-model/src/main/resources/mapper/ProcessEvaluationMapper.xml
create mode 100644 virtual-patient-model/src/main/resources/mapper/TreatmentPlanMapper.xml
create mode 100644 virtual-patient-model/src/main/resources/mapper/VpDiseaseTreatmenRelationMapper.xml
diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/CommonDicMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/CommonDicMapper.java
new file mode 100644
index 00000000..e96156e5
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/mapper/CommonDicMapper.java
@@ -0,0 +1,18 @@
+package com.supervision.mapper;
+
+import com.supervision.model.CommonDic;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【vp_common_dic(通用字典表)】的数据库操作Mapper
+* @createDate 2023-11-23 10:52:22
+* @Entity com.supervision.model.CommonDic
+*/
+public interface CommonDicMapper extends BaseMapper<CommonDic> {
+
+}
+
+
+
+
diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/DefaultItemIndicatorMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/DefaultItemIndicatorMapper.java
new file mode 100644
index 00000000..4d85026a
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/mapper/DefaultItemIndicatorMapper.java
@@ -0,0 +1,18 @@
+package com.supervision.mapper;
+
+import com.supervision.model.DefaultItemIndicator;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【vp_default_item_indicator(身体检查默认指标表)】的数据库操作Mapper
+* @createDate 2023-11-23 10:13:01
+* @Entity com.supervision.model.DefaultItemIndicator
+*/
+public interface DefaultItemIndicatorMapper extends BaseMapper<DefaultItemIndicator> {
+
+}
+
+
+
+
diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/ProcessEvaluationMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/ProcessEvaluationMapper.java
new file mode 100644
index 00000000..6a749690
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/mapper/ProcessEvaluationMapper.java
@@ -0,0 +1,18 @@
+package com.supervision.mapper;
+
+import com.supervision.model.ProcessEvaluation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【vp_process_evaluation(考核评估)】的数据库操作Mapper
+* @createDate 2023-11-23 10:50:14
+* @Entity com.supervision.model.ProcessEvaluation
+*/
+public interface ProcessEvaluationMapper extends BaseMapper<ProcessEvaluation> {
+
+}
+
+
+
+
diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/TreatmentPlanMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/TreatmentPlanMapper.java
new file mode 100644
index 00000000..8fe27f4a
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/mapper/TreatmentPlanMapper.java
@@ -0,0 +1,18 @@
+package com.supervision.mapper;
+
+import com.supervision.model.TreatmentPlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【vp_treatment_plan(处置计划表)】的数据库操作Mapper
+* @createDate 2023-11-23 10:24:03
+* @Entity com.supervision.model.TreatmentPlan
+*/
+public interface TreatmentPlanMapper extends BaseMapper<TreatmentPlan> {
+
+}
+
+
+
+
diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/VpDiseaseTreatmenRelationMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/VpDiseaseTreatmenRelationMapper.java
new file mode 100644
index 00000000..498ac550
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/mapper/VpDiseaseTreatmenRelationMapper.java
@@ -0,0 +1,18 @@
+package com.supervision.mapper;
+
+import com.supervision.model.DiseaseTreatmentRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Mapper
+* @createDate 2023-11-23 10:43:28
+* @Entity com.supervision.model.VpDiseaseTreatmenRelation
+*/
+public interface VpDiseaseTreatmenRelationMapper extends BaseMapper<DiseaseTreatmentRelation> {
+
+}
+
+
+
+
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java b/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java
index b1c14709..1f7f6a0b 100644
--- a/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java
@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
import java.util.List;
import com.supervision.handler.StringListTypeHandler;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -29,6 +30,10 @@ public class AskPatientAnswer implements Serializable {
*/
private String patientId;
+
+ @ApiModelProperty("病例id")
+ private String medicalId;
+
/**
* 问题库问题ID
*/
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/CommonDic.java b/virtual-patient-model/src/main/java/com/supervision/model/CommonDic.java
new file mode 100644
index 00000000..a995e8cf
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/model/CommonDic.java
@@ -0,0 +1,81 @@
+package com.supervision.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 通用字典表
+ * @TableName vp_common_dic
+ */
+@TableName(value ="vp_common_dic")
+@Data
+public class CommonDic implements Serializable {
+ /**
+ *
+ */
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 字段码值
+ */
+ private String code;
+
+ /**
+ * 中文名
+ */
+ private String nameCh;
+
+ /**
+ * 英文名
+ */
+ private String nameEn;
+
+ /**
+ * 分组code
+ */
+ private String groupCode;
+
+ /**
+ * 父级id
+ */
+ private String parentId;
+
+ /**
+ * 优先级,用来做排序等操作
+ */
+ private Integer priority;
+
+ /**
+ * 说明
+ */
+ private String description;
+
+ /**
+ *
+ */
+ private String createUserId;
+
+ /**
+ *
+ */
+ private Date createTime;
+
+ /**
+ *
+ */
+ private String updateUserId;
+
+ /**
+ *
+ */
+ private Date updateTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java
index a4e5e038..7898318c 100644
--- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@@ -53,6 +54,19 @@ public class ConfigAncillaryItem implements Serializable {
@ApiModelProperty("检查名称")
private String itemName;
+
+ @ApiModelProperty("英文名")
+ private String itemNameEn;
+
+ @ApiModelProperty("检查价格")
+ private BigDecimal price;
+
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("说明")
+ private String description;
+
/**
* 该项检查描述信息
*/
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java
index fcad9aaf..58fcbf6d 100644
--- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java
@@ -65,6 +65,12 @@ public class ConfigPhysicalTool implements Serializable {
@ApiModelProperty("code排序")
private Integer codePriority;
+ @ApiModelProperty("关键词")
+ private String keyword;
+
+ @ApiModelProperty("说明")
+ private String description;
+
/**
* 创建人ID
*/
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DefaultItemIndicator.java b/virtual-patient-model/src/main/java/com/supervision/model/DefaultItemIndicator.java
new file mode 100644
index 00000000..d43140df
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/model/DefaultItemIndicator.java
@@ -0,0 +1,67 @@
+package com.supervision.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+
+/**
+ * 身体检查默认指标表
+ * @TableName vp_default_item_indicator
+ */
+@TableName(value ="vp_default_item_indicator")
+@Data
+public class DefaultItemIndicator implements Serializable {
+ /**
+ * 主键
+ */
+ private String id;
+
+ /**
+ * 工具id或项目id
+ */
+ private String itemId;
+
+ /**
+ * 位置id
+ */
+ private Integer locationId;
+
+ /**
+ * 性别 女/男
+ */
+ private String gender;
+
+ /**
+ * 年龄范围
+ */
+ private String ageRange;
+
+
+ /**
+ * 创建人ID
+ */
+ private String createUserId;
+
+ /**
+ * 创建时间
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 更新人
+ */
+ private String updateUserId;
+
+ /**
+ * 更新时间
+ */
+ private LocalDateTime updateTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
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 d7017a9a..20018545 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
@@ -38,46 +38,22 @@ public class Disease implements Serializable {
@ApiModelProperty("疾病编码")
private String code;
+
+ @ApiModelProperty("包含的疾病id")
+ @TableField(typeHandler = StringListTypeHandler.class)
+ private List<String> containDiseaseIds;
+
/**
* 状态 0未训练 1已训练
*/
@ApiModelProperty("状态 0未训练 1已训练")
private Integer status;
- @ApiModelProperty("疾病类型 0单一疾病 1符合疾病")
+ @ApiModelProperty("疾病类型 0单一疾病 1 复合疾病")
private Integer diseaseType;
- @ApiModelProperty("来源的单一疾病ID-用于初步诊断判定使用")
- @TableField(typeHandler = StringListTypeHandler.class)
- private List<String> containsDiseaseId;
- /**
- * 初步诊断依据
- */
- @ApiModelProperty("初步诊断依据")
- private String preliminaryDiagnosis;
-
- /**
- * 证实诊断依据
- */
- @ApiModelProperty("证实诊断依据")
- private String confirmingDiagnosis;
-
- /**
- * 鉴别依据
- */
- @ApiModelProperty("鉴别依据")
- private String basisIdentification;
-
-
- /**
- * 其他
- */
- @ApiModelProperty("其他")
- private String other;
-
- @TableField(typeHandler = StringListTypeHandler.class)
- private List<String> standardQuestionLibrary;
-
+ @ApiModelProperty("症状")
+ private String symptom;
/**
* 创建人ID
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java
index 06af2c04..da82418e 100644
--- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java
@@ -28,8 +28,8 @@ public class DiseaseAncillary implements Serializable {
/**
* 病历ID
*/
- @ApiModelProperty("病历ID")
- private String medicalRecId;
+ @ApiModelProperty("疾病id")
+ private String diseaseId;
/**
* 工具ID
@@ -49,6 +49,15 @@ public class DiseaseAncillary implements Serializable {
@ApiModelProperty("是否是鉴别依据(0否1是)")
private Integer basisIdentification;
+ @ApiModelProperty("全面检查")
+ private Integer isFullCheck;
+
+ @ApiModelProperty("是否诊断判读 0否1是")
+ private Integer isDiagnosisAssessment;
+
+ @ApiModelProperty("预期诊断结果 0正常 1 不正常")
+ private Integer expectedDiagnosisResult;
+
/**
* 结果
*/
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java
index 67ff78f6..d7eb492c 100644
--- a/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java
@@ -29,7 +29,7 @@ public class DiseasePhysical implements Serializable {
* 病历ID
*/
@ApiModelProperty("病历ID")
- private String medicalRecId;
+ private String diseaseId;
/**
* 工具ID
*/
@@ -54,6 +54,19 @@ public class DiseasePhysical implements Serializable {
@ApiModelProperty("是否是鉴别依据(0否1是)")
private Integer basisIdentification;
+ @ApiModelProperty("初步诊断依据")
+ private Integer isPrimarilyDiagnosisCriteria;
+
+ @ApiModelProperty("是否诊断判读 0否1是")
+ private Integer isDiagnosisAssessment;
+
+ @ApiModelProperty("是否预期诊断结果 0正常 1 不正常")
+ private Integer expectedDiagnosisResult;
+
+
+ @ApiModelProperty("全面检查 0正常 1 不正常")
+ private Integer isFullCheck;
+
/**
* 结果
*/
@@ -63,7 +76,7 @@ public class DiseasePhysical implements Serializable {
/**
* 表征
*/
- @ApiModelProperty("表征")
+ @ApiModelProperty("表征 默认诊断结果")
private String trait;
/**
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentRelation.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentRelation.java
new file mode 100644
index 00000000..bf3117e5
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentRelation.java
@@ -0,0 +1,51 @@
+package com.supervision.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 疾病处置计划关联表
+ * @TableName vp_disease_treatmen_relation
+ */
+@TableName(value ="vp_disease_treatment_relation")
+@Data
+public class DiseaseTreatmentRelation implements Serializable {
+ /**
+ * 疾病id
+ */
+ @TableId
+ private String diseaseId;
+
+ /**
+ * 处置计划id
+ */
+ @TableId
+ private String planId;
+
+ /**
+ * 创建人ID
+ */
+ private String createUserId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ private String updateUserId;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java b/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java
index 9684caa9..b6c6db15 100644
--- a/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java
@@ -9,6 +9,7 @@ import java.io.Serializable;
import java.util.List;
import com.supervision.handler.StringListTypeHandler;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -36,10 +37,9 @@ public class MedicalRec implements Serializable {
private String patientId;
/**
- * 疾病列表
+ * 疾病id
*/
- @TableField(typeHandler = StringListTypeHandler.class)
- private List<String> diseaseList;
+ private String diseaseId;
/**
* 患者主诉
@@ -86,6 +86,18 @@ public class MedicalRec implements Serializable {
*/
private String marriageChildHistory;
+ @ApiModelProperty("初步诊断依据")
+ private String primarilyDiagnosisCriteria;
+
+ @ApiModelProperty("证实诊断依据")
+ private String confirmDiagnosisCriteria;
+
+ @ApiModelProperty("鉴别诊断依据")
+ private String differentialDiagnosisCriteria;
+
+ @ApiModelProperty("全面检查")
+ private String fullCheck;
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Patient.java b/virtual-patient-model/src/main/java/com/supervision/model/Patient.java
index 08acdc55..09bf85f7 100644
--- a/virtual-patient-model/src/main/java/com/supervision/model/Patient.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/Patient.java
@@ -73,6 +73,9 @@ public class Patient implements Serializable {
@ApiModelProperty("地址")
private String address;
+ @ApiModelProperty("资源id")
+ private String resourceId;
+
/**
* 创建人ID
*/
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Process.java b/virtual-patient-model/src/main/java/com/supervision/model/Process.java
index cf172f33..ed20a936 100644
--- a/virtual-patient-model/src/main/java/com/supervision/model/Process.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/Process.java
@@ -47,6 +47,9 @@ public class Process implements Serializable {
@ApiModelProperty("任务状态 -1未开始 0进行中 1已完成")
private Integer status;
+ @ApiModelProperty("实例类型 0：学习实例 1:考核实例")
+ private Integer processType;
+
/**
* 创建人ID
*/
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java b/virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java
new file mode 100644
index 00000000..f13c3366
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java
@@ -0,0 +1,86 @@
+package com.supervision.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 考核评估
+ * @TableName vp_process_evaluation
+ */
+@TableName(value ="vp_process_evaluation")
+@Data
+public class ProcessEvaluation implements Serializable {
+ /**
+ * 主键
+ */
+ @TableId
+ private String id;
+
+ /**
+ * 流程id
+ */
+ private String processId;
+
+ /**
+ * 评分概述
+ */
+ private String overview;
+
+ /**
+ * 预期诊断评估
+ */
+ private String expectDiagnosis;
+
+ /**
+ * 初步诊断评估
+ */
+ private String primarilyDiagnosis;
+
+ /**
+ * 证实诊断评估
+ */
+ private String confirmDiagnosis;
+
+ /**
+ * 鉴别依据评估
+ */
+ private String differentialDiagnosis;
+
+ /**
+ * 全面检查评估
+ */
+ private String fullCheck;
+
+ /**
+ * 处置方案评估
+ */
+ private String treatmentPlan;
+
+ /**
+ * 创建人ID
+ */
+ private String createUserId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ private String updateUserId;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/virtual-patient-model/src/main/java/com/supervision/model/TreatmentPlan.java b/virtual-patient-model/src/main/java/com/supervision/model/TreatmentPlan.java
new file mode 100644
index 00000000..3645eac5
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/model/TreatmentPlan.java
@@ -0,0 +1,76 @@
+package com.supervision.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 处置计划表
+ * @TableName vp_treatment_plan
+ */
+@TableName(value ="vp_treatment_plan")
+@Data
+public class TreatmentPlan implements Serializable {
+ /**
+ * 主键id
+ */
+ @TableId
+ private String id;
+
+ /**
+ * 处置计划
+ */
+ private String disposalPlan;
+
+ /**
+ * 处置方式
+ */
+ private String disposalMethod;
+
+ /**
+ * 一级措施
+ */
+ private String firstMeasures;
+
+ /**
+ * 二级措施
+ */
+ private String secondMeasures;
+
+ /**
+ * 推荐用药
+ */
+ private Object recommendedMedication;
+
+ /**
+ * 说明
+ */
+ private String description;
+
+ /**
+ * 创建人ID
+ */
+ private String createUserId;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ private String updateUserId;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/CommonDicService.java b/virtual-patient-model/src/main/java/com/supervision/service/CommonDicService.java
new file mode 100644
index 00000000..84a26925
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/service/CommonDicService.java
@@ -0,0 +1,13 @@
+package com.supervision.service;
+
+import com.supervision.model.CommonDic;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【vp_common_dic(通用字典表)】的数据库操作Service
+* @createDate 2023-11-23 10:52:22
+*/
+public interface CommonDicService extends IService<CommonDic> {
+
+}
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/DefaultItemIndicatorService.java b/virtual-patient-model/src/main/java/com/supervision/service/DefaultItemIndicatorService.java
new file mode 100644
index 00000000..877da618
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/service/DefaultItemIndicatorService.java
@@ -0,0 +1,13 @@
+package com.supervision.service;
+
+import com.supervision.model.DefaultItemIndicator;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【vp_default_item_indicator(身体检查默认指标表)】的数据库操作Service
+* @createDate 2023-11-23 10:13:01
+*/
+public interface DefaultItemIndicatorService extends IService<DefaultItemIndicator> {
+
+}
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseService.java b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseService.java
index ae6b7764..ee000b14 100644
--- a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseService.java
+++ b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseService.java
@@ -3,6 +3,8 @@ package com.supervision.service;
import com.supervision.model.Disease;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
* @author flevance
* @description 针对表【vp_disease(疾病名称)】的数据库操作Service
@@ -10,4 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface DiseaseService extends IService<Disease> {
+
+ List<Disease> listDiseaseWithType(String id);
}
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/ProcessEvaluationService.java b/virtual-patient-model/src/main/java/com/supervision/service/ProcessEvaluationService.java
new file mode 100644
index 00000000..34192113
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/service/ProcessEvaluationService.java
@@ -0,0 +1,13 @@
+package com.supervision.service;
+
+import com.supervision.model.ProcessEvaluation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【vp_process_evaluation(考核评估)】的数据库操作Service
+* @createDate 2023-11-23 10:50:14
+*/
+public interface ProcessEvaluationService extends IService<ProcessEvaluation> {
+
+}
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/TreatmentPlanService.java b/virtual-patient-model/src/main/java/com/supervision/service/TreatmentPlanService.java
new file mode 100644
index 00000000..90a9afc6
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/service/TreatmentPlanService.java
@@ -0,0 +1,13 @@
+package com.supervision.service;
+
+import com.supervision.model.TreatmentPlan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【vp_treatment_plan(处置计划表)】的数据库操作Service
+* @createDate 2023-11-23 10:24:03
+*/
+public interface TreatmentPlanService extends IService<TreatmentPlan> {
+
+}
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/VpDiseaseTreatmenRelationService.java b/virtual-patient-model/src/main/java/com/supervision/service/VpDiseaseTreatmenRelationService.java
new file mode 100644
index 00000000..ee2fbb35
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/service/VpDiseaseTreatmenRelationService.java
@@ -0,0 +1,13 @@
+package com.supervision.service;
+
+import com.supervision.model.DiseaseTreatmentRelation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Service
+* @createDate 2023-11-23 10:43:28
+*/
+public interface VpDiseaseTreatmenRelationService extends IService<DiseaseTreatmentRelation> {
+
+}
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/CommonDicServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/CommonDicServiceImpl.java
new file mode 100644
index 00000000..c3624f12
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/CommonDicServiceImpl.java
@@ -0,0 +1,22 @@
+package com.supervision.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.supervision.model.CommonDic;
+import com.supervision.service.CommonDicService;
+import com.supervision.mapper.CommonDicMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【vp_common_dic(通用字典表)】的数据库操作Service实现
+* @createDate 2023-11-23 10:52:22
+*/
+@Service
+public class CommonDicServiceImpl extends ServiceImpl<CommonDicMapper, CommonDic>
+ implements CommonDicService{
+
+}
+
+
+
+
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DefaultItemIndicatorServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DefaultItemIndicatorServiceImpl.java
new file mode 100644
index 00000000..ec8db252
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DefaultItemIndicatorServiceImpl.java
@@ -0,0 +1,22 @@
+package com.supervision.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.supervision.model.DefaultItemIndicator;
+import com.supervision.service.DefaultItemIndicatorService;
+import com.supervision.mapper.DefaultItemIndicatorMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【vp_default_item_indicator(身体检查默认指标表)】的数据库操作Service实现
+* @createDate 2023-11-23 10:13:01
+*/
+@Service
+public class DefaultItemIndicatorServiceImpl extends ServiceImpl<DefaultItemIndicatorMapper, DefaultItemIndicator>
+ implements DefaultItemIndicatorService{
+
+}
+
+
+
+
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseServiceImpl.java
index e0dd5754..cde5d9eb 100644
--- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseServiceImpl.java
+++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseServiceImpl.java
@@ -1,11 +1,17 @@
package com.supervision.service.impl;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.supervision.exception.BusinessException;
import com.supervision.model.Disease;
import com.supervision.service.DiseaseService;
import com.supervision.mapper.DiseaseMapper;
import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Objects;
+
/**
* @author flevance
* @description 针对表【vp_disease(疾病名称)】的数据库操作Service实现
@@ -15,6 +21,35 @@ import org.springframework.stereotype.Service;
public class DiseaseServiceImpl extends ServiceImpl<DiseaseMapper, Disease>
implements DiseaseService{
+ @Override
+ public List<Disease> listDiseaseWithType(String id) {
+ if (StrUtil.isEmpty(id)){
+ throw new BusinessException("id is not allow empty");
+ }
+ Disease disease = super.getById(id);
+ if (!isCompositeDisease(disease) || CollUtil.isEmpty(disease.getContainDiseaseIds())){
+ return CollUtil.newArrayList(disease);
+ }
+
+ return super.listByIds(disease.getContainDiseaseIds());
+ }
+
+
+ private boolean isCompositeDisease(Disease disease){
+
+ if (Objects.isNull(disease)){
+ return false;
+ }
+ return isCompositeDisease(disease.getDiseaseType());
+ }
+
+ private boolean isCompositeDisease(Integer integer){
+ if (Objects.isNull(integer)){
+ return false;
+ }
+ return Integer.valueOf(1).equals(integer);
+ }
+
}
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/ProcessEvaluationServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/ProcessEvaluationServiceImpl.java
new file mode 100644
index 00000000..f45dc3e2
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/ProcessEvaluationServiceImpl.java
@@ -0,0 +1,22 @@
+package com.supervision.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.supervision.model.ProcessEvaluation;
+import com.supervision.service.ProcessEvaluationService;
+import com.supervision.mapper.ProcessEvaluationMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【vp_process_evaluation(考核评估)】的数据库操作Service实现
+* @createDate 2023-11-23 10:50:14
+*/
+@Service
+public class ProcessEvaluationServiceImpl extends ServiceImpl<ProcessEvaluationMapper, ProcessEvaluation>
+ implements ProcessEvaluationService{
+
+}
+
+
+
+
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java
new file mode 100644
index 00000000..1df64a4c
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java
@@ -0,0 +1,22 @@
+package com.supervision.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.supervision.model.TreatmentPlan;
+import com.supervision.service.TreatmentPlanService;
+import com.supervision.mapper.TreatmentPlanMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【vp_treatment_plan(处置计划表)】的数据库操作Service实现
+* @createDate 2023-11-23 10:24:03
+*/
+@Service
+public class TreatmentPlanServiceImpl extends ServiceImpl<TreatmentPlanMapper, TreatmentPlan>
+ implements TreatmentPlanService{
+
+}
+
+
+
+
diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/VpDiseaseTreatmenRelationServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/VpDiseaseTreatmenRelationServiceImpl.java
new file mode 100644
index 00000000..5b9c3ec2
--- /dev/null
+++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/VpDiseaseTreatmenRelationServiceImpl.java
@@ -0,0 +1,22 @@
+package com.supervision.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.supervision.model.DiseaseTreatmentRelation;
+import com.supervision.service.VpDiseaseTreatmenRelationService;
+import com.supervision.mapper.VpDiseaseTreatmenRelationMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Service实现
+* @createDate 2023-11-23 10:43:28
+*/
+@Service
+public class VpDiseaseTreatmenRelationServiceImpl extends ServiceImpl<VpDiseaseTreatmenRelationMapper, DiseaseTreatmentRelation>
+ implements VpDiseaseTreatmenRelationService{
+
+}
+
+
+
+
diff --git a/virtual-patient-model/src/main/resources/mapper/AskPatientAnswerMapper.xml b/virtual-patient-model/src/main/resources/mapper/AskPatientAnswerMapper.xml
index 8e775c7f..295334af 100644
--- a/virtual-patient-model/src/main/resources/mapper/AskPatientAnswerMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/AskPatientAnswerMapper.xml
@@ -7,6 +7,7 @@
<resultMap id="BaseResultMap" type="com.supervision.model.AskPatientAnswer">
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="patientId" column="patient_id" jdbcType="VARCHAR"/>
+ <result property="medicalId" column="medical_id" jdbcType="VARCHAR"/>
<result property="libraryQuestionId" column="library_question_id" jdbcType="VARCHAR"/>
<result property="answer" column="answer" jdbcType="ARRAY"
typeHandler="com.supervision.handler.StringListTypeHandler"/>
@@ -18,7 +19,7 @@
</resultMap>
<sql id="Base_Column_List">
- id,patient_id,library_question_id,
+ id,patient_id,medical_id,library_question_id,
answer,require_check,create_user_id,
create_time,update_user_id,update_time
</sql>
diff --git a/virtual-patient-model/src/main/resources/mapper/CommonDicMapper.xml b/virtual-patient-model/src/main/resources/mapper/CommonDicMapper.xml
new file mode 100644
index 00000000..fa89bf5a
--- /dev/null
+++ b/virtual-patient-model/src/main/resources/mapper/CommonDicMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.supervision.mapper.CommonDicMapper">
+
+ <resultMap id="BaseResultMap" type="com.supervision.model.CommonDic">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="code" column="code" jdbcType="VARCHAR"/>
+ <result property="nameCh" column="name_ch" jdbcType="VARCHAR"/>
+ <result property="nameEn" column="name_en" jdbcType="VARCHAR"/>
+ <result property="groupCode" column="group_code" jdbcType="VARCHAR"/>
+ <result property="parentId" column="parent_id" jdbcType="VARCHAR"/>
+ <result property="priority" column="priority" jdbcType="INTEGER"/>
+ <result property="description" column="description" jdbcType="VARCHAR"/>
+ <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,code,name_ch,
+ name_en,group_code,parent_id,
+ priority,description,create_user_id,
+ create_time,update_user_id,update_time
+ </sql>
+</mapper>
diff --git a/virtual-patient-model/src/main/resources/mapper/DefaultItemIndicatorMapper.xml b/virtual-patient-model/src/main/resources/mapper/DefaultItemIndicatorMapper.xml
new file mode 100644
index 00000000..20825bdf
--- /dev/null
+++ b/virtual-patient-model/src/main/resources/mapper/DefaultItemIndicatorMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.supervision.mapper.DefaultItemIndicatorMapper">
+
+ <resultMap id="BaseResultMap" type="com.supervision.model.DefaultItemIndicator">
+ <result property="id" column="id" jdbcType="VARCHAR"/>
+ <result property="itemId" column="item_id" jdbcType="VARCHAR"/>
+ <result property="locationId" column="location_id" jdbcType="INTEGER"/>
+ <result property="gender" column="gender" jdbcType="VARCHAR"/>
+ <result property="ageRange" column="age_range" jdbcType="VARCHAR"/>
+ <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,item_id,location_id,
+ gender,age_range,
+ create_time,update_user_id,update_time
+ </sql>
+
+
+
+</mapper>
diff --git a/virtual-patient-model/src/main/resources/mapper/DiagnosisPhysicalRecordMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiagnosisPhysicalRecordMapper.xml
index eb091dd7..165e2bad 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiagnosisPhysicalRecordMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiagnosisPhysicalRecordMapper.xml
@@ -11,6 +11,8 @@
<result property="locationId" column="location_id" jdbcType="VARCHAR"/>
<result property="primaryId" column="primary_id" jdbcType="VARCHAR"/>
<result property="result" column="result" jdbcType="VARCHAR"/>
+ <result property="keyword" column="keyword" jdbcType="VARCHAR"/>
+ <result property="description" column="description" jdbcType="VARCHAR"/>
<result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -21,6 +23,7 @@
id
,process_id,tool_id,
location_id,primary_id,result,create_user_id,
+ keyword,description,
create_time,update_user_id,update_time
</sql>
<select id="queryPhysicalResultByProcessId"
diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml
index 32d43e7f..ff7df21a 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml
@@ -6,11 +6,14 @@
<resultMap id="BaseResultMap" type="com.supervision.model.DiseaseAncillary">
<id property="id" column="id" jdbcType="VARCHAR"/>
- <result property="medicalRecId" column="medical_rec_id" jdbcType="VARCHAR"/>
+ <result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
<result property="itemId" column="item_id" jdbcType="VARCHAR"/>
<result property="requireCheck" column="require_check" jdbcType="INTEGER"/>
<result property="basisConfirm" column="basis_confirm" jdbcType="INTEGER"/>
<result property="basisIdentification" column="basis_identification" jdbcType="INTEGER"/>
+ <result property="isFullCheck" column="is_full_check" jdbcType="INTEGER"/>
+ <result property="isDiagnosisAssessment" column="is_diagnosis_assessment" jdbcType="INTEGER"/>
+ <result property="expectedDiagnosisResult" column="expected_diagnosis_result" jdbcType="INTEGER"/>
<result property="result" column="result" jdbcType="VARCHAR"/>
<result property="description" column="description" jdbcType="VARCHAR"/>
<result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
@@ -20,15 +23,15 @@
</resultMap>
<sql id="Base_Column_List">
- id
- ,item_id,require_check,basis_confirm,basis_identification
+ id,disease_id,item_id,require_check,basis_confirm,basis_identification
+ ,is_full_check,is_diagnosis_assessment,expected_diagnosis_result,
result,description,create_user_id,
create_time,update_user_id,update_time
</sql>
<select id="queryDiseaseAncillaryDtoList" parameterType="com.supervision.model.DiseaseAncillary" resultType="com.supervision.dto.DiseaseAncillaryDto">
select da.id as id,
- da.medical_rec_id as medicalRecId,
+ da.disease_id as diseaseId,
da.item_id as itemId,
da.require_check as requireCheck,
da.basis_confirm as basisConfirm,
@@ -43,7 +46,7 @@
from vp_disease_ancillary da
join vp_config_ancillary_item ca on da.item_id = ca.id
<where>
- <if test="diseaseAncillary.medicalRecId != null and diseaseAncillary.medicalRecId != ''">
+ <if test="diseaseAncillary.diseaseId != null and diseaseAncillary.diseaseId != ''">
AND da.medical_rec_id = #{diseaseAncillary.medicalRecId}
</if>
<if test="diseaseAncillary.itemId != null and diseaseAncillary.itemId != ''">
diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml
index cf6b7786..25b8be4e 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml
@@ -10,14 +10,9 @@
<result property="diseaseName" column="disease_name" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="INTEGER"/>
<result property="diseaseType" column="disease_type" jdbcType="INTEGER"/>
- <result property="containsDiseaseId" column="contains_disease_id" jdbcType="ARRAY"
+ <result property="symptom" column="symptom" jdbcType="VARCHAR"/>
+ <result property="containDiseaseIds" column="contain_disease_ids" jdbcType="ARRAY"
typeHandler="com.supervision.handler.StringListTypeHandler"/>
- <result property="standardQuestionLibrary" column="standard_question_library" jdbcType="VARCHAR"
- typeHandler="com.supervision.handler.StringListTypeHandler"/>
- <result property="preliminaryDiagnosis" column="preliminary_diagnosis" jdbcType="VARCHAR"/>
- <result property="confirmingDiagnosis" column="confirming_diagnosis" jdbcType="VARCHAR"/>
- <result property="basisIdentification" column="basis_identification" jdbcType="VARCHAR"/>
- <result property="other" column="other" jdbcType="VARCHAR"/>
<result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -25,11 +20,7 @@
</resultMap>
<sql id="Base_Column_List">
- 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
+ id,disease_name,code,status,diseaseType,symptom,contain_disease_ids,
+ create_user_id,create_time,update_user_id,update_time
</sql>
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml
index de57c644..a9c6c1fb 100644
--- a/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiseasePhysicalMapper.xml
@@ -6,12 +6,16 @@
<resultMap id="BaseResultMap" type="com.supervision.model.DiseasePhysical">
<id property="id" column="id" jdbcType="VARCHAR"/>
- <result property="medicalRecId" column="medical_rec_id" jdbcType="VARCHAR"/>
+ <result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
<result property="toolId" column="tool_id" jdbcType="VARCHAR"/>
<result property="locationId" column="location_id" jdbcType="VARCHAR"/>
<result property="requireCheck" column="require_check" jdbcType="INTEGER"/>
- <result property="basisConfirm" column="basis_confirm" jdbcType="INTEGER"/>
- <result property="basisIdentification" column="basis_identification" jdbcType="INTEGER"/>
+ <result property="isPrimarilyDiagnosisCriteria" column="is_primarily_diagnosis_criteria" jdbcType="INTEGER"/>
+ <result property="basisConfirm" column="basis_confirm" jdbcType="INTEGER"/>
+ <result property="basisIdentification" column="basis_identification" jdbcType="INTEGER"/>
+ <result property="isDiagnosisAssessment" column="is_diagnosis_assessment" jdbcType="INTEGER"/>
+ <result property="expectedDiagnosisResult" column="expected_diagnosis_result" jdbcType="VARCHAR"/>
+ <result property="isFullCheck" column="is_full_check" jdbcType="INTEGER"/>
<result property="result" column="result" jdbcType="VARCHAR"/>
<result property="trait" column="trait" jdbcType="VARCHAR"/>
<result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
@@ -21,8 +25,10 @@
</resultMap>
<sql id="Base_Column_List">
- id,patient_id,tool_id,location_id,
- require_check,basis_confirm,basis_identification,result,trait,
+ id,tool_id,location_id,disease_id,
+ require_check,is_primarily_diagnosis_criteria,basis_confirm,
+ is_diagnosis_assessment,expected_diagnosis_result,is_full_check,
+ basis_identification,result,trait,
create_user_id,create_time,update_user_id,
update_time
</sql>
diff --git a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml
index 3b07084b..ba88d598 100644
--- a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml
@@ -8,10 +8,14 @@
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="no" column="no" jdbcType="VARCHAR"/>
<result property="patientId" column="patient_id" jdbcType="VARCHAR"/>
+ <result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
<result property="patientSelfDesc" column="patient_self_desc" jdbcType="VARCHAR"/>
<result property="symptoms" column="symptoms" jdbcType="VARCHAR"/>
<result property="expectDiagnosisResult" column="expect_diagnosis_result" jdbcType="VARCHAR"/>
<result property="expectDiseaseTreatmentPlan" column="expect_disease_treatment_plan" jdbcType="VARCHAR"/>
+ <result property="primarilyDiagnosisCriteria" column="primarily_diagnosis_criteria" jdbcType="VARCHAR"/>
+ <result property="confirmDiagnosisCriteria" column="confirm_diagnosis_criteria" jdbcType="VARCHAR"/>
+ <result property="differentialDiagnosisCriteria" column="differential_diagnosis_criteria" jdbcType="VARCHAR"/>
<result property="primaryDiagnosis" column="primary_diagnosis" jdbcType="OTHER"/>
<result property="allergyHistory" column="allergy_history" jdbcType="VARCHAR"/>
<result property="previousHistory" column="previous_history" jdbcType="VARCHAR"/>
@@ -22,7 +26,9 @@
<sql id="Base_Column_List">
id,no,patient_id,
patient_self_desc,symptoms,expect_diagnosis_result,
- expect_disease_treatment_plan,primary_diagnosis,allergy_history,
+ expect_disease_treatment_plan,primarily_diagnosis_criteria,
+ confirm_diagnosis_criteria,confirm_diagnosis_criteria,
+ primary_diagnosis,allergy_history,
previous_history,family_history,marriage_child_history
</sql>
</mapper>
diff --git a/virtual-patient-model/src/main/resources/mapper/PatientMapper.xml b/virtual-patient-model/src/main/resources/mapper/PatientMapper.xml
index db1c29ba..ed4c2082 100644
--- a/virtual-patient-model/src/main/resources/mapper/PatientMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/PatientMapper.xml
@@ -15,6 +15,7 @@
<result property="marriage" column="marriage" jdbcType="VARCHAR"/>
<result property="profession" column="profession" jdbcType="VARCHAR"/>
<result property="address" column="address" jdbcType="VARCHAR"/>
+ <result property="resourceId" column="resource_id" jdbcType="VARCHAR"/>
<result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -25,7 +26,7 @@
id
,name,gender,
age,symptoms,height,address,marriage,profession,
- weight,disease_list,create_user_id,
+ weight,resource_id,create_user_id,
create_time,update_user_id,update_time
</sql>
</mapper>
diff --git a/virtual-patient-model/src/main/resources/mapper/ProcessEvaluationMapper.xml b/virtual-patient-model/src/main/resources/mapper/ProcessEvaluationMapper.xml
new file mode 100644
index 00000000..a9bf4ffc
--- /dev/null
+++ b/virtual-patient-model/src/main/resources/mapper/ProcessEvaluationMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.supervision.mapper.ProcessEvaluationMapper">
+
+ <resultMap id="BaseResultMap" type="com.supervision.model.ProcessEvaluation">
+ <id property="id" column="id" jdbcType="VARCHAR"/>
+ <result property="processId" column="process_id" jdbcType="VARCHAR"/>
+ <result property="overview" column="overview" jdbcType="VARCHAR"/>
+ <result property="expectDiagnosis" column="expect_diagnosis" jdbcType="VARCHAR"/>
+ <result property="primarilyDiagnosis" column="primarily_diagnosis" jdbcType="VARCHAR"/>
+ <result property="confirmDiagnosis" column="confirm_diagnosis" jdbcType="VARCHAR"/>
+ <result property="differentialDiagnosis" column="differential_diagnosis" jdbcType="VARCHAR"/>
+ <result property="fullCheck" column="full_check" jdbcType="VARCHAR"/>
+ <result property="treatmentPlan" column="treatment_plan" jdbcType="VARCHAR"/>
+ <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,process_id,overview,
+ expect_diagnosis,primarily_diagnosis,confirm_diagnosis,
+ differential_diagnosis,full_check,treatment_plan,
+ create_user_id,create_time,update_user_id,
+ update_time
+ </sql>
+</mapper>
diff --git a/virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml b/virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml
index 4e60c339..33d3205d 100644
--- a/virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml
@@ -10,6 +10,7 @@
<result property="medicalRecId" column="medical_rec_id" jdbcType="VARCHAR"/>
<result property="userId" column="user_id" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="INTEGER"/>
+ <result property="processType" column="process_type" jdbcType="INTEGER"/>
<result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -18,8 +19,7 @@
<sql id="Base_Column_List">
id
- ,patient_id,user_id,
- status,create_user_id,create_time,
- update_user_id,update_time
+ ,patient_id,user_id,status,process_type,
+ create_user_id,create_time,update_user_id,update_time
</sql>
</mapper>
diff --git a/virtual-patient-model/src/main/resources/mapper/TreatmentPlanMapper.xml b/virtual-patient-model/src/main/resources/mapper/TreatmentPlanMapper.xml
new file mode 100644
index 00000000..4d6ca834
--- /dev/null
+++ b/virtual-patient-model/src/main/resources/mapper/TreatmentPlanMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.supervision.mapper.TreatmentPlanMapper">
+
+ <resultMap id="BaseResultMap" type="com.supervision.model.TreatmentPlan">
+ <id property="id" column="id" jdbcType="VARCHAR"/>
+ <result property="disposalPlan" column="disposal_plan" jdbcType="VARCHAR"/>
+ <result property="disposalMethod" column="disposal_method" jdbcType="VARCHAR"/>
+ <result property="firstMeasures" column="first_measures" jdbcType="VARCHAR"/>
+ <result property="secondMeasures" column="second_measures" jdbcType="VARCHAR"/>
+ <result property="recommendedMedication" column="recommended_medication" jdbcType="OTHER"/>
+ <result property="description" column="description" jdbcType="VARCHAR"/>
+ <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,disposal_plan,disposal_method,
+ first_measures,second_measures,recommended_medication,
+ description,create_user_id,create_time,
+ update_user_id,update_time
+ </sql>
+</mapper>
diff --git a/virtual-patient-model/src/main/resources/mapper/VpDiseaseTreatmenRelationMapper.xml b/virtual-patient-model/src/main/resources/mapper/VpDiseaseTreatmenRelationMapper.xml
new file mode 100644
index 00000000..004ab4a0
--- /dev/null
+++ b/virtual-patient-model/src/main/resources/mapper/VpDiseaseTreatmenRelationMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.supervision.mapper.VpDiseaseTreatmenRelationMapper">
+
+ <resultMap id="BaseResultMap" type="com.supervision.model.DiseaseTreatmentRelation">
+ <id property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
+ <id property="planId" column="plan_id" jdbcType="VARCHAR"/>
+ <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ disease_id,plan_id,create_user_id,
+ create_time,update_user_id,update_time
+ </sql>
+</mapper>
diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java
index 00e30f28..7ac476e2 100644
--- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java
+++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskAncillaryServiceImpl.java
@@ -55,7 +55,7 @@ public class AskAncillaryServiceImpl implements AskAncillaryService {
// 找到对应的项目的检查结果
DiseaseAncillary diseaseAncillaryQueryBean = new DiseaseAncillary();
diseaseAncillaryQueryBean.setItemId(reqVO.getItemId());
- diseaseAncillaryQueryBean.setMedicalRecId(process.getMedicalRecId());
+ diseaseAncillaryQueryBean.setDiseaseId(process.getMedicalRecId());
DiseaseAncillaryDto diseaseAncillary = diseaseAncillaryService.queryDiseaseAncillaryDtoOne(diseaseAncillaryQueryBean, () -> {
DiseaseAncillaryDto get = new DiseaseAncillaryDto();
get.setResult("无相关资讯");
diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java
index d716f0a4..1a89eb56 100644
--- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java
+++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java
@@ -74,7 +74,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
Process process = processService.getById(processId);
Patient patient = patientService.getById(process.getPatientId());
MedicalRec medicalRec = medicalRecService.getById(process.getMedicalRecId());
- List<Disease> diseasesList = diseaseService.listByIds(medicalRec.getDiseaseList());
+ List<Disease> diseasesList = diseaseService.listDiseaseWithType(medicalRec.getDiseaseId());
// 1.生成预期诊断结果
diagnosisResultResVO.setExpertDiagnosisResult(creatExpertDiagnosisResult(medicalRec, diagnosisResult, diseasesList));
// 2.生成初步诊断依据
@@ -101,7 +101,8 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
private BasisIdentificationResultResVO createBasisIdentificationResult(String processId, List<Disease> diseasesList) {
BasisIdentificationResultResVO basisIdentificationResultResVO = new BasisIdentificationResultResVO();
- basisIdentificationResultResVO.setIdentificationDiagnosis(diseasesList.stream().map(Disease::getBasisIdentification).collect(Collectors.toList()));
+ // todo : 由于修改了表结构，导致证实依据字段不存在。。。
+ basisIdentificationResultResVO.setIdentificationDiagnosis(diseasesList.stream().map(e->"").collect(Collectors.toList()));
// 2.2 获取体格检查
List<PhysicalRecordByResultDAO> physicalRecordList = diagnosisPhysicalRecordService.queryPhysicalResultByProcessId(processId);
List<BasisDiagnosisNodeResVO> nodeList = physicalRecordList.stream()
@@ -133,7 +134,8 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
private BasisConfirmResultResVO createBasisConfirmResult(String processId, List<Disease> diseasesList) {
BasisConfirmResultResVO basisConfirmResultResVO = new BasisConfirmResultResVO();
- basisConfirmResultResVO.setConfirmingDiagnosis(diseasesList.stream().map(Disease::getConfirmingDiagnosis).collect(Collectors.toList()));
+ //todo: 由于修改了表结构，导致证实依据不存在....
+ basisConfirmResultResVO.setConfirmingDiagnosis(diseasesList.stream().map(e->"").collect(Collectors.toList()));
// 2.2 获取体格检查
List<PhysicalRecordByResultDAO> physicalRecordList = diagnosisPhysicalRecordService.queryPhysicalResultByProcessId(processId);
List<BasisDiagnosisNodeResVO> nodeList = physicalRecordList.stream()
@@ -165,7 +167,8 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
private BasisPrimaryResultResVO createBasisPrimaryResult(Patient patient, String processId, List<Disease> diseasesList) {
BasisPrimaryResultResVO basisPrimaryResultResVO = new BasisPrimaryResultResVO();
- basisPrimaryResultResVO.setPreliminaryDiagnosis(diseasesList.stream().map(Disease::getPreliminaryDiagnosis).collect(Collectors.toList()));
+ //todo: 由于修改了表结构导致初步诊断不存在
+ basisPrimaryResultResVO.setPreliminaryDiagnosis(diseasesList.stream().map(e->"").collect(Collectors.toList()));
// 根据record记录寻找符合初步诊断依据的项目
// 2.1 首先获取对话
List<BasisDiagnosisNodeResVO> basisDiagnosisNodeResVOS = new ArrayList<>();
diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java
index d30dbccc..d3550ff4 100644
--- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java
+++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPhysicalServiceImpl.java
@@ -71,7 +71,7 @@ public class AskPhysicalServiceImpl implements AskPhysicalService {
if (1 == tool.getRequireLocation() && StrUtil.isEmpty(location.getId())) {
result.setResult("无相关资讯");
} else {
- result = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getMedicalRecId, process.getMedicalRecId())
+ result = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getDiseaseId, process.getMedicalRecId())
.eq(DiseasePhysical::getToolId, tool.getId()).eq(StrUtil.isNotBlank(location.getId()), DiseasePhysical::getLocationId, location.getId()).last("limit 1")
.oneOpt()
.orElseGet(() -> {