From 230f8d385a88e01a87ed757a32f6ad7aff82a27e Mon Sep 17 00:00:00 2001
From: huangjin <huangjin@lucahealthcare.com>
Date: Fri, 25 Oct 2024 14:23:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pilot/entity/AbstractAuditingEntity.java | 4 ----
.../pilot/entity/ClinicalTrialsEvent.java | 6 -----
src/main/java/com/luca/pilot/entity/Crf.java | 2 --
.../java/com/luca/pilot/entity/CrfAnswer.java | 4 ----
.../com/luca/pilot/entity/ModuleEntity.java | 1 -
.../entity/PatientScaleEvaluatingEntity.java | 5 ----
src/main/java/com/luca/pilot/entity/Plan.java | 8 +------
.../java/com/luca/pilot/entity/PlanTask.java | 24 +------------------
.../luca/pilot/entity/PlanTaskDetails.java | 12 +---------
.../pilot/entity/PlanTaskDetailsModule.java | 5 ----
.../pilot/entity/PlanTaskModuleRelate.java | 4 ----
.../java/com/luca/pilot/entity/Project.java | 10 --------
.../com/luca/pilot/entity/Questionnaire.java | 1 -
.../pilot/entity/QuestionnaireAnswer.java | 6 -----
.../entity/QuestionnaireAnswerOption.java | 8 -------
.../entity/QuestionnaireAnswerRecord.java | 6 -----
.../luca/pilot/entity/ScaleModuleEntity.java | 3 ---
src/main/java/com/luca/pilot/entity/Site.java | 3 +--
.../luca/pilot/entity/UserArchiveMapping.java | 5 ----
19 files changed, 4 insertions(+), 113 deletions(-)
diff --git a/src/main/java/com/luca/pilot/entity/AbstractAuditingEntity.java b/src/main/java/com/luca/pilot/entity/AbstractAuditingEntity.java
index 55d6ddc..49d5bb2 100644
--- a/src/main/java/com/luca/pilot/entity/AbstractAuditingEntity.java
+++ b/src/main/java/com/luca/pilot/entity/AbstractAuditingEntity.java
@@ -15,16 +15,12 @@ public abstract class AbstractAuditingEntity implements Serializable {
private static final long serialVersionUID = 1L;
- @Field("created_by")
private String createdBy;
- @Field("created_at")
private String createdAt;
- @Field("last_modified_by")
private String lastModifiedBy;
- @Field("last_modified_at")
private String lastModifiedAt;
/**
diff --git a/src/main/java/com/luca/pilot/entity/ClinicalTrialsEvent.java b/src/main/java/com/luca/pilot/entity/ClinicalTrialsEvent.java
index 66a0f9d..22e821e 100644
--- a/src/main/java/com/luca/pilot/entity/ClinicalTrialsEvent.java
+++ b/src/main/java/com/luca/pilot/entity/ClinicalTrialsEvent.java
@@ -40,37 +40,31 @@ public class ClinicalTrialsEvent extends AbstractAuditingEntity implements Seria
/**
* DBM-浜嬩欢id
*/
- @Field("event_id")
private Long eventId;
/**
* 璁″垝浠诲姟id
*/
- @Field("plan_details_id")
private Long planDetailsId;
/**
* 鍏宠仈妯″潡鍒嗙被(渚嬪: DIGITAL_MEDICAL/COLLECT_FLOW)
*/
- @Field("relation_type")
private String relationType;
/**
* 鍏宠仈妯″潡id
*/
- @Field("relation_id")
private Long relationId;
/**
* 妯″潡椤圭被鍨� (渚嬪: sitToStand/collect_module)
*/
- @Field("module_item_type")
private String moduleItemType;
/**
* 绉戠爺閲囬泦 - 閲囬泦绫诲瀷
*/
- @Field("collect_type")
private String collectType;
/**
diff --git a/src/main/java/com/luca/pilot/entity/Crf.java b/src/main/java/com/luca/pilot/entity/Crf.java
index 7015eb9..1cf7f14 100644
--- a/src/main/java/com/luca/pilot/entity/Crf.java
+++ b/src/main/java/com/luca/pilot/entity/Crf.java
@@ -32,9 +32,7 @@ public class Crf extends AbstractAuditingEntity implements Serializable {
private Long sourceId;
- @Field("question_json")
private String questionJson;
- @Field("crf_top_id")
private Long crfTopId;
}
diff --git a/src/main/java/com/luca/pilot/entity/CrfAnswer.java b/src/main/java/com/luca/pilot/entity/CrfAnswer.java
index b190335..42d5357 100644
--- a/src/main/java/com/luca/pilot/entity/CrfAnswer.java
+++ b/src/main/java/com/luca/pilot/entity/CrfAnswer.java
@@ -26,13 +26,11 @@ public class CrfAnswer extends AbstractAuditingEntity implements Serializable {
/**
* crf琛↖D
*/
- @Field("crf_id")
private Long crfId;
/**
* crfTop琛ㄤ富閿甀D
*/
- @Field("crf_top_id")
private Long crfTopId;
/**
@@ -44,10 +42,8 @@ public class CrfAnswer extends AbstractAuditingEntity implements Serializable {
/**
* 绛旀鐨勫ぇjson
*/
- @Field("answer_json")
private String answerJson;
- @Field("plan_task_details_id")
private Long planTaskDetailsId;
/**
diff --git a/src/main/java/com/luca/pilot/entity/ModuleEntity.java b/src/main/java/com/luca/pilot/entity/ModuleEntity.java
index 224160a..d38d766 100644
--- a/src/main/java/com/luca/pilot/entity/ModuleEntity.java
+++ b/src/main/java/com/luca/pilot/entity/ModuleEntity.java
@@ -25,7 +25,6 @@ public class ModuleEntity extends AbstractAuditingEntity {
/**
* 椤圭洰code
*/
- @Field("project_code")
private String projectCode;
/**
diff --git a/src/main/java/com/luca/pilot/entity/PatientScaleEvaluatingEntity.java b/src/main/java/com/luca/pilot/entity/PatientScaleEvaluatingEntity.java
index 8e00d0f..7d60b24 100644
--- a/src/main/java/com/luca/pilot/entity/PatientScaleEvaluatingEntity.java
+++ b/src/main/java/com/luca/pilot/entity/PatientScaleEvaluatingEntity.java
@@ -20,25 +20,20 @@ public class PatientScaleEvaluatingEntity extends AbstractAuditingEntity {
private Long id;
private String code;
- @Field("project_code")
private String projectCode;
private String patientCode;
private String siteId;
- @Field("scale_code")
private String scaleCode;
- @Field("scale_result")
private String scaleResult;
private String ruleId;
/**
* 閲忚〃绛旈鎬诲緱鍒�
*/
- @Field("total_score")
private String totalScore;
/**
* 鎮ｈ€呬换鍔¤鎯卛d
*/
- @Field("plan_task_details_id")
private Long planTaskDetailsId;
}
diff --git a/src/main/java/com/luca/pilot/entity/Plan.java b/src/main/java/com/luca/pilot/entity/Plan.java
index e898a96..282395d 100644
--- a/src/main/java/com/luca/pilot/entity/Plan.java
+++ b/src/main/java/com/luca/pilot/entity/Plan.java
@@ -28,14 +28,12 @@ public class Plan extends AbstractAuditingEntity {
/**
* 绉熸埛id
*/
- @Field("tenant_id")
private Long tenantId;
/**
* 椤圭洰id
*/
- @Field("project_id")
- private Long projectId;
+ private String projectCode;
/**
* 璁″垝鍚嶇О
@@ -50,7 +48,6 @@ public class Plan extends AbstractAuditingEntity {
/**
* 鐢熸晥鏃ユ湡
*/
- @Field("effective_date")
private LocalDate effectiveDate;
/**
@@ -71,19 +68,16 @@ public class Plan extends AbstractAuditingEntity {
/**
* 璁″垝浜岀淮鐮�
*/
- @Field("plan_url")
private String planUrl;
/**
* 鏍囩ids
*/
- @Field("patient_tags")
private String patientTags;
/**
* 鏄惁闇€瑕佸尰鐢熷鏍� 0 涓嶉渶瑕� 1 闇€瑕�
*/
- @Field("doctor_audit")
private Integer doctorAudit;
diff --git a/src/main/java/com/luca/pilot/entity/PlanTask.java b/src/main/java/com/luca/pilot/entity/PlanTask.java
index 58cfe4c..ec1d30b 100644
--- a/src/main/java/com/luca/pilot/entity/PlanTask.java
+++ b/src/main/java/com/luca/pilot/entity/PlanTask.java
@@ -26,132 +26,110 @@ public class PlanTask extends AbstractAuditingEntity {
/**
* 绉熸埛id
*/
- @Field("tenant_id")
private Long tenantId;
/**
* 椤圭洰id
*/
- @Field("project_id")
- private Long projectId;
+ private String projectCode;
/**
* 璁″垝id
*/
- @Field("plan_id")
private Long planId;
/**
* 浠诲姟鍚嶇О
*/
- @Field("name")
private String name;
/**
* 浠诲姟鎻忚堪
*/
- @Field("description")
private String description;
/**
* 寰幆绫诲瀷(1:鍛� 2:鏈� 3:椤圭洰)
*/
- @Field("loop_type")
private Integer loopType;
/**
* 鎵ц绫诲瀷(寰幆绫诲瀷=鍛� 1:鎸囧畾鏄熸湡 2:寰幆鍛ㄥ唴鍑犳; 寰幆绫诲瀷=鏈� 1:浠庡綋鏈堝嚑鏃ュ紑濮� 2:鎸囧畾鏃ユ湡)
*/
- @Field("execute_type")
private Integer executeType;
/**
* 鎵ц鏃ユ湡(cron琛ㄨ揪寮忕畝鍖�)
*/
- @Field("execute_cron")
private String executeCron;
/**
* 鍛ㄦ墽琛岄娆�(寰幆绫诲瀷涓哄懆绫诲瀷,寰幆鍛ㄥ唴鍑犳鏃惰鍊�)
*/
- @Field("week_frequency")
private Integer weekFrequency;
/**
* 鏄惁鍚敤(0:绂佺敤 1:鍚敤)
*/
- @Field("enabled")
private Integer enabled;
/**
* 璁″垝鐩爣id
*/
- @Field("target_id")
private Long targetId;
/**
* 绐楀彛鏈�
*/
- @Field("window_phase")
private Integer windowPhase;
/**
* 棰勭害鏃堕棿
*/
- @Field("reserve_time")
private String reserveTime;
/**
* 鍏遍渶澶氬皯澶�
*/
- @Field("finish_day")
private Integer finishDay;
/**
* 浠诲姟绫诲瀷(0:鎮ｈ€呬换鍔� 1:鍖荤敓闅忚)
*/
- @Field("task_type")
private Integer taskType;
/**
* 涓€鏃ラ渶瀹屾垚娆℃暟
*/
- @Field("task_count")
private Integer taskCount;
/**
* 鏄惁寮€鍚獥鍙ｆ湡 1寮€鍚� 0 鏈紑鍚�
*/
- @Field("is_window_phase")
private Integer isWindowPhase;
/**
* 鏄惁寰幆 1鏄� 0 鍚�
*/
- @Field("is_circulation")
private Integer isCirculation;
/**
* 绗嚑澶╁惊鐜�
*/
- @Field("circulation_day")
private Integer circulationDay;
/**
* 绗嚑澶╁紑濮�
*/
- @Field("begin_day")
private Integer beginDay;
/**
* 鍏ョ粍绫诲瀷闅忚缁撴潫浜庣鍑犲ぉ锛�0涓鸿嚦闅忚缁撴潫
*/
- @Field("end_day")
private Integer endDay;
/**
* 鍒嗙粍id
*/
- @Field("group_id")
private Long groupId;
}
diff --git a/src/main/java/com/luca/pilot/entity/PlanTaskDetails.java b/src/main/java/com/luca/pilot/entity/PlanTaskDetails.java
index 2b2209f..a33616c 100644
--- a/src/main/java/com/luca/pilot/entity/PlanTaskDetails.java
+++ b/src/main/java/com/luca/pilot/entity/PlanTaskDetails.java
@@ -30,55 +30,46 @@ public class PlanTaskDetails extends AbstractAuditingEntity {
/**
* 璁″垝code //todo 涓存椂瀛楁
*/
- @Field("schedule_task_code")
private String scheduleTaskCode;
/**
* 绉熸埛id
*/
- @Field("tenant_id")
private Long tenantId;
/**
* 椤圭洰id
*/
- @Field("project_id")
- private Long projectId;
+ private String projectCode;
/**
* 鎮ｈ€呬换鍔¤鍒抜d
*/
- @Field("plan_task_id")
private Long planTaskId;
/**
* 鎮ｈ€卌ode
*/
- @Field("patient_code")
private String patientCode;
/**
* 璁″垝寮€濮嬫棩鏈�
*/
- @Field("start_date")
private String startDate;
/**
* 璁″垝缁撴潫鏃ユ湡
*/
- @Field("end_date")
private String endDate;
/**
* 璁″垝瀹屾垚鐘舵€�(0:鏈畬鎴� 1:宸插畬鎴�)
*/
- @Field("complete_status")
private Integer completeStatus;
/**
* 璁″垝瀹屾垚鏃堕棿
*/
- @Field("complete_time")
private String completeTime;
/**
@@ -89,7 +80,6 @@ public class PlanTaskDetails extends AbstractAuditingEntity {
/**
* 瀹屾垚椤哄簭
*/
- @Field("complete_order")
private Integer completeOrder;
/**
diff --git a/src/main/java/com/luca/pilot/entity/PlanTaskDetailsModule.java b/src/main/java/com/luca/pilot/entity/PlanTaskDetailsModule.java
index 6a4a1e6..595dc3e 100644
--- a/src/main/java/com/luca/pilot/entity/PlanTaskDetailsModule.java
+++ b/src/main/java/com/luca/pilot/entity/PlanTaskDetailsModule.java
@@ -32,31 +32,26 @@ public class PlanTaskDetailsModule extends AbstractAuditingEntity {
/**
* 鎮ｈ€呬换鍔¤鍒掕鎯卛d
*/
- @Field("plan_task_details_id")
private Long planTaskDetailsId;
/**
* 鍏宠仈椤圭洰绫诲瀷
*/
- @Field("relation_type")
private String relationType;
/**
* 鍏宠仈id
*/
- @Field("relation_id")
private Long relationId;
/**
* 妯″潡浠诲姟瀹屾垚鐘舵€�(0:鏈畬鎴� 1:宸插畬鎴�)
*/
- @Field("module_complete")
private Integer moduleComplete;
/**
* 蹇界暐澶囨敞
*/
- @Field("ignore_remark")
private String ignoreRemark;
}
diff --git a/src/main/java/com/luca/pilot/entity/PlanTaskModuleRelate.java b/src/main/java/com/luca/pilot/entity/PlanTaskModuleRelate.java
index 380f87c..50a1f89 100644
--- a/src/main/java/com/luca/pilot/entity/PlanTaskModuleRelate.java
+++ b/src/main/java/com/luca/pilot/entity/PlanTaskModuleRelate.java
@@ -27,25 +27,21 @@ public class PlanTaskModuleRelate extends AbstractAuditingEntity {
/**
* 绉熸埛id
*/
- @Field("tenant_id")
private Long tenantId;
/**
* 鍏宠仈model绫诲瀷
*/
- @Field("relation_type")
private String relationType;
/**
* 鍏宠仈id
*/
- @Field("relation_id")
private Long relationId;
/**
* 鎮ｈ€呬换鍔¤鍒抜d
*/
- @Field("plan_task_id")
private Long planTaskId;
}
diff --git a/src/main/java/com/luca/pilot/entity/Project.java b/src/main/java/com/luca/pilot/entity/Project.java
index a1363fb..88c9548 100644
--- a/src/main/java/com/luca/pilot/entity/Project.java
+++ b/src/main/java/com/luca/pilot/entity/Project.java
@@ -25,20 +25,16 @@ public class Project extends AbstractAuditingEntity {
private String name;
- @Field("app_ids")
private String appIds;
- @Field("invite_code")
private String inviteCode;
private Long type;
private String number;
- @Field("tenant_id")
private Long tenantId;
- @Field("bid_unit")
private String bidUnit;
private String version;
@@ -50,22 +46,18 @@ public class Project extends AbstractAuditingEntity {
// private LocalDate endAt;
private String url;
- @Field("dashboard_show_code")
private String dashboardShowCode;
- @Field("dashboard_show_name")
private String dashboardShowName;
/**
* 鏃ヨ浣跨敤 鏂规鍚嶇О 闈炲繀濉�
*/
- @Field("scheme_name")
private String schemeName;
/**
* 鏃ヨ浣跨敤 鏂规缂栧彿 闈炲繀濉�
*/
- @Field("scheme_code")
private String schemeCode;
// /**
@@ -83,13 +75,11 @@ public class Project extends AbstractAuditingEntity {
/**
* 鐮旂┒闅忚鏃堕暱
*/
- @Field("study_follow_up_time")
private Integer studyFollowUpTime;
/**
* 璁″垝浜烘暟
*/
- @Field("plan_people")
private Long planPeople;
}
diff --git a/src/main/java/com/luca/pilot/entity/Questionnaire.java b/src/main/java/com/luca/pilot/entity/Questionnaire.java
index 7a2dfa0..0038300 100644
--- a/src/main/java/com/luca/pilot/entity/Questionnaire.java
+++ b/src/main/java/com/luca/pilot/entity/Questionnaire.java
@@ -33,7 +33,6 @@ public class Questionnaire extends AbstractAuditingEntity implements Serializabl
private Integer status;
- @Field("top_id")
private Long topId;
private Long sourceId;
diff --git a/src/main/java/com/luca/pilot/entity/QuestionnaireAnswer.java b/src/main/java/com/luca/pilot/entity/QuestionnaireAnswer.java
index afe1219..cfebbc9 100644
--- a/src/main/java/com/luca/pilot/entity/QuestionnaireAnswer.java
+++ b/src/main/java/com/luca/pilot/entity/QuestionnaireAnswer.java
@@ -24,16 +24,12 @@ public class QuestionnaireAnswer extends AbstractAuditingEntity implements Seria
private Long id;
- @Field("questionnaire_id")
private Long questionnaireId;
- @Field("questionnaire_name")
private String questionnaireName;
- @Field("question_id")
private Long questionId;
- @Field("question_name")
private String questionName;
private String type;
@@ -44,7 +40,6 @@ public class QuestionnaireAnswer extends AbstractAuditingEntity implements Seria
/**
* 鎮ｈ€呬换鍔¤鎯卛d
*/
- @Field("plan_task_details_id")
private Long planTaskDetailsId;
/**
@@ -59,7 +54,6 @@ public class QuestionnaireAnswer extends AbstractAuditingEntity implements Seria
/**
* 涓昏褰昳d
*/
- @Field("record_id")
private Long recordId;
// @ApiModelProperty(value = "鍏宠仈schedule")
diff --git a/src/main/java/com/luca/pilot/entity/QuestionnaireAnswerOption.java b/src/main/java/com/luca/pilot/entity/QuestionnaireAnswerOption.java
index 41e4b59..e54ad31 100644
--- a/src/main/java/com/luca/pilot/entity/QuestionnaireAnswerOption.java
+++ b/src/main/java/com/luca/pilot/entity/QuestionnaireAnswerOption.java
@@ -26,30 +26,22 @@ public class QuestionnaireAnswerOption extends AbstractAuditingEntity implements
private Long id;
- @Field("answer_id")
private Long answerId;
- @Field("option_id")
private Long optionId;
- @Field("option_name")
private String optionName;
- @Field("question_id")
private Long questionId;
private String content;
- @Field("date_at")
private String dateAt;
- @Field("number_answer")
private BigDecimal numberAnswer;
- @Field("left_min")
private BigDecimal leftMin;
- @Field("right_max")
private BigDecimal rightMax;
}
diff --git a/src/main/java/com/luca/pilot/entity/QuestionnaireAnswerRecord.java b/src/main/java/com/luca/pilot/entity/QuestionnaireAnswerRecord.java
index db02ed9..4e80074 100644
--- a/src/main/java/com/luca/pilot/entity/QuestionnaireAnswerRecord.java
+++ b/src/main/java/com/luca/pilot/entity/QuestionnaireAnswerRecord.java
@@ -27,28 +27,22 @@ public class QuestionnaireAnswerRecord extends AbstractAuditingEntity implements
private Long id;
- @Field("top_id")
private Long topId;
- @Field("project_code")
private String projectCode;
- @Field("site_id")
private String siteId;
- @Field("patient_code")
private String patientCode;
/**
* 鎮ｈ€呬换鍔¤鎯卛d
*/
- @Field("plan_task_details_id")
private Long planTaskDetailsId;
/**
* 璁″垝瀹屾垚鏃堕棿
*/
- @Field("complete_time")
private String completeTime;
diff --git a/src/main/java/com/luca/pilot/entity/ScaleModuleEntity.java b/src/main/java/com/luca/pilot/entity/ScaleModuleEntity.java
index 31b58b3..fb715e4 100644
--- a/src/main/java/com/luca/pilot/entity/ScaleModuleEntity.java
+++ b/src/main/java/com/luca/pilot/entity/ScaleModuleEntity.java
@@ -19,11 +19,8 @@ public class ScaleModuleEntity extends AbstractAuditingEntity {
private Long id;
private String code;
- @Field("project_code")
private String projectCode;
- @Field("module_code")
private String moduleCode;
- @Field("scale_code")
private String scaleCode;
private Integer enabled;
}
diff --git a/src/main/java/com/luca/pilot/entity/Site.java b/src/main/java/com/luca/pilot/entity/Site.java
index 8640c27..96b2d62 100644
--- a/src/main/java/com/luca/pilot/entity/Site.java
+++ b/src/main/java/com/luca/pilot/entity/Site.java
@@ -22,12 +22,11 @@ public class Site extends AbstractAuditingEntity {
/**
* 椤圭洰id
*/
- private Long projectId;
+ private String projectCode;
/**
* site鍚嶇О(L:32)
*/
- @Field("site_name")
private String siteName;
/**
diff --git a/src/main/java/com/luca/pilot/entity/UserArchiveMapping.java b/src/main/java/com/luca/pilot/entity/UserArchiveMapping.java
index 220db16..9f431ad 100644
--- a/src/main/java/com/luca/pilot/entity/UserArchiveMapping.java
+++ b/src/main/java/com/luca/pilot/entity/UserArchiveMapping.java
@@ -15,19 +15,14 @@ import org.springframework.data.mongodb.core.mapping.Field;
@Document(collection="user_archive_mapping")
public class UserArchiveMapping extends AbstractAuditingEntity {
private Long id;
- @Field("project_code")
private String projectCode;
- @Field("site_id")
private Long siteId;
- @Field("uaa_user_id")
private Long uaaUserId;
- @Field("patient_code")
private String patientCode;
- @Field("user_archive_id")
private String userArchiveId;
}
--
GitLab