From 2761e8ff1a6bb5302fce4d176f034e228d21dea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Thu, 26 Oct 2023 19:35:30 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85Request?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/request/DrugDetailsRequest.java | 171 ------------------ .../duck/request/MedicineDetailRequest.java | 167 +++++++++++++++++ 2 files changed, 167 insertions(+), 171 deletions(-) delete mode 100644 src/main/java/com/four/common/duck/request/DrugDetailsRequest.java create mode 100644 src/main/java/com/four/common/duck/request/MedicineDetailRequest.java diff --git a/src/main/java/com/four/common/duck/request/DrugDetailsRequest.java b/src/main/java/com/four/common/duck/request/DrugDetailsRequest.java deleted file mode 100644 index b633232..0000000 --- a/src/main/java/com/four/common/duck/request/DrugDetailsRequest.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.four.common.duck.request; - -/** - * @author: tongCheng - * @Package: four-common-duck - * @ClassName: DrugDetailsRequest - * @date: 2023-10-20 19:06 - * 药品详情+病症药品表联查 - **/ -public class DrugDetailsRequest { - /** - * 药品详情id - */ - private Long drugDetailsId; - - /** - * 常见病症+常见药品表id - */ - private Long id; - - /** - * 药品成分 - */ - private String pharmaceuticalIngredient; - - /** - * 用药禁忌 - */ - private String drugContraindication; - - /** - * 功能主治 - */ - private String functionalIndications; - - /** - * 用法用量 - */ - private String usageDosage; - - /** - * 药品性状 - */ - private String drugCharacter; - - /** - * 包装规格 - */ - private String packingSpecification; - - /** - * 不良反应 - */ - private String adverseReaction; - - /** - * 名称 - */ - private String name; - - /** - * 与id关联 - */ - private Long pid; - - - public Long getDrugDetailsId() { - return drugDetailsId; - } - - public void setDrugDetailsId(Long drugDetailsId) { - this.drugDetailsId = drugDetailsId; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getPharmaceuticalIngredient() { - return pharmaceuticalIngredient; - } - - public void setPharmaceuticalIngredient(String pharmaceuticalIngredient) { - this.pharmaceuticalIngredient = pharmaceuticalIngredient; - } - - public String getDrugContraindication() { - return drugContraindication; - } - - public void setDrugContraindication(String drugContraindication) { - this.drugContraindication = drugContraindication; - } - - public String getFunctionalIndications() { - return functionalIndications; - } - - public void setFunctionalIndications(String functionalIndications) { - this.functionalIndications = functionalIndications; - } - - public String getUsageDosage() { - return usageDosage; - } - - public void setUsageDosage(String usageDosage) { - this.usageDosage = usageDosage; - } - - public String getDrugCharacter() { - return drugCharacter; - } - - public void setDrugCharacter(String drugCharacter) { - this.drugCharacter = drugCharacter; - } - - public String getPackingSpecification() { - return packingSpecification; - } - - public void setPackingSpecification(String packingSpecification) { - this.packingSpecification = packingSpecification; - } - - public String getAdverseReaction() { - return adverseReaction; - } - - public void setAdverseReaction(String adverseReaction) { - this.adverseReaction = adverseReaction; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Long getPid() { - return pid; - } - - public void setPid(Long pid) { - this.pid = pid; - } - - public DrugDetailsRequest() { - } - - public DrugDetailsRequest(Long drugDetailsId, Long id, String pharmaceuticalIngredient, String drugContraindication, String functionalIndications, String usageDosage, String drugCharacter, String packingSpecification, String adverseReaction, String name, Long pid) { - this.drugDetailsId = drugDetailsId; - this.id = id; - this.pharmaceuticalIngredient = pharmaceuticalIngredient; - this.drugContraindication = drugContraindication; - this.functionalIndications = functionalIndications; - this.usageDosage = usageDosage; - this.drugCharacter = drugCharacter; - this.packingSpecification = packingSpecification; - this.adverseReaction = adverseReaction; - this.name = name; - this.pid = pid; - } -} diff --git a/src/main/java/com/four/common/duck/request/MedicineDetailRequest.java b/src/main/java/com/four/common/duck/request/MedicineDetailRequest.java new file mode 100644 index 0000000..42dc9bc --- /dev/null +++ b/src/main/java/com/four/common/duck/request/MedicineDetailRequest.java @@ -0,0 +1,167 @@ +package com.four.common.duck.request; + +import java.util.Date; + +/** + * @author: tongCheng + * @Package: dimensional-health-homePage + * @ClassName: MedicineDetail + * @date: 2023-10-25 18:49 + **/ +public class MedicineDetailRequest { + + /** + * 药品详情id + */ + private Long medicineDetailId; + + /** + * 药品id + */ + private Long medicineId; + + /** + * 药品成分 + */ + private String ingredient; + + /** + * 用药禁忌 + */ + private String medicineAvoid; + + /** + * 功能主治 + */ + private String majorFunction; + + /** + * 用法用量 + */ + private String usageAndDosage; + + /** + * 药品形状 + */ + private String character; + + /** + * 包装规格 + */ + private String packageSpecification; + + /** + * 不良反应 + */ + private String adverseReaction; + + private String name; + + private Long pid; + + + public Long getMedicineDetailId() { + return medicineDetailId; + } + + public void setMedicineDetailId(Long medicineDetailId) { + this.medicineDetailId = medicineDetailId; + } + + public Long getMedicineId() { + return medicineId; + } + + public void setMedicineId(Long medicineId) { + this.medicineId = medicineId; + } + + public String getIngredient() { + return ingredient; + } + + public void setIngredient(String ingredient) { + this.ingredient = ingredient; + } + + public String getMedicineAvoid() { + return medicineAvoid; + } + + public void setMedicineAvoid(String medicineAvoid) { + this.medicineAvoid = medicineAvoid; + } + + public String getMajorFunction() { + return majorFunction; + } + + public void setMajorFunction(String majorFunction) { + this.majorFunction = majorFunction; + } + + public String getUsageAndDosage() { + return usageAndDosage; + } + + public void setUsageAndDosage(String usageAndDosage) { + this.usageAndDosage = usageAndDosage; + } + + public String getCharacter() { + return character; + } + + public void setCharacter(String character) { + this.character = character; + } + + public String getPackageSpecification() { + return packageSpecification; + } + + public void setPackageSpecification(String packageSpecification) { + this.packageSpecification = packageSpecification; + } + + public String getAdverseReaction() { + return adverseReaction; + } + + public void setAdverseReaction(String adverseReaction) { + this.adverseReaction = adverseReaction; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getPid() { + return pid; + } + + public void setPid(Long pid) { + this.pid = pid; + } + + public MedicineDetailRequest() { + } + + public MedicineDetailRequest(Long medicineDetailId, Long medicineId, String ingredient, String medicineAvoid, String majorFunction, String usageAndDosage, String character, String packageSpecification, String adverseReaction, String name, Long pid) { + this.medicineDetailId = medicineDetailId; + this.medicineId = medicineId; + this.ingredient = ingredient; + this.medicineAvoid = medicineAvoid; + this.majorFunction = majorFunction; + this.usageAndDosage = usageAndDosage; + this.character = character; + this.packageSpecification = packageSpecification; + this.adverseReaction = adverseReaction; + this.name = name; + this.pid = pid; + } +} From b663b208b5242d5f82c8eaa34283a3530655c21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Thu, 26 Oct 2023 20:29:50 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E8=AE=AF?= =?UTF-8?q?=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/interrogation/ConsultationDetails.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java b/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java index 9e598ed..d0c40fa 100644 --- a/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java +++ b/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java @@ -40,7 +40,7 @@ public class ConsultationDetails extends ConsultationDetailsType{ /** * 发布人名称 */ - private String username; + private String userName; public Long getConsultationDetailsId() { return consultationDetailsId; @@ -90,25 +90,25 @@ public class ConsultationDetails extends ConsultationDetailsType{ this.consultationDetailsTypeId = consultationDetailsTypeId; } - public String getUsername() { - return username; + public String getUserName() { + return userName; } - public void setUsername(String username) { - this.username = username; + public void setUserName(String userName) { + this.userName = userName; } public ConsultationDetails() { } - public ConsultationDetails(Long consultationDetailsId, String consultationDetailsTitle, Long userId, Date releaseTime, String consultationDetailsContent, Long consultationDetailsTypeId, String username) { + public ConsultationDetails(Long consultationDetailsId, String consultationDetailsTitle, Long userId, Date releaseTime, String consultationDetailsContent, Long consultationDetailsTypeId, String userName) { this.consultationDetailsId = consultationDetailsId; this.consultationDetailsTitle = consultationDetailsTitle; this.userId = userId; this.releaseTime = releaseTime; this.consultationDetailsContent = consultationDetailsContent; this.consultationDetailsTypeId = consultationDetailsTypeId; - this.username = username; + this.userName = userName; } } From 127c351e48313ba226bbd9255a66796ed513ee2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Fri, 27 Oct 2023 13:56:52 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E8=AE=AF?= =?UTF-8?q?=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/four/common/duck/my/MyFile.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/my/MyFile.java b/src/main/java/com/four/common/duck/my/MyFile.java index f006f28..1b654db 100644 --- a/src/main/java/com/four/common/duck/my/MyFile.java +++ b/src/main/java/com/four/common/duck/my/MyFile.java @@ -68,6 +68,8 @@ public class MyFile { */ private Long userId; + private String[] StringBuilder; + public Long getMyFileId() { return myFileId; } @@ -148,10 +150,18 @@ public class MyFile { this.userId = userId; } + public String[] getStringBuilder() { + return StringBuilder; + } + + public void setStringBuilder(String[] stringBuilder) { + StringBuilder = stringBuilder; + } + public MyFile() { } - public MyFile(Long myFileId, String mainSymptoms, String presentMedicalHistory, String pastMedicalHistory, String treatmentExperienceLast, Date startTime, Date endTime, String therapeuticProcess, String relatedPic, Long userId) { + public MyFile(Long myFileId, String mainSymptoms, String presentMedicalHistory, String pastMedicalHistory, String treatmentExperienceLast, Date startTime, Date endTime, String therapeuticProcess, String relatedPic, Long userId, String[] stringBuilder) { this.myFileId = myFileId; this.mainSymptoms = mainSymptoms; this.presentMedicalHistory = presentMedicalHistory; @@ -162,5 +172,6 @@ public class MyFile { this.therapeuticProcess = therapeuticProcess; this.relatedPic = relatedPic; this.userId = userId; + StringBuilder = stringBuilder; } } From 45d23a478e6b5470e9b759d3651a158611708634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Fri, 27 Oct 2023 16:21:50 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/interrogation/ConsultationDetails.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java b/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java index d0c40fa..d802e6b 100644 --- a/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java +++ b/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java @@ -42,6 +42,8 @@ public class ConsultationDetails extends ConsultationDetailsType{ */ private String userName; + private Integer status; + public Long getConsultationDetailsId() { return consultationDetailsId; } @@ -98,10 +100,18 @@ public class ConsultationDetails extends ConsultationDetailsType{ this.userName = userName; } + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public ConsultationDetails() { } - public ConsultationDetails(Long consultationDetailsId, String consultationDetailsTitle, Long userId, Date releaseTime, String consultationDetailsContent, Long consultationDetailsTypeId, String userName) { + public ConsultationDetails(Long consultationDetailsId, String consultationDetailsTitle, Long userId, Date releaseTime, String consultationDetailsContent, Long consultationDetailsTypeId, String userName, Integer status) { this.consultationDetailsId = consultationDetailsId; this.consultationDetailsTitle = consultationDetailsTitle; this.userId = userId; @@ -109,6 +119,7 @@ public class ConsultationDetails extends ConsultationDetailsType{ this.consultationDetailsContent = consultationDetailsContent; this.consultationDetailsTypeId = consultationDetailsTypeId; this.userName = userName; + this.status = status; } } From 3b45f5fea88e33eb33ef07d79dca4ff116611639 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:30:06 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detailCollectionRecord.java | 50 +++++++++++++++++++ .../com/four/common/duck/utils/FastUtil.java | 1 - 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/four/common/duck/communitypatients/detailCollectionRecord.java diff --git a/src/main/java/com/four/common/duck/communitypatients/detailCollectionRecord.java b/src/main/java/com/four/common/duck/communitypatients/detailCollectionRecord.java new file mode 100644 index 0000000..064c959 --- /dev/null +++ b/src/main/java/com/four/common/duck/communitypatients/detailCollectionRecord.java @@ -0,0 +1,50 @@ +package com.four.common.duck.communitypatients; + +/** + * @program: four-common-duck + * @author: spc + * @create: 2023-10-27 16:26 + * @Version 1.0 + **/ + +import lombok.Data; + +import java.util.Date; + +/** + * 收藏记录表 + */ + +@Data +public class detailCollectionRecord { + /** + * 收藏记录id + */ + private Long detailCollectionRecordId; + + /** + * 收藏记录人 + */ + private String detailCollectionRecordUser; + + /** + * 收藏病友圈 + */ + private Long detailsPatientCircleId; + + /** + * 收藏时间 + */ + private Date detailCollectionRecordTime; + + /** + * 创建者 + */ + private String detailCollectionRecordFounder; + + /** + * 创建时间 + */ + private Date detailCollectionRecordFounderTime; +} + diff --git a/src/main/java/com/four/common/duck/utils/FastUtil.java b/src/main/java/com/four/common/duck/utils/FastUtil.java index 5f37056..59ac056 100644 --- a/src/main/java/com/four/common/duck/utils/FastUtil.java +++ b/src/main/java/com/four/common/duck/utils/FastUtil.java @@ -16,7 +16,6 @@ import javax.annotation.Resource; * @CreateTime: 2023-02-01 08:52 */ @Component - public class FastUtil { private static final Logger log = LoggerFactory.getLogger(FastUtil.class); From 9a3d8df27e359b441f9ea556da5d388e1ce98d9e Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:31:16 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...{detailCollectionRecord.java => DetailCollectionRecord.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/java/com/four/common/duck/communitypatients/{detailCollectionRecord.java => DetailCollectionRecord.java} (95%) diff --git a/src/main/java/com/four/common/duck/communitypatients/detailCollectionRecord.java b/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java similarity index 95% rename from src/main/java/com/four/common/duck/communitypatients/detailCollectionRecord.java rename to src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java index 064c959..b36123b 100644 --- a/src/main/java/com/four/common/duck/communitypatients/detailCollectionRecord.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java @@ -16,7 +16,7 @@ import java.util.Date; */ @Data -public class detailCollectionRecord { +public class DetailCollectionRecord { /** * 收藏记录id */ From e5bf96ab3397ffef1fe9c6cbcc265a1674a1eab3 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:32:53 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/duck/communitypatients/DetailCollectionRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java b/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java index b36123b..171df37 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java @@ -16,7 +16,7 @@ import java.util.Date; */ @Data -public class DetailCollectionRecord { +public class DetailCollectionRecord { /** * 收藏记录id */ From c60295926e01cf54f93336329ecadd9df85c305a Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:48:54 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitypatients/DetailCollection.java | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java index 8133868..3c092cc 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java @@ -25,7 +25,7 @@ public class DetailCollection { /** * 收藏人 */ - private String collector; + private Long collectorId; /** * 创建人 @@ -107,13 +107,6 @@ public class DetailCollection { this.collectionTime = collectionTime; } - public String getCollector() { - return collector; - } - - public void setCollector(String collector) { - this.collector = collector; - } public DetailCollection() { } @@ -122,6 +115,27 @@ public class DetailCollection { this.detailCollectionId = detailCollectionId; this.detailsPatientCircleId = detailsPatientCircleId; this.collectionTime = collectionTime; - this.collector = collector; + } + + @Override + public String toString() { + return "DetailCollection{" + + "detailCollectionId=" + detailCollectionId + + ", detailsPatientCircleId=" + detailsPatientCircleId + + ", collectionTime=" + collectionTime + + ", collectorId=" + collectorId + + ", detailCollectionFounder='" + detailCollectionFounder + '\'' + + ", detailCollectionFounderTime=" + detailCollectionFounderTime + + ", detailCollectionModificator='" + detailCollectionModificator + '\'' + + ", detailCollectionModificatorTime=" + detailCollectionModificatorTime + + '}'; + } + + public Long getCollectorId() { + return collectorId; + } + + public void setCollectorId(Long collectorId) { + this.collectorId = collectorId; } } From 5f38c5367ab50833d6c760eaec75763517afcda2 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:50:17 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../four/common/duck/communitypatients/DetailCollection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java index 3c092cc..b87d24e 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java @@ -5,7 +5,7 @@ import java.util.Date; /** * 详情表中的收藏表 */ -public class DetailCollection { +public class DetailCollection { /** * 详情表中的收藏id From dc7835c92a30a3e171d0c88d5732d2aab0669a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Fri, 27 Oct 2023 16:54:33 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/interrogation/AdvisoryCollection.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java b/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java index 974b00f..830e3cd 100644 --- a/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java +++ b/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java @@ -1,6 +1,8 @@ package com.four.common.duck.interrogation; +import java.util.Date; + /** * 健康咨询收藏表 */ @@ -17,6 +19,8 @@ public class AdvisoryCollection { */ private Long consultationDetailsId; + private Date advisoryCollectionTime; + /** * 收藏人id */ @@ -46,12 +50,22 @@ public class AdvisoryCollection { this.userId = userId; } + + public Date getAdvisoryCollectionTime() { + return advisoryCollectionTime; + } + + public void setAdvisoryCollectionTime(Date advisoryCollectionTime) { + this.advisoryCollectionTime = advisoryCollectionTime; + } + public AdvisoryCollection() { } - public AdvisoryCollection(Long advisoryCollectionId, Long consultationDetailsId, Long userId) { + public AdvisoryCollection(Long advisoryCollectionId, Long consultationDetailsId, Date advisoryCollectionTime, Long userId) { this.advisoryCollectionId = advisoryCollectionId; this.consultationDetailsId = consultationDetailsId; + this.advisoryCollectionTime = advisoryCollectionTime; this.userId = userId; } } From d8dda599d09894c62f7e59493188cf602c979279 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:55:36 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitypatients/DetailCollection.java | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java index b87d24e..2223689 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java @@ -23,10 +23,38 @@ public class DetailCollection { private Date collectionTime; /** - * 收藏人 + * 收藏人id */ private Long collectorId; + /** + * 收藏状态 + */ + private Integer detailCollectionStatus; + + @Override + public String toString() { + return "DetailCollection{" + + "detailCollectionId=" + detailCollectionId + + ", detailsPatientCircleId=" + detailsPatientCircleId + + ", collectionTime=" + collectionTime + + ", collectorId=" + collectorId + + ", detailCollectionStatus=" + detailCollectionStatus + + ", detailCollectionFounder='" + detailCollectionFounder + '\'' + + ", detailCollectionFounderTime=" + detailCollectionFounderTime + + ", detailCollectionModificator='" + detailCollectionModificator + '\'' + + ", detailCollectionModificatorTime=" + detailCollectionModificatorTime + + '}'; + } + + public Integer getDetailCollectionStatus() { + return detailCollectionStatus; + } + + public void setDetailCollectionStatus(Integer detailCollectionStatus) { + this.detailCollectionStatus = detailCollectionStatus; + } + /** * 创建人 * @return @@ -117,20 +145,6 @@ public class DetailCollection { this.collectionTime = collectionTime; } - @Override - public String toString() { - return "DetailCollection{" + - "detailCollectionId=" + detailCollectionId + - ", detailsPatientCircleId=" + detailsPatientCircleId + - ", collectionTime=" + collectionTime + - ", collectorId=" + collectorId + - ", detailCollectionFounder='" + detailCollectionFounder + '\'' + - ", detailCollectionFounderTime=" + detailCollectionFounderTime + - ", detailCollectionModificator='" + detailCollectionModificator + '\'' + - ", detailCollectionModificatorTime=" + detailCollectionModificatorTime + - '}'; - } - public Long getCollectorId() { return collectorId; } From 6303f4584080702586f79e39d1320acb5fcc30e1 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 18:44:21 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9DetailsPatientCircleDet?= =?UTF-8?q?ailCollection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/DetailsPatientCircleDetailCollection.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java index 6191a52..e365268 100644 --- a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java +++ b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java @@ -113,7 +113,12 @@ public class DetailsPatientCircleDetailCollection { /** * 收藏人 */ - private String collector; + private Long collectorId; + + /** + * 状态 + */ + private Integer detailCollectionStatus; //------------------------------------------------------------ //------------------------------------------------------------ //------------------------------------------------------------ From 4061363fea4e7a8cda52e9d750d0ae07b7f0fce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Fri, 27 Oct 2023 18:56:26 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=84=E8=AE=AF?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/AdvisoryCollectionRequest.java | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 src/main/java/com/four/common/duck/request/AdvisoryCollectionRequest.java diff --git a/src/main/java/com/four/common/duck/request/AdvisoryCollectionRequest.java b/src/main/java/com/four/common/duck/request/AdvisoryCollectionRequest.java new file mode 100644 index 0000000..e15a7d4 --- /dev/null +++ b/src/main/java/com/four/common/duck/request/AdvisoryCollectionRequest.java @@ -0,0 +1,159 @@ +package com.four.common.duck.request; + +import java.util.Date; + +/** + * @author: tongCheng + * @Package: four-common-duck + * @ClassName: AdvisoryCollectionRequest + * @date: 2023-10-27 18:53 + **/ +public class AdvisoryCollectionRequest { + + /** + * 健康咨询收藏id + */ + private Long advisoryCollectionId; + + /** + * 咨询详情id + */ + private Long consultationDetailsId; + + /** + * 收藏时间 + */ + private Date advisoryCollectionTime; + + /** + * 收藏人id + */ + private Long userId; + + /** + * 健康咨询详情标题 + */ + private String consultationDetailsTitle; + + /** + * 发布人 + */ + private String userName; + + /** + * 发布时间 + */ + private Date releaseTime; + + /** + * 内容 + */ + private String consultationDetailsContent; + + /** + * 类型 + */ + private Long consultationDetailsTypeId; + + /** + * 类型 + */ + private String consultationDetailsTypeName; + + + public Long getAdvisoryCollectionId() { + return advisoryCollectionId; + } + + public void setAdvisoryCollectionId(Long advisoryCollectionId) { + this.advisoryCollectionId = advisoryCollectionId; + } + + public Long getConsultationDetailsId() { + return consultationDetailsId; + } + + public void setConsultationDetailsId(Long consultationDetailsId) { + this.consultationDetailsId = consultationDetailsId; + } + + public Date getAdvisoryCollectionTime() { + return advisoryCollectionTime; + } + + public void setAdvisoryCollectionTime(Date advisoryCollectionTime) { + this.advisoryCollectionTime = advisoryCollectionTime; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getConsultationDetailsTitle() { + return consultationDetailsTitle; + } + + public void setConsultationDetailsTitle(String consultationDetailsTitle) { + this.consultationDetailsTitle = consultationDetailsTitle; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public Date getReleaseTime() { + return releaseTime; + } + + public void setReleaseTime(Date releaseTime) { + this.releaseTime = releaseTime; + } + + public String getConsultationDetailsContent() { + return consultationDetailsContent; + } + + public void setConsultationDetailsContent(String consultationDetailsContent) { + this.consultationDetailsContent = consultationDetailsContent; + } + + public Long getConsultationDetailsTypeId() { + return consultationDetailsTypeId; + } + + public void setConsultationDetailsTypeId(Long consultationDetailsTypeId) { + this.consultationDetailsTypeId = consultationDetailsTypeId; + } + + public String getConsultationDetailsTypeName() { + return consultationDetailsTypeName; + } + + public void setConsultationDetailsTypeName(String consultationDetailsTypeName) { + this.consultationDetailsTypeName = consultationDetailsTypeName; + } + + public AdvisoryCollectionRequest() { + } + + public AdvisoryCollectionRequest(Long advisoryCollectionId, Long consultationDetailsId, Date advisoryCollectionTime, Long userId, String consultationDetailsTitle, String userName, Date releaseTime, String consultationDetailsContent, Long consultationDetailsTypeId, String consultationDetailsTypeName) { + this.advisoryCollectionId = advisoryCollectionId; + this.consultationDetailsId = consultationDetailsId; + this.advisoryCollectionTime = advisoryCollectionTime; + this.userId = userId; + this.consultationDetailsTitle = consultationDetailsTitle; + this.userName = userName; + this.releaseTime = releaseTime; + this.consultationDetailsContent = consultationDetailsContent; + this.consultationDetailsTypeId = consultationDetailsTypeId; + this.consultationDetailsTypeName = consultationDetailsTypeName; + } +} From 6f57a0657b99c0f90929a549c5c59ae360be136f Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 21:52:29 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9DetailsPatientCircleDet?= =?UTF-8?q?ailCollection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitypatients/DetailCollection.java | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java index 2223689..b2a6c04 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java @@ -32,6 +32,31 @@ public class DetailCollection { */ private Integer detailCollectionStatus; + /** + * 创建人 + * @return + */ + private String detailCollectionFounder; + + /** + * 创建时间 + * @return + */ + private Date detailCollectionFounderTime; + + /** + * 修改人 + * @return + */ + private String detailCollectionModificator; + + /** + * 修改时间 + * @return + */ + private Date detailCollectionModificatorTime; + + @Override public String toString() { return "DetailCollection{" + @@ -55,17 +80,6 @@ public class DetailCollection { this.detailCollectionStatus = detailCollectionStatus; } - /** - * 创建人 - * @return - */ - private String detailCollectionFounder; - - /** - * 创建时间 - * @return - */ - private Date detailCollectionFounderTime; public String getDetailCollectionFounder() { return detailCollectionFounder; @@ -99,17 +113,7 @@ public class DetailCollection { this.detailCollectionModificatorTime = detailCollectionModificatorTime; } - /** - * 修改人 - * @return - */ - private String detailCollectionModificator; - /** - * 修改时间 - * @return - */ - private Date detailCollectionModificatorTime; public Long getDetailCollectionId() { return detailCollectionId; From b7457a4b85b0a687d2b7d88ea1abce78a636132f Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Mon, 30 Oct 2023 19:13:31 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitypatients/DetailedReview.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java b/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java index 35196cd..e6679cf 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java @@ -43,6 +43,12 @@ public class DetailedReview { */ private String name; + + /** + * 状态1：未采纳；状态2：采纳 + */ + private Integer detailedReviewStatus; + /** *创建人 */ @@ -163,4 +169,30 @@ public class DetailedReview { public void setName(String name) { this.name = name; } + + public Integer getDetailedReviewStatus() { + return detailedReviewStatus; + } + + public void setDetailedReviewStatus(Integer detailedReviewStatus) { + this.detailedReviewStatus = detailedReviewStatus; + } + + @Override + public String toString() { + return "DetailedReview{" + + "detailedReviewId=" + detailedReviewId + + ", detailsPatientCircleId=" + detailsPatientCircleId + + ", commentTime=" + commentTime + + ", reviewerId=" + reviewerId + + ", numberLikes=" + numberLikes + + ", tauntCount=" + tauntCount + + ", name='" + name + '\'' + + ", detailedReviewStatus=" + detailedReviewStatus + + ", detailedReviewFounder='" + detailedReviewFounder + '\'' + + ", detailedReviewFounderTime=" + detailedReviewFounderTime + + ", detailedReviewModificator='" + detailedReviewModificator + '\'' + + ", detailedReviewModificatorTime=" + detailedReviewModificatorTime + + '}'; + } } From af0d48cf60651a1014d7c38f54f015f13499ee1a Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Mon, 30 Oct 2023 19:28:14 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/four/common/duck/communitypatients/DetailedReview.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java b/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java index e6679cf..62c5c77 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java @@ -174,7 +174,7 @@ public class DetailedReview { return detailedReviewStatus; } - public void setDetailedReviewStatus(Integer detailedReviewStatus) { + public void setDetailedReviewStatus(Integer detailedReviewStatus) { this.detailedReviewStatus = detailedReviewStatus; } From 31c93f2fd32162f4821c30eafad970faaeda0f37 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Mon, 30 Oct 2023 19:49:04 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitypatients/DetailedReview.java | 10 ++-- .../DetailsPatientCircleSymptomsDrugs.java | 56 +++++++++++++++++++ 2 files changed, 61 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java b/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java index 62c5c77..117bb9a 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java @@ -41,7 +41,7 @@ public class DetailedReview { * 评论内容 * @return */ - private String name; + private String detailedReviewName; /** @@ -108,7 +108,7 @@ public class DetailedReview { this.reviewerId = reviewerId; this.numberLikes = numberLikes; this.tauntCount = tauntCount; - this.name = name; + this.detailedReviewName = detailedReviewName; } public Long getDetailedReviewId() { @@ -163,11 +163,11 @@ public class DetailedReview { } public String getName() { - return name; + return detailedReviewName; } public void setName(String name) { - this.name = name; + this.detailedReviewName = name; } public Integer getDetailedReviewStatus() { @@ -187,7 +187,7 @@ public class DetailedReview { ", reviewerId=" + reviewerId + ", numberLikes=" + numberLikes + ", tauntCount=" + tauntCount + - ", name='" + name + '\'' + + ", name='" + detailedReviewName + '\'' + ", detailedReviewStatus=" + detailedReviewStatus + ", detailedReviewFounder='" + detailedReviewFounder + '\'' + ", detailedReviewFounderTime=" + detailedReviewFounderTime + diff --git a/src/main/java/com/four/common/duck/response/DetailsPatientCircleSymptomsDrugs.java b/src/main/java/com/four/common/duck/response/DetailsPatientCircleSymptomsDrugs.java index f1d8e2b..78501fd 100644 --- a/src/main/java/com/four/common/duck/response/DetailsPatientCircleSymptomsDrugs.java +++ b/src/main/java/com/four/common/duck/response/DetailsPatientCircleSymptomsDrugs.java @@ -180,5 +180,61 @@ public class DetailsPatientCircleSymptomsDrugs { * 余额 */ private String invitationCode; + + //----------------------------------------- + //----------------------------------------- + //----------------------------------------- + /** + * 详情表中的评论id + */ + private Long detailedReviewId; + + + /** + * 评论时间 + */ + private Date commentTime; + + /** + * 评论人id + */ + private Long reviewerId; + + /** + * 点赞次数 + */ + private Long numberLikes; + + /** + * 嘲讽次数 + */ + private Long tauntCount; + + /*** + * 评论内容 + * @return + */ + private String detailedReviewName; + + + /** + * 状态1：未采纳；状态2：采纳 + */ + private Integer detailedReviewStatus; + + /** + *创建人 + */ + private String detailedReviewFounder; + + /** + *创建时间 + */ + private Date detailedReviewFounderTime; + + /** + * 修改人 + */ + private String detailedReviewModificator; }