fix

.gradle/buildOutputCleanup/cache.properties

+#Wed Sep 13 10:34:15 CST 2023
+gradle.version=8.2.1

build.gradle

@@ -60,6 +60,7 @@ dependencies {
 	implementation "cn.dev33:sa-token-spring-boot3-starter:${satokenVersion}"
 	implementation "cn.dev33:sa-token-jwt:${satokenVersion}"
 	implementation "com.google.guava:guava:${guavaVersion}"
+	implementation 'com.github.binarywang:wx-java:4.5.5.B'
 
 	annotationProcessor "org.projectlombok:lombok:${lombokPluginVersion}"
 	annotationProcessor "org.mapstruct:mapstruct-processor:${mapStructVersion}"

src/main/java/com/xwd/hospital/server/domain/DoctorFamilyAddressInfo.java

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
-import com.xwd.hospital.server.domain.OrInfo;
+import com.xwd.hospital.server.domain.DoctorInfo;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -48,7 +48,7 @@ public class DoctorFamilyAddressInfo extends BaseDomain {
      */
     @Schema(description = "医生Id")
     @TableField(exist = false)
-    private OrInfo doctor;
+    private DoctorInfo doctor;
     /**
      * 姓名
      */

src/main/java/com/xwd/hospital/server/domain/DoctorServiceInfo.java

@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.xwd.hospital.server.base.BaseDomain;
 import com.xwd.hospital.server.enums.DoctorServiceEnum;
 import com.xwd.hospital.server.enums.YesNoEnum;
-import com.xwd.hospital.server.domain.OrInfo;
+import com.xwd.hospital.server.domain.DoctorInfo;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -50,7 +50,7 @@ public class DoctorServiceInfo extends BaseDomain {
      */
     @Schema(description = "医生Id")
     @TableField(exist = false)
-    private OrInfo doctor;
+    private DoctorInfo doctor;
     /**
      * 服务名称
      */

src/main/java/com/xwd/hospital/server/domain/FamilyDoctor.java

@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.xwd.hospital.server.base.BaseDomain;
 import com.xwd.hospital.server.enums.SexTypeEnum;
 import com.xwd.hospital.server.enums.AuditStateEnum;
-import com.xwd.hospital.server.domain._nfo;
+import com.xwd.hospital.server.domain.UserInfo;
 import com.xwd.hospital.server.domain.OrInfo;
 
 @Data
@@ -51,7 +51,7 @@ public class FamilyDoctor extends BaseDomain {
      */
     @Schema(description = "用户Id")
     @TableField(exist = false)
-    private _nfo userInfo;
+    private UserInfo userInfo;
     /**
      * 姓名
      */

src/main/java/com/xwd/hospital/server/domain/MedicalQualifications.java

@@ -23,9 +23,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.xwd.hospital.server.base.BaseDomain;
 import com.xwd.hospital.server.enums.DoctorTitleEnum;
 import com.xwd.hospital.server.enums.AuditStateEnum;
-import com.xwd.hospital.server.domain.OrInfo;
-import com.xwd.hospital.server.domain.ItalInfo;
-import com.xwd.hospital.server.domain.RtmentInfo;
+import com.xwd.hospital.server.domain.DoctorInfo;
+import com.xwd.hospital.server.domain.HospitalInfo;
+import com.xwd.hospital.server.domain.DepartmentInfo;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -52,7 +52,7 @@ public class MedicalQualifications extends BaseDomain {
      */
     @Schema(description = "医生Id")
     @TableField(exist = false)
-    private OrInfo doctor;
+    private DoctorInfo doctor;
     /**
      * 医院Id
      */
@@ -64,7 +64,7 @@ public class MedicalQualifications extends BaseDomain {
      */
     @Schema(description = "医院Id")
     @TableField(exist = false)
-    private ItalInfo hospital;
+    private HospitalInfo hospital;
     /**
      * 科室Id
      */
@@ -76,7 +76,7 @@ public class MedicalQualifications extends BaseDomain {
      */
     @Schema(description = "科室Id")
     @TableField(exist = false)
-    private RtmentInfo department;
+    private DepartmentInfo department;
     /**
      * 职称
      */

src/main/java/com/xwd/hospital/server/domain/MedicalQualificationsPicture.java

@@ -21,8 +21,8 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
-import com.xwd.hospital.server.domain.OrInfo;
-import com.xwd.hospital.server.domain.CalQualifications;
+import com.xwd.hospital.server.domain.DoctorInfo;
+import com.xwd.hospital.server.domain.MedicalQualifications;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -49,7 +49,7 @@ public class MedicalQualificationsPicture extends BaseDomain {
      */
     @Schema(description = "医生Id")
     @TableField(exist = false)
-    private OrInfo doctor;
+    private DoctorInfo doctor;
     /**
      * 医生医疗资质Id
      */
@@ -61,7 +61,7 @@ public class MedicalQualificationsPicture extends BaseDomain {
      */
     @Schema(description = "医生医疗资质Id")
     @TableField(exist = false)
-    private CalQualifications medicalQualification;
+    private MedicalQualifications medicalQualification;
     /**
      * 医疗资格证件图片
      */

src/main/java/com/xwd/hospital/server/domain/MedicalReportPicture.java

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
-import com.xwd.hospital.server.domain.CalReport;
+import com.xwd.hospital.server.domain.MedicalReport;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -48,7 +48,7 @@ public class MedicalReportPicture extends BaseDomain {
      */
     @Schema(description = "影像报告Id")
     @TableField(exist = false)
-    private CalReport medicalReport;
+    private MedicalReport medicalReport;
     /**
      * CT影像图片
      */

src/main/java/com/xwd/hospital/server/domain/OnlineInquiryOrderRecord.java

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
-import com.xwd.hospital.server.domain.R;
+import com.xwd.hospital.server.domain.Order;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -48,7 +48,7 @@ public class OnlineInquiryOrderRecord extends BaseDomain {
      */
     @Schema(description = "订单号")
     @TableField(exist = false)
-    private R orderNo;
+    private Order orderNo;
     /**
      * 在线问诊开始时间
      */

src/main/java/com/xwd/hospital/server/domain/Order.java

@@ -25,10 +25,10 @@ import com.xwd.hospital.server.enums.OrderStateEnum;
 import com.xwd.hospital.server.enums.OrderTypeEnum;
 import com.xwd.hospital.server.enums.SexTypeEnum;
 import com.xwd.hospital.server.enums.YesNoEnum;
-import com.xwd.hospital.server.domain._nfo;
-import com.xwd.hospital.server.domain.OrInfo;
-import com.xwd.hospital.server.domain.EntInfo;
-import com.xwd.hospital.server.domain._ouponInfo;
+import com.xwd.hospital.server.domain.UserInfo;
+import com.xwd.hospital.server.domain.DoctorInfo;
+import com.xwd.hospital.server.domain.PatientInfo;
+import com.xwd.hospital.server.domain.UserCouponInfo;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -55,7 +55,7 @@ public class Order extends BaseDomain {
      */
     @Schema(description = "用户Id")
     @TableField(exist = false)
-    private _nfo userInfo;
+    private UserInfo userInfo;
     /**
      * 医生Id
      */
@@ -67,7 +67,7 @@ public class Order extends BaseDomain {
      */
     @Schema(description = "医生Id")
     @TableField(exist = false)
-    private OrInfo doctor;
+    private DoctorInfo doctor;
     /**
      * 就诊人Id
      */
@@ -79,7 +79,7 @@ public class Order extends BaseDomain {
      */
     @Schema(description = "就诊人Id")
     @TableField(exist = false)
-    private EntInfo patient;
+    private PatientInfo patient;
     /**
      * 订单号
      */
@@ -127,7 +127,7 @@ public class Order extends BaseDomain {
      */
     @Schema(description = "优惠券Id")
     @TableField(exist = false)
-    private _ouponInfo userCoupon;
+    private UserCouponInfo userCoupon;
     /**
      * 预约日期
      */

src/main/java/com/xwd/hospital/server/domain/OrderAppraise.java

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
-import com.xwd.hospital.server.domain.R;
+import com.xwd.hospital.server.domain.Order;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -48,7 +48,7 @@ public class OrderAppraise extends BaseDomain {
      */
     @Schema(description = "订单号")
     @TableField(exist = false)
-    private R orderNo;
+    private Order orderNo;
     /**
      * 订单评分
      */

src/main/java/com/xwd/hospital/server/domain/OrderPay.java

@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.xwd.hospital.server.base.BaseDomain;
 import com.xwd.hospital.server.enums.PayStateEnum;
 import com.xwd.hospital.server.enums.PayPathEnum;
-import com.xwd.hospital.server.domain.R;
+import com.xwd.hospital.server.domain.Order;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -50,7 +50,7 @@ public class OrderPay extends BaseDomain {
      */
     @Schema(description = "订单号")
     @TableField(exist = false)
-    private R orderNo;
+    private Order orderNo;
     /**
      * 支付流水号
      */

src/main/java/com/xwd/hospital/server/domain/OrderPicture.java

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
-import com.xwd.hospital.server.domain.R;
+import com.xwd.hospital.server.domain.Order;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -48,7 +48,7 @@ public class OrderPicture extends BaseDomain {
      */
     @Schema(description = "订单号")
     @TableField(exist = false)
-    private R orderNo;
+    private Order orderNo;
     /**
      * 患者自述相关图片
      */

src/main/java/com/xwd/hospital/server/domain/OrderRefund.java

@@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
 import com.xwd.hospital.server.enums.RefundStateEnum;
-import com.xwd.hospital.server.domain.R;
-import com.xwd.hospital.server.domain.RPay;
+import com.xwd.hospital.server.domain.Order;
+import com.xwd.hospital.server.domain.OrderPay;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -50,7 +50,7 @@ public class OrderRefund extends BaseDomain {
      */
     @Schema(description = "订单号")
     @TableField(exist = false)
-    private R orderNo;
+    private Order orderNo;
     /**
      * 订单支付id
      */
@@ -62,7 +62,7 @@ public class OrderRefund extends BaseDomain {
      */
     @Schema(description = "订单支付id")
     @TableField(exist = false)
-    private RPay orderPay;
+    private OrderPay orderPay;
     /**
      * 退款流水号
      */

src/main/java/com/xwd/hospital/server/domain/PatientInfo.java

@@ -24,7 +24,7 @@ import com.xwd.hospital.server.base.BaseDomain;
 import com.xwd.hospital.server.enums.PatientRelationEnum;
 import com.xwd.hospital.server.enums.SexTypeEnum;
 import com.xwd.hospital.server.enums.YesNoEnum;
-import com.xwd.hospital.server.domain._nfo;
+import com.xwd.hospital.server.domain.UserInfo;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -51,7 +51,7 @@ public class PatientInfo extends BaseDomain {
      */
     @Schema(description = "用户Id")
     @TableField(exist = false)
-    private _nfo userInfo;
+    private UserInfo userInfo;
     /**
      * 就诊人关系
      */

src/main/java/com/xwd/hospital/server/domain/PatientPrescriptionInfo.java

@@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
 import com.xwd.hospital.server.enums.YesNoEnum;
-import com.xwd.hospital.server.domain.EntInfo;
+import com.xwd.hospital.server.domain.PatientInfo;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -49,7 +49,7 @@ public class PatientPrescriptionInfo extends BaseDomain {
      */
     @Schema(description = "就诊人Id")
     @TableField(exist = false)
-    private EntInfo patient;
+    private PatientInfo patient;
     /**
      * 医院名称
      */

src/main/java/com/xwd/hospital/server/domain/PatientPrescriptionInfoPicture.java

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
-import com.xwd.hospital.server.domain.EntPrescriptionInfo;
+import com.xwd.hospital.server.domain.PatientPrescriptionInfo;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -48,7 +48,7 @@ public class PatientPrescriptionInfoPicture extends BaseDomain {
      */
     @Schema(description = "处方信息Id")
     @TableField(exist = false)
-    private EntPrescriptionInfo patientPrescriptionInfo;
+    private PatientPrescriptionInfo patientPrescriptionInfo;
     /**
      * 处方图片
      */

src/main/java/com/xwd/hospital/server/domain/PhoneOrderRecord.java

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
-import com.xwd.hospital.server.domain.R;
+import com.xwd.hospital.server.domain.Order;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -48,7 +48,7 @@ public class PhoneOrderRecord extends BaseDomain {
      */
     @Schema(description = "订单号")
     @TableField(exist = false)
-    private R orderNo;
+    private Order orderNo;
     /**
      * 电话咨询开始时间
      */

src/main/java/com/xwd/hospital/server/domain/PrescriptionOrderRecord.java

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
-import com.xwd.hospital.server.domain.R;
+import com.xwd.hospital.server.domain.Order;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -48,7 +48,7 @@ public class PrescriptionOrderRecord extends BaseDomain {
      */
     @Schema(description = "订单号")
     @TableField(exist = false)
-    private R orderNo;
+    private Order orderNo;
     /**
      * 处方说明
      */

src/main/java/com/xwd/hospital/server/domain/UserAddressInfo.java

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
-import com.xwd.hospital.server.domain._nfo;
+import com.xwd.hospital.server.domain.UserInfo;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -48,7 +48,7 @@ public class UserAddressInfo extends BaseDomain {
      */
     @Schema(description = "用户Id")
     @TableField(exist = false)
-    private _nfo userInfo;
+    private UserInfo userInfo;
     /**
      * 姓名
      */

src/main/java/com/xwd/hospital/server/domain/UserAttentionInfo.java

@@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.xwd.hospital.server.base.BaseDomain;
 import com.xwd.hospital.server.enums.YesNoEnum;
-import com.xwd.hospital.server.domain._nfo;
-import com.xwd.hospital.server.domain.OrInfo;
+import com.xwd.hospital.server.domain.UserInfo;
+import com.xwd.hospital.server.domain.DoctorInfo;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -50,7 +50,7 @@ public class UserAttentionInfo extends BaseDomain {
      */
     @Schema(description = "用户Id")
     @TableField(exist = false)
-    private _nfo userInfo;
+    private UserInfo userInfo;
     /**
      * 医生Id
      */
@@ -62,7 +62,7 @@ public class UserAttentionInfo extends BaseDomain {
      */
     @Schema(description = "医生Id")
     @TableField(exist = false)
-    private OrInfo doctor;
+    private DoctorInfo doctor;
     /**
      * 是否删除
      */

src/main/java/com/xwd/hospital/server/domain/UserCouponInfo.java

@@ -23,8 +23,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.xwd.hospital.server.base.BaseDomain;
 import com.xwd.hospital.server.enums.CouponTypeEnum;
 import com.xwd.hospital.server.enums.YesNoEnum;
-import com.xwd.hospital.server.domain._nfo;
-import com.xwd.hospital.server.domain.OnInfo;
+import com.xwd.hospital.server.domain.UserInfo;
+import com.xwd.hospital.server.domain.CouponInfo;
 
 @Data
 @Builder(builderMethodName = "newBuilder")
@@ -51,7 +51,7 @@ public class UserCouponInfo extends BaseDomain {
      */
     @Schema(description = "用户Id")
     @TableField(exist = false)
-    private _nfo userInfo;
+    private UserInfo userInfo;
     /**
      * 优惠券Id
      */
@@ -63,7 +63,7 @@ public class UserCouponInfo extends BaseDomain {
      */
     @Schema(description = "优惠券Id")
     @TableField(exist = false)
-    private OnInfo coupon;
+    private CouponInfo coupon;
     /**
      * 优惠券名称
      */

src/main/resources/mappers/base/DoctorFamilyAddressInfoBaseMapper.xml

@@ -16,8 +16,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.DoctorFamilyAddressInfo" extends="BaseResultMap">
-        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.OrInfo"
-                     select="com.xwd.hospital.server.repository.OrInfoMapper.selectById" />
+        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.DoctorInfo"
+                     select="com.xwd.hospital.server.repository.DoctorInfoMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `doctor_id`, `name`, `phone_number`, `province`, `city`, `district`, `detail_address`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/DoctorServiceInfoBaseMapper.xml

@@ -16,8 +16,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.DoctorServiceInfo" extends="BaseResultMap">
-        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.OrInfo"
-                     select="com.xwd.hospital.server.repository.OrInfoMapper.selectById" />
+        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.DoctorInfo"
+                     select="com.xwd.hospital.server.repository.DoctorInfoMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `doctor_id`, `service_name`, `service_price`, `service_state`, `service_start_time`, `service_end_time`, `service_phone_number`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/FamilyDoctorBaseMapper.xml

@@ -18,8 +18,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.FamilyDoctor" extends="BaseResultMap">
-        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain._nfo"
-                     select="com.xwd.hospital.server.repository._nfoMapper.selectById" />
+        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain.UserInfo"
+                     select="com.xwd.hospital.server.repository.UserInfoMapper.selectById" />
         <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.OrInfo"
                      select="com.xwd.hospital.server.repository.OrInfoMapper.selectById" />
     </resultMap>

src/main/resources/mappers/base/MedicalQualificationsBaseMapper.xml

@@ -15,12 +15,12 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.MedicalQualifications" extends="BaseResultMap">
-        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.OrInfo"
-                     select="com.xwd.hospital.server.repository.OrInfoMapper.selectById" />
-        <association column="hospital_id" property="hospital" javaType="com.xwd.hospital.server.domain.ItalInfo"
-                     select="com.xwd.hospital.server.repository.ItalInfoMapper.selectById" />
-        <association column="department_id" property="department" javaType="com.xwd.hospital.server.domain.RtmentInfo"
-                     select="com.xwd.hospital.server.repository.RtmentInfoMapper.selectById" />
+        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.DoctorInfo"
+                     select="com.xwd.hospital.server.repository.DoctorInfoMapper.selectById" />
+        <association column="hospital_id" property="hospital" javaType="com.xwd.hospital.server.domain.HospitalInfo"
+                     select="com.xwd.hospital.server.repository.HospitalInfoMapper.selectById" />
+        <association column="department_id" property="department" javaType="com.xwd.hospital.server.domain.DepartmentInfo"
+                     select="com.xwd.hospital.server.repository.DepartmentInfoMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `doctor_id`, `hospital_id`, `department_id`, `title`, `audit_state`, `certificate_picture`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/MedicalQualificationsPictureBaseMapper.xml

@@ -12,10 +12,10 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.MedicalQualificationsPicture" extends="BaseResultMap">
-        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.OrInfo"
-                     select="com.xwd.hospital.server.repository.OrInfoMapper.selectById" />
-        <association column="medical_qualification_id" property="medicalQualification" javaType="com.xwd.hospital.server.domain.CalQualifications"
-                     select="com.xwd.hospital.server.repository.CalQualificationsMapper.selectById" />
+        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.DoctorInfo"
+                     select="com.xwd.hospital.server.repository.DoctorInfoMapper.selectById" />
+        <association column="medical_qualification_id" property="medicalQualification" javaType="com.xwd.hospital.server.domain.MedicalQualifications"
+                     select="com.xwd.hospital.server.repository.MedicalQualificationsMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `doctor_id`, `medical_qualification_id`, `certificate_picture`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/MedicalReportPictureBaseMapper.xml

@@ -11,8 +11,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.MedicalReportPicture" extends="BaseResultMap">
-        <association column="medical_report_id" property="medicalReport" javaType="com.xwd.hospital.server.domain.CalReport"
-                     select="com.xwd.hospital.server.repository.CalReportMapper.selectById" />
+        <association column="medical_report_id" property="medicalReport" javaType="com.xwd.hospital.server.domain.MedicalReport"
+                     select="com.xwd.hospital.server.repository.MedicalReportMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `medical_report_id`, `report_picture`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/OnlineInquiryOrderRecordBaseMapper.xml

@@ -11,8 +11,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.OnlineInquiryOrderRecord" extends="BaseResultMap">
-        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.R"
-                     select="com.xwd.hospital.server.repository.RMapper.selectById" />
+        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.Order"
+                     select="com.xwd.hospital.server.repository.OrderMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `order_no`, `inquiry_time`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/OrderAppraiseBaseMapper.xml

@@ -12,8 +12,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.OrderAppraise" extends="BaseResultMap">
-        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.R"
-                     select="com.xwd.hospital.server.repository.RMapper.selectById" />
+        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.Order"
+                     select="com.xwd.hospital.server.repository.OrderMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `order_no`, `order_score`, `order_evaluation`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/OrderBaseMapper.xml

@@ -36,14 +36,14 @@
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.Order" extends="BaseResultMap">
         <result column="patient_self_introduce" jdbcType="VARCHAR" property="patientSelfIntroduce" />
-        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain._nfo"
-                     select="com.xwd.hospital.server.repository._nfoMapper.selectById" />
-        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.OrInfo"
-                     select="com.xwd.hospital.server.repository.OrInfoMapper.selectById" />
-        <association column="patient_id" property="patient" javaType="com.xwd.hospital.server.domain.EntInfo"
-                     select="com.xwd.hospital.server.repository.EntInfoMapper.selectById" />
-        <association column="user_coupon_id" property="userCoupon" javaType="com.xwd.hospital.server.domain._ouponInfo"
-                     select="com.xwd.hospital.server.repository._ouponInfoMapper.selectById" />
+        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain.UserInfo"
+                     select="com.xwd.hospital.server.repository.UserInfoMapper.selectById" />
+        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.DoctorInfo"
+                     select="com.xwd.hospital.server.repository.DoctorInfoMapper.selectById" />
+        <association column="patient_id" property="patient" javaType="com.xwd.hospital.server.domain.PatientInfo"
+                     select="com.xwd.hospital.server.repository.PatientInfoMapper.selectById" />
+        <association column="user_coupon_id" property="userCoupon" javaType="com.xwd.hospital.server.domain.UserCouponInfo"
+                     select="com.xwd.hospital.server.repository.UserCouponInfoMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `user_info_id`, `doctor_id`, `patient_id`, `order_no`, `order_state`, `order_type`, `order_price`, `order_discount`, `order_actual_pay`, `user_coupon_id`, `appointment_date`, `service_start_time`, `service_end_time`, `hospital_name`, `department_name`, `doctor_name`, `patient_name`, `patient_sex`, `patient_id_no`, `patient_phone_number`, `patient_born_date`, `cancel_reason`, `pay_time`, `confirm_time`, `complete_time`, `delete_status`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/OrderPayBaseMapper.xml

@@ -16,8 +16,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.OrderPay" extends="BaseResultMap">
-        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.R"
-                     select="com.xwd.hospital.server.repository.RMapper.selectById" />
+        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.Order"
+                     select="com.xwd.hospital.server.repository.OrderMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `order_no`, `pay_no`, `pay_state`, `pay_path`, `pay_money`, `pay_time`, `complete_time`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/OrderPictureBaseMapper.xml

@@ -11,8 +11,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.OrderPicture" extends="BaseResultMap">
-        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.R"
-                     select="com.xwd.hospital.server.repository.RMapper.selectById" />
+        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.Order"
+                     select="com.xwd.hospital.server.repository.OrderMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `order_no`, `patient_self_image`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/OrderRefundBaseMapper.xml

@@ -16,10 +16,10 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.OrderRefund" extends="BaseResultMap">
-        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.R"
-                     select="com.xwd.hospital.server.repository.RMapper.selectById" />
-        <association column="order_pay_id" property="orderPay" javaType="com.xwd.hospital.server.domain.RPay"
-                     select="com.xwd.hospital.server.repository.RPayMapper.selectById" />
+        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.Order"
+                     select="com.xwd.hospital.server.repository.OrderMapper.selectById" />
+        <association column="order_pay_id" property="orderPay" javaType="com.xwd.hospital.server.domain.OrderPay"
+                     select="com.xwd.hospital.server.repository.OrderPayMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `order_no`, `order_pay_id`, `refund_no`, `refund_state`, `refund_money`, `refund_time`, `complete_time`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/PatientInfoBaseMapper.xml

@@ -20,8 +20,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.PatientInfo" extends="BaseResultMap">
-        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain._nfo"
-                     select="com.xwd.hospital.server.repository._nfoMapper.selectById" />
+        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain.UserInfo"
+                     select="com.xwd.hospital.server.repository.UserInfoMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `user_info_id`, `relation`, `patient_name`, `sex`, `id_no`, `phone_number`, `born_date`, `guardian_state`, `guardian_name`, `guardian_identification_number`, `guardian_phone_number`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/PatientPrescriptionInfoBaseMapper.xml

@@ -15,8 +15,8 @@
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.PatientPrescriptionInfo" extends="BaseResultMap">
         <result column="prescription_introduce" jdbcType="VARCHAR" property="prescriptionIntroduce" />
-        <association column="patient_id" property="patient" javaType="com.xwd.hospital.server.domain.EntInfo"
-                     select="com.xwd.hospital.server.repository.EntInfoMapper.selectById" />
+        <association column="patient_id" property="patient" javaType="com.xwd.hospital.server.domain.PatientInfo"
+                     select="com.xwd.hospital.server.repository.PatientInfoMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `patient_id`, `hospital_name`, `department_name`, `prescription_time`, `delete_status`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/PatientPrescriptionInfoPictureBaseMapper.xml

@@ -11,8 +11,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.PatientPrescriptionInfoPicture" extends="BaseResultMap">
-        <association column="patient_prescription_info_id" property="patientPrescriptionInfo" javaType="com.xwd.hospital.server.domain.EntPrescriptionInfo"
-                     select="com.xwd.hospital.server.repository.EntPrescriptionInfoMapper.selectById" />
+        <association column="patient_prescription_info_id" property="patientPrescriptionInfo" javaType="com.xwd.hospital.server.domain.PatientPrescriptionInfo"
+                     select="com.xwd.hospital.server.repository.PatientPrescriptionInfoMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `patient_prescription_info_id`, `prescription_picture`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/PhoneOrderRecordBaseMapper.xml

@@ -11,8 +11,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.PhoneOrderRecord" extends="BaseResultMap">
-        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.R"
-                     select="com.xwd.hospital.server.repository.RMapper.selectById" />
+        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.Order"
+                     select="com.xwd.hospital.server.repository.OrderMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `order_no`, `phone_contact_time`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/PrescriptionOrderRecordBaseMapper.xml

@@ -12,8 +12,8 @@
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.PrescriptionOrderRecord" extends="BaseResultMap">
         <result column="prescription_introduce" jdbcType="VARCHAR" property="prescriptionIntroduce" />
-        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.R"
-                     select="com.xwd.hospital.server.repository.RMapper.selectById" />
+        <association column="order_no" property="order" javaType="com.xwd.hospital.server.domain.Order"
+                     select="com.xwd.hospital.server.repository.OrderMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `order_no`, `prescription_image`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/UserAddressInfoBaseMapper.xml

@@ -16,8 +16,8 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.UserAddressInfo" extends="BaseResultMap">
-        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain._nfo"
-                     select="com.xwd.hospital.server.repository._nfoMapper.selectById" />
+        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain.UserInfo"
+                     select="com.xwd.hospital.server.repository.UserInfoMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `user_info_id`, `name`, `phone_number`, `province`, `city`, `district`, `detail_address`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/UserAttentionInfoBaseMapper.xml

@@ -12,10 +12,10 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.UserAttentionInfo" extends="BaseResultMap">
-        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain._nfo"
-                     select="com.xwd.hospital.server.repository._nfoMapper.selectById" />
-        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.OrInfo"
-                     select="com.xwd.hospital.server.repository.OrInfoMapper.selectById" />
+        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain.UserInfo"
+                     select="com.xwd.hospital.server.repository.UserInfoMapper.selectById" />
+        <association column="doctor_id" property="doctor" javaType="com.xwd.hospital.server.domain.DoctorInfo"
+                     select="com.xwd.hospital.server.repository.DoctorInfoMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `user_info_id`, `doctor_id`, `delete_status`, `editor_id`, `editor_name`, `create_time`, `update_time`

src/main/resources/mappers/base/UserCouponInfoBaseMapper.xml

@@ -17,10 +17,10 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     </resultMap>
     <resultMap id="ResultMap" type="com.xwd.hospital.server.domain.UserCouponInfo" extends="BaseResultMap">
-        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain._nfo"
-                     select="com.xwd.hospital.server.repository._nfoMapper.selectById" />
-        <association column="coupon_id" property="coupon" javaType="com.xwd.hospital.server.domain.OnInfo"
-                     select="com.xwd.hospital.server.repository.OnInfoMapper.selectById" />
+        <association column="user_info_id" property="userInfo" javaType="com.xwd.hospital.server.domain.UserInfo"
+                     select="com.xwd.hospital.server.repository.UserInfoMapper.selectById" />
+        <association column="coupon_id" property="coupon" javaType="com.xwd.hospital.server.domain.CouponInfo"
+                     select="com.xwd.hospital.server.repository.CouponInfoMapper.selectById" />
     </resultMap>
     <sql id="Base_Column_List">
         `id`, `user_info_id`, `coupon_id`, `coupon_name`, `coupon_type`, `coupon_discount`, `coupon_start_date`, `coupon_end_date`, `coupon_use_state`, `editor_id`, `editor_name`, `create_time`, `update_time`