From 8279b544417d3194c24e0d5f2549a9c1d7ac14c5 Mon Sep 17 00:00:00 2001
From: life <1733802689@qq.com>
Date: Thu, 2 Nov 2023 09:27:51 +0800
Subject: [PATCH] =?UTF-8?q?SQL=E8=AF=AD=E5=8F=A5=E5=85=A8=E9=83=BD?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8resultMap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PatientEvaluatorController.java      |  3 ---
 .../RegistrationInformationController.java          |  5 +++++
 .../mapper/RegistrationInformationMapper.java       |  4 ++--
 src/main/resources/mapper/FollowDoctorMapper.xml    |  8 +++++++-
 src/main/resources/mapper/GiftMapper.xml            | 13 +++++++++++--
 .../mapper/HistoricalConsultationMapper.xml         |  9 +++++++--
 .../resources/mapper/PatientEvaluatorMapper.xml     | 11 ++++++++++-
 7 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/four/patient/controller/PatientEvaluatorController.java b/src/main/java/com/four/patient/controller/PatientEvaluatorController.java
index 2a9a7c3..1618150 100644
--- a/src/main/java/com/four/patient/controller/PatientEvaluatorController.java
+++ b/src/main/java/com/four/patient/controller/PatientEvaluatorController.java
@@ -1,15 +1,12 @@
 package com.four.patient.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.four.common.core.domain.R;
 import com.four.common.core.domain.Result;
 import com.four.common.duck.interrogation.PatientEvaluator;
-import com.four.patient.mapper.PatientEvaluatorMapper;
 import com.four.patient.service.PatientEvaluatorService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
diff --git a/src/main/java/com/four/patient/controller/RegistrationInformationController.java b/src/main/java/com/four/patient/controller/RegistrationInformationController.java
index d78b159..0d96b54 100644
--- a/src/main/java/com/four/patient/controller/RegistrationInformationController.java
+++ b/src/main/java/com/four/patient/controller/RegistrationInformationController.java
@@ -101,6 +101,11 @@ public class RegistrationInformationController {
         return Result.success(list);
     }
 
