diff --git a/xinelu-common/src/main/java/com/xinelu/common/enums/OrderSourceEnum.java b/xinelu-common/src/main/java/com/xinelu/common/enums/OrderSourceEnum.java
new file mode 100644
index 0000000..ea7ae23
--- /dev/null
+++ b/xinelu-common/src/main/java/com/xinelu/common/enums/OrderSourceEnum.java
@@ -0,0 +1,29 @@
+package com.xinelu.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Description 订单来源枚举
+ * @Author 纪寒
+ * @Date 2023-10-16
+ */
+@Getter
+public enum OrderSourceEnum {
+
+ /**
+ * 泉医模块
+ */
+ SPRING_DOCTOR("SPRING_DOCTOR"),
+
+ /**
+ * 家医模块
+ */
+ FAMILY_DOCTOR("FAMILY_DOCTOR"),
+ ;
+
+ final private String info;
+
+ OrderSourceEnum(String info) {
+ this.info = info;
+ }
+}
diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/goodsOrder/GoodsOrder.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/goodsOrder/GoodsOrder.java
index f6568e8..3d06ecc 100644
--- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/goodsOrder/GoodsOrder.java
+++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/goodsOrder/GoodsOrder.java
@@ -179,6 +179,11 @@ public class GoodsOrder extends BaseDomain implements Serializable {
*/
private String hospitalPersonName;
+ /**
+ * 专家咨询信息表id
+ */
+ private Long consultationInfoId;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/orderevaluateinfo/OrderEvaluateInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/orderevaluateinfo/OrderEvaluateInfo.java
index 988f1ff..f50aeaa 100644
--- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/orderevaluateinfo/OrderEvaluateInfo.java
+++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/orderevaluateinfo/OrderEvaluateInfo.java
@@ -96,6 +96,10 @@ public class OrderEvaluateInfo extends BaseDomain implements Serializable {
@NotNull(message = "请选择评分", groups = {Update.class})
private Integer compositeScore;
+ /**
+ * 订单来源,泉医模块:SPRING_DOCTOR,家医模块:FAMILY_DOCTOR
+ */
+ private String orderSource;
@Override
public String toString() {
diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
index 860ef8c..7999fe7 100644
--- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
+++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
@@ -19,6 +19,7 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDate;
+import java.time.LocalDateTime;
/**
* 被护理人基本信息对象 patient_info
@@ -247,6 +248,23 @@ public class PatientInfo extends BaseDomain implements Serializable {
*/
private String disease;
+ /**
+ * 绑定城市(1:德州 2:东营)
+ */
+ private String cityCode;
+
+ /**
+ * 小程序绑定时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime bindingTime;
+
+ /**
+ * 当前是否选中(0: 否 1:是)
+ */
+ private String isChecked;
+
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -275,6 +293,9 @@ public class PatientInfo extends BaseDomain implements Serializable {
.append("loginFlag", getLoginFlag())
.append("primaryAccountFlag", getPrimaryAccountFlag())
.append("delFlag", getDelFlag())
+ .append("cityCode", getCityCode())
+ .append("bindingTime", getBindingTime())
+ .append("isChecked", getIsChecked())
.toString();
}
}
diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsOrder/GoodsOrderMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsOrder/GoodsOrderMapper.xml
index 75cfa51..1e4821c 100644
--- a/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsOrder/GoodsOrderMapper.xml
+++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsOrder/GoodsOrderMapper.xml
@@ -34,6 +34,7 @@
+
@@ -117,7 +118,8 @@
original_total_price,
health_consultation_content,
health_appoint_date,
- hospital_person_name
+ hospital_person_name,
+ consultation_info_id
from goods_order
@@ -273,6 +275,8 @@
hospital_person_name,
+ consultation_info_id,
+
#{nurseStationId},
@@ -331,6 +335,8 @@
#{hospitalPersonName},
+ #{consultationInfoId},
+
@@ -421,6 +427,9 @@
hospital_person_name =
#{hospitalPersonName},
+ consultation_info_id =
+ #{consultationInfoId},
+
where id = #{id}
diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml
index 1932e78..6ff9497 100644
--- a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml
+++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml
@@ -22,6 +22,8 @@
+
+
@@ -71,6 +73,8 @@
person_introduce,
person_sort,
person_picture_url,
+ person_account,
+ person_password,
create_by,
create_time,
update_by,
@@ -238,6 +242,10 @@
person_picture_url,
+ person_account,
+
+ person_password,
+
create_by,
create_time,
@@ -270,6 +278,10 @@
#{personPictureUrl},
+ #{personAccount},
+
+ #{personPassword},
+
#{createBy},
#{createTime},
@@ -316,6 +328,12 @@
person_picture_url =
#{personPictureUrl},
+ person_account =
+ #{personAccount},
+
+ person_password =
+ #{personPassword},
+
create_by =
#{createBy},
@@ -367,6 +385,12 @@
person_picture_url =
#{personPictureUrl},
+ person_account =
+ #{personAccount},
+
+ person_password =
+ #{personPassword},
+
create_by =
#{createBy},
diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/orderevaluateinfo/OrderEvaluateInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/orderevaluateinfo/OrderEvaluateInfoMapper.xml
index 2f53988..430b20e 100644
--- a/xinelu-nurse-manage/src/main/resources/mapper/manage/orderevaluateinfo/OrderEvaluateInfoMapper.xml
+++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/orderevaluateinfo/OrderEvaluateInfoMapper.xml
@@ -14,6 +14,7 @@
+
@@ -30,6 +31,7 @@
evaluate_channel,
evaluate_satisfaction,
composite_score,
+ order_source,
create_by,
create_time,
update_by,
@@ -100,6 +102,8 @@
composite_score,
+ order_source,
+
create_by,
create_time,
@@ -128,6 +132,8 @@
#{compositeScore},
+ #{orderSource},
+
#{createBy},
#{createTime},
@@ -166,6 +172,9 @@
composite_score =
#{compositeScore},
+ order_source =
+ #{orderSource},
+
create_by =
#{createBy},
diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
index dbc2589..dc50793 100644
--- a/xinelu-nurse-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
+++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
@@ -42,6 +42,10 @@
+
+
+
+
@@ -77,7 +81,11 @@
del_flag,
personal_wechat_code_url,
disabling_condition,
- disabling_reason
+ disabling_reason,
+ disease,
+ city_code,
+ binding_time,
+ is_checked
from patient_info
@@ -289,6 +297,14 @@
disabling_reason,
+ disease,
+
+ city_code,
+
+ binding_time,
+
+ is_checked,
+
#{communityCode},
@@ -361,6 +377,14 @@
#{disablingReason},
+ #{disease},
+
+ #{cityCode},
+
+ #{bindingTime},
+
+ #{isChecked},
+
@@ -472,6 +496,18 @@
disabling_reason =
#{disablingReason},
+ disease =
+ #{disease},
+
+ city_code =
+ #{cityCode},
+
+ binding_time =
+ #{bindingTime},
+
+ is_checked =
+ #{isChecked},
+
where id = #{id}