+    /**
+     * 查看医生详情
+     * @param registrationInformationId
+     * @return
+     */
     @PostMapping("/ShowRegistration")
     public Result<List<ResponseRegistrationInformation>> ShowRegistration(Long registrationInformationId){
         log.info("功能名称:查看医生详情,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
diff --git a/src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java b/src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java
index f8bdb67..80441b7 100644
--- a/src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java
+++ b/src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java
@@ -19,7 +19,7 @@ import java.util.List;
 public interface RegistrationInformationMapper {
 
 
-    List<SymptomsDrugs> ShowDepartmentAll();
+
 
     List<ResponseRegistrationInformation> ShowRegistrationInformationAllPrice(@Param("medicalDepartmentId") Long medicalDepartmentId);
 
@@ -30,5 +30,5 @@ public interface RegistrationInformationMapper {
 
     List<ResponseRegistrationInformation> ShowRegistrationInformationAll(@Param("medicalDepartmentId") Long medicalDepartmentId);
 
-    List<ResponseRegistrationInformation> ShowRegistration();
+    List<ResponseRegistrationInformation> ShowRegistration(Long registrationInformationId);
 }
diff --git a/src/main/resources/mapper/FollowDoctorMapper.xml b/src/main/resources/mapper/FollowDoctorMapper.xml
index 3ae3676..2a82351 100644
--- a/src/main/resources/mapper/FollowDoctorMapper.xml
+++ b/src/main/resources/mapper/FollowDoctorMapper.xml
@@ -4,6 +4,12 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.four.patient.mapper.FollowDoctorMapper">
 
+    <resultMap id="Follow" type="com.four.common.duck.interrogation.FollowDoctor">
+        <id property="followDoctorId" column="follow_doctor_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="registrationInformationId" column="registration_information_id"/>
+    </resultMap>
+
 
     <insert id="insertFollowDoctor">
         insert into follow_doctor(
@@ -20,7 +26,7 @@
         from follow_doctor
         where registration_informaion_id = #{registrationInformationId}
     </delete>
-    <select id="ShowFollowDoctor" resultType="com.four.common.duck.interrogation.FollowDoctor">
+    <select id="ShowFollowDoctor" resultMap="Follow">
         select follow_doctor_id,
                user_id,
                registration_information_id
diff --git a/src/main/resources/mapper/GiftMapper.xml b/src/main/resources/mapper/GiftMapper.xml
index 7b90323..ebfafb5 100644
--- a/src/main/resources/mapper/GiftMapper.xml
+++ b/src/main/resources/mapper/GiftMapper.xml
@@ -3,6 +3,15 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.four.patient.mapper.GiftMapper">
+
+    <resultMap id="Gift" type="com.four.common.duck.gift.Gift">
+        <id property="giftId" column="gift_id"/>
+        <result property="giftName" column="gift_name"/>
+        <result property="giftPhoto" column="gift_photo"/>
+        <result property="giftPrice" column="gift_price"/>
+    </resultMap>
+
+
     <insert id="insertGiftLog">
         insert into gift_record(
         <if test="null!=giverId and ''!=giverId">giver_id,</if>
@@ -26,7 +35,7 @@
     </update>
 
 
-    <select id="ShowGiftAll" resultType="com.four.common.duck.gift.Gift">
+    <select id="ShowGiftAll" resultMap="Gift">
         select
             gift_id,
             gift_name,
@@ -35,7 +44,7 @@
         from gift
     </select>
 
-    <select id="findByGiftId" resultType="com.four.common.duck.gift.Gift">
+    <select id="findByGiftId" resultMap="Gift">
         select gift_id,
                gift_name,
                gift_photo,
diff --git a/src/main/resources/mapper/HistoricalConsultationMapper.xml b/src/main/resources/mapper/HistoricalConsultationMapper.xml
index 26f7b7f..1944b4d 100644
--- a/src/main/resources/mapper/HistoricalConsultationMapper.xml
+++ b/src/main/resources/mapper/HistoricalConsultationMapper.xml
@@ -4,6 +4,12 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.four.patient.mapper.HistoricalConsultationMapper">
 
+    <resultMap id="HistoricalConsultation" type="com.four.common.duck.interrogation.HistoricalConsultation">
+        <id property="historicalConsultationId" column="historical_consultation_id"/>
+        <result property="patientId" column="patient_id"/>
+        <result property="registrationInformationId" column="registration_information_id"/>
+        <result property="historicalConsultationStatus" column="historical_consultation_status"/>
+    </resultMap>
 
     <insert id="insertHistoricalConsultation">
         insert into historical_consultation(
@@ -26,8 +32,7 @@
             </if>
         </where>
     </update>
-    <select id="ShowHistoricalConsultation"
-            resultType="com.four.common.duck.interrogation.HistoricalConsultation">
+    <select id="ShowHistoricalConsultation" resultMap="HistoricalConsultation">
         select historical_consultation_id,
                patient_id,
                registration_information_id,
diff --git a/src/main/resources/mapper/PatientEvaluatorMapper.xml b/src/main/resources/mapper/PatientEvaluatorMapper.xml
index 5e4bb2a..f4efd12 100644
--- a/src/main/resources/mapper/PatientEvaluatorMapper.xml
+++ b/src/main/resources/mapper/PatientEvaluatorMapper.xml
@@ -3,6 +3,15 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.four.patient.mapper.PatientEvaluatorMapper">
+
+    <resultMap id="Patient" type="com.four.common.duck.interrogation.PatientEvaluator">
+        <id property="patientEvaluatorId" column="patient_evaluator_id"/>
+        <result property="patientId" column="patient_id"/>
+        <result property="registrationInformationId" column="registration_information_id"/>
+        <result property="commentContent" column="comment_content"/>
+        <result property="commentTime" column="comment_time"/>
+    </resultMap>
+
     <insert id="insertPatientEvaluator">
         insert into patient_evaluator(
         <if test="null!=patientId and ''!=patientId">patient_id,</if>
@@ -19,7 +28,7 @@
     </insert>
 
 
-    <select id="ShowPatientEvaluatorAll" resultType="com.four.common.duck.interrogation.PatientEvaluator">
+    <select id="ShowPatientEvaluatorAll" resultMap="Patient">
         select patient_evaluator_id,
                patient_id,
                registration_information_id,