From 61fe989b8c9be15be74ef792514a700e40765381 Mon Sep 17 00:00:00 2001
From: life <1733802689@qq.com>
Date: Wed, 1 Nov 2023 22:45:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FollowDoctorController.java    |  10 ++++++++
 .../HistoricalConsultationController.java     |  10 ++++++++
 .../PatientEvaluatorController.java           |   2 +-
 .../RegistrationInformationController.java    |  11 ++++++++
 .../mapper/HistoricalConsultationMapper.java  |   2 ++
 .../mapper/RegistrationInformationMapper.java |   1 +
 .../HistoricalConsultationService.java        |   2 ++
 .../HistoricalConsultationServiceImpl.java    |   9 +++++++
 .../RegistrationInformationServiceImpl.java   |   6 +++++
 .../RegistrationInformationService.java       |   1 +
 src/main/java/com/four/util/HXUtil.java       |   8 +++---
 .../mapper/HistoricalConsultationMapper.xml   |   9 +++++++
 .../mapper/RegistrationInformationMapper.xml  |  24 +++++++++++++++++-
 .../controller/FollowDoctorController.class   | Bin 3957 -> 3957 bytes
 .../PatientEvaluatorController.class          | Bin 3375 -> 3430 bytes
 .../RegistrationInformationController.class   | Bin 4774 -> 4772 bytes
 .../RegistrationInformationServiceImpl.class  | Bin 2088 -> 2571 bytes
 .../RegistrationInformationService.class      | Bin 658 -> 657 bytes
 target/classes/mapper/GiftMapper.xml          |   7 ++---
 .../mapper/RegistrationInformationMapper.xml  |  16 ++++--------
 .../compile/default-compile/createdFiles.lst  |   1 +
 .../compile/default-compile/inputFiles.lst    |   1 +
 22 files changed, 100 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/four/patient/controller/FollowDoctorController.java b/src/main/java/com/four/patient/controller/FollowDoctorController.java
index ed7d965..26c5fa3 100644
--- a/src/main/java/com/four/patient/controller/FollowDoctorController.java
+++ b/src/main/java/com/four/patient/controller/FollowDoctorController.java
@@ -51,6 +51,16 @@ public class FollowDoctorController {
         return Result.success(i,"取消关注");
     }
 
+//    @PostMapping("/delFollowDoctor")
+//    public Result delFollowDocter(@RequestParam Integer registrationInformationId)
+//    {
+//        log.info("功能名称:取消关注，请求URI:{},请求方式:{},请求参数:{}",request.getRequestURI(),
+//                request.getMethod(),JSONObject.toJSONString(registrationInformationId));
+//        Integer i = followDoctorService.delFollowDoctor(registrationInformationId);
+//        log.info("功能名称:取消关注,请求URI,{},请求方法:{},返回结果:{}",request.getRequestURI(),
+//                request.getMethod(),JSONObject.toJSONString(i));
+//        return Result.success(i,"取消关注");
+//    }
     /***
      * 我的关注
      * @return
diff --git a/src/main/java/com/four/patient/controller/HistoricalConsultationController.java b/src/main/java/com/four/patient/controller/HistoricalConsultationController.java
index 6a94cf8..0c5bc42 100644
--- a/src/main/java/com/four/patient/controller/HistoricalConsultationController.java
+++ b/src/main/java/com/four/patient/controller/HistoricalConsultationController.java
@@ -51,4 +51,14 @@ public class HistoricalConsultationController {
                 request.getMethod(),JSONObject.toJSONString(list));
         return Result.success(list);
     }
+
+    @PostMapping("/updateHistorical")
+    public Result updateHistorical(@RequestParam Long HistoricalConsultationId){
+        log.info("功能名称:结束问诊,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
+                request.getMethod(),JSONObject.toJSONString(historicalConsultationService));
+        Integer i =historicalConsultationService.updateHisorical(HistoricalConsultationId);
+        log.info("功能名称:结束问诊,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
+                request.getMethod(),JSONObject.toJSONString(i));
+        return Result.success(i,"结束问诊成功");
+    }
 }
diff --git a/src/main/java/com/four/patient/controller/PatientEvaluatorController.java b/src/main/java/com/four/patient/controller/PatientEvaluatorController.java
index cc994f7..2a9a7c3 100644
--- a/src/main/java/com/four/patient/controller/PatientEvaluatorController.java
+++ b/src/main/java/com/four/patient/controller/PatientEvaluatorController.java
@@ -27,7 +27,7 @@ public class PatientEvaluatorController {
      * 查询患者评价表
      * @return
      */
-    @PostMapping("/ShowPatientEvaluatorAll")
+    @GetMapping("/ShowPatientEvaluatorAll")
     public Result<List<PatientEvaluator>> ShowPatientEvaluatorAll(){
         log.info("功能名称:查询患者对医生的评价，请求URI:{},请求方法:{}",request.getRequestURI(),
                 request.getMethod());
diff --git a/src/main/java/com/four/patient/controller/RegistrationInformationController.java b/src/main/java/com/four/patient/controller/RegistrationInformationController.java
index 6452617..d78b159 100644
--- a/src/main/java/com/four/patient/controller/RegistrationInformationController.java
+++ b/src/main/java/com/four/patient/controller/RegistrationInformationController.java
@@ -101,4 +101,15 @@ public class RegistrationInformationController {
         return Result.success(list);
     }
 
+    @PostMapping("/ShowRegistration")
+    public Result<List<ResponseRegistrationInformation>> ShowRegistration(Long registrationInformationId){
+        log.info("功能名称:查看医生详情,请求URI:{},请求方法:{},请求参数:{}",request.getRequestURI(),
+                request.getMethod(),JSONObject.toJSONString(registrationInformationId));
+        List<ResponseRegistrationInformation> list=registrationInformationService.ShowRegistration(registrationInformationId);
+        log.info("功能名称:查看医生详情,请求URI:{},请求方法:{},返回结果:{}",request.getRequestURI(),
+                request.getMethod(),JSONObject.toJSONString(list));
+        return Result.success(list);
+    }
+
+
 }
diff --git a/src/main/java/com/four/patient/mapper/HistoricalConsultationMapper.java b/src/main/java/com/four/patient/mapper/HistoricalConsultationMapper.java
index e8a8eaf..c1fec39 100644
--- a/src/main/java/com/four/patient/mapper/HistoricalConsultationMapper.java
+++ b/src/main/java/com/four/patient/mapper/HistoricalConsultationMapper.java
@@ -2,6 +2,7 @@ package com.four.patient.mapper;
 
 import com.four.common.duck.interrogation.HistoricalConsultation;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,4 +13,5 @@ public interface HistoricalConsultationMapper {
 
     List<HistoricalConsultation> ShowHistoricalConsultation();
 
+    Integer updateHisorical(@Param("historicalConsultationId") Long historicalConsultationId);
 }
diff --git a/src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java b/src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java
index 173ab04..f8bdb67 100644
--- a/src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java
+++ b/src/main/java/com/four/patient/mapper/RegistrationInformationMapper.java
@@ -30,4 +30,5 @@ public interface RegistrationInformationMapper {
 
     List<ResponseRegistrationInformation> ShowRegistrationInformationAll(@Param("medicalDepartmentId") Long medicalDepartmentId);
 
+    List<ResponseRegistrationInformation> ShowRegistration();
 }
diff --git a/src/main/java/com/four/patient/service/HistoricalConsultationService.java b/src/main/java/com/four/patient/service/HistoricalConsultationService.java
index 5823289..347489b 100644
--- a/src/main/java/com/four/patient/service/HistoricalConsultationService.java
+++ b/src/main/java/com/four/patient/service/HistoricalConsultationService.java
@@ -10,4 +10,6 @@ public interface HistoricalConsultationService {
     List<HistoricalConsultation> ShowHistoricalConsultation();
 
 
+    Integer updateHisorical(Long historicalConsultationId);
+
 }
diff --git a/src/main/java/com/four/patient/service/Impl/HistoricalConsultationServiceImpl.java b/src/main/java/com/four/patient/service/Impl/HistoricalConsultationServiceImpl.java
index 20d4f39..db3e7eb 100644
--- a/src/main/java/com/four/patient/service/Impl/HistoricalConsultationServiceImpl.java
+++ b/src/main/java/com/four/patient/service/Impl/HistoricalConsultationServiceImpl.java
@@ -57,4 +57,13 @@ public class HistoricalConsultationServiceImpl implements HistoricalConsultation
         List<HistoricalConsultation> historicalConsultationList=historicalConsultationMapper.ShowHistoricalConsultation();
         return historicalConsultationList;
     }
+
+    @Override
+    public Integer updateHisorical(Long historicalConsultationId) {
+        Integer i=historicalConsultationMapper.updateHisorical(historicalConsultationId);
+        if (i<0){
+            return null;
+        }
+        return i;
+    }
 }
diff --git a/src/main/java/com/four/patient/service/Impl/RegistrationInformationServiceImpl.java b/src/main/java/com/four/patient/service/Impl/RegistrationInformationServiceImpl.java
index 5f28411..ceb394d 100644
--- a/src/main/java/com/four/patient/service/Impl/RegistrationInformationServiceImpl.java
+++ b/src/main/java/com/four/patient/service/Impl/RegistrationInformationServiceImpl.java
@@ -54,5 +54,11 @@ public class RegistrationInformationServiceImpl implements RegistrationInformati
         return symptomsDrugsList;
     }
 
+    @Override
+    public List<ResponseRegistrationInformation> ShowRegistration(Long registrationInformationId) {
+        List<ResponseRegistrationInformation> informationList=registrationInformationMapper.ShowRegistration(registrationInformationId);
+        return informationList;
+    }
+
 
 }
diff --git a/src/main/java/com/four/patient/service/RegistrationInformationService.java b/src/main/java/com/four/patient/service/RegistrationInformationService.java
index 9d80f54..ebb9cd7 100644
--- a/src/main/java/com/four/patient/service/RegistrationInformationService.java
+++ b/src/main/java/com/four/patient/service/RegistrationInformationService.java
@@ -20,4 +20,5 @@ public interface RegistrationInformationService {
 
     List<SymptomsDrugs> ShowSymptomsDrug();
 
+    List<ResponseRegistrationInformation> ShowRegistration(Long registrationInformationId);
 }
diff --git a/src/main/java/com/four/util/HXUtil.java b/src/main/java/com/four/util/HXUtil.java
index 220540c..4cd54c2 100644
--- a/src/main/java/com/four/util/HXUtil.java
+++ b/src/main/java/com/four/util/HXUtil.java
@@ -15,13 +15,13 @@ public class HXUtil {
     private static RestTemplate restTemplate = new RestTemplate();
 
     // 企业的唯一标识，开发者在环信开发者管理后台注册账号时填写的企业 ID
-    private static final String ORG_NAME = "1122161011178276";
+    private static final String ORG_NAME = "1140231020159907";
     // App的client_id
-    private static final String CLIENT_ID = "YXA6Irz_oI-GEead-FFvbfaMbQ";
+    private static final String CLIENT_ID = "YXA6fTJB-Q3uTxyLxGduTFkgcA";
     // App的client_secret
-    private static final String CLIENT_SECRET = "YXA6VsR5JypETS3iPFvNNxYklmho0Vw";
+    private static final String CLIENT_SECRET = "YXA6HMmHH-JYsRd4tb3i9mp-RDwE5Yg";
     // 同一“企业”下“APP”唯一标识，开发者在环信开发者管理后台创建应用时填写的“应用名称”
-    private static final String APP_NAME = "testapp";
+    private static final String APP_NAME = "demo";
     // 链接前缀
     private static final String URL_PREFIX = "http://a1.easemob.com/" + ORG_NAME + "/" + APP_NAME + "/";
     // 缓存的token
diff --git a/src/main/resources/mapper/HistoricalConsultationMapper.xml b/src/main/resources/mapper/HistoricalConsultationMapper.xml
index 18e52c1..26f7b7f 100644
--- a/src/main/resources/mapper/HistoricalConsultationMapper.xml
+++ b/src/main/resources/mapper/HistoricalConsultationMapper.xml
@@ -17,6 +17,15 @@
         <if test="null!=historicalConsultationStatus and ''!=historicalConsultationStatus">#{historicalConsultationStatus}</if>
         )
     </insert>
+    <update id="updateHisorical">
+        update historical_consultation set
+            historical_consultation_status=2
+        <where>
+            <if test="null!=historicalConsultationId and ''!=historicalConsultationId">
+                and historical_consultation_id=#{historicalConsultationId}
+            </if>
+        </where>
+    </update>
     <select id="ShowHistoricalConsultation"
             resultType="com.four.common.duck.interrogation.HistoricalConsultation">
         select historical_consultation_id,
diff --git a/src/main/resources/mapper/RegistrationInformationMapper.xml b/src/main/resources/mapper/RegistrationInformationMapper.xml
index 94040d6..6b175e7 100644
--- a/src/main/resources/mapper/RegistrationInformationMapper.xml
+++ b/src/main/resources/mapper/RegistrationInformationMapper.xml
@@ -80,6 +80,28 @@
                and r.medical_department_id=#{medicalDepartmentId}
             </if>
         </where>
-        ORDER BY .consulting_price,r.number_patients_served,r.praise DESC
+        ORDER BY r.consulting_price,r.number_patients_served,r.praise DESC
+    </select>
+    <select id="ShowRegistration" resultMap="ResponseRegistrationInformation">
+        select registration_information_id,
+               user_id,
+               real_name,
+               affiliated_hospital,
+               medical_department_id,
+               professional_title_doctor_id,
+               personal_resume,
+               area_expertise,
+               registration_time,
+               number_patients_served,
+               consulting_price,
+               praise,
+               registration_information_examine_status,
+               registration_information_medic_status
+        from registration_information
+        <where>
+            <if test="null!=registrationInformationId and ''!=registrationInformationId">
+                and registration_information_id=#{registrationInformationId}
+            </if>
+        </where>
     </select>
 </mapper>
diff --git a/target/classes/com/four/patient/controller/FollowDoctorController.class b/target/classes/com/four/patient/controller/FollowDoctorController.class
index 4611658b6dd88ee741ded9b50d90e2ba44eb48e2..d72869a160675cf3ef94a8839b0723f85572868a 100644
GIT binary patch
delta 41
vcmew=_f>AgUOrhj1|bG_25|;A1{nqq1~mpx1`7r+21g+6#^62q7T;_D(Uu88

delta 41
vcmew=_f>AgUOrhH1|bGp25|-(1{nrB1~mqI1`7rU21g+6#^5;l7T;_D%ccnN

diff --git a/target/classes/com/four/patient/controller/PatientEvaluatorController.class b/target/classes/com/four/patient/controller/PatientEvaluatorController.class
index d27b2583d3611523cee0514d359c271a9b2b0bef..ccdd83ad85e9d87acde6a4c3946bb3f0a7dfb1b1 100644
GIT binary patch
delta 106
zcmZ24^-PNE)W2Q(7#J8#7z#FW1#vK%OpfKyWO7fP+{y8Aatw#X<|<AfW|=ewMuzxk
v2F7BBbcPI|YIa7TKqipE!H_li5s#jHHjvH4ki!rFq=kU2Tp*nX*OU(c%DNVU

delta 101
zcmaDRwO)$r)W2Q(7#J8#81grA1#wLNz^TO?kY7BxgX81ojhsHrGI0!y4DrznjKvIT
q4Cz3H?2JHx3?PGpA#<`MubzAskj=!9%@6>jg@CLaAe{@>lm`HLuoad7

diff --git a/target/classes/com/four/patient/controller/RegistrationInformationController.class b/target/classes/com/four/patient/controller/RegistrationInformationController.class
index b95c9ec5123b188d06c5356c92ef774f5376cffa..8d5f85a50278d26b6a10b8c1c16afcc6e33964ab 100644
GIT binary patch
delta 82
zcmZ3cx<qxtNw%l0D_%CQ*m(Xcqo6==Mt*s4Wo|)9er~Z#QEB?*YfO4j1ryIJPd?8s
UwAr57n_WmyA6@0<xm=ta02Emwwg3PC

delta 84
zcmZ3Yx=eM#Nw#O54bSFuZan{$QAjX2Bfs1wwIH#mBsVp$#4#sl@>M21sEUc_l_#HL
V7usyc?9DDLq>rI=^K33o4gfg-BD(+p

diff --git a/target/classes/com/four/patient/service/Impl/RegistrationInformationServiceImpl.class b/target/classes/com/four/patient/service/Impl/RegistrationInformationServiceImpl.class
index 3972bf9df52973c1cf5aed822af66af86d76b752..4f23d39f8a3645b5d2d967a9dc5fb62aba1193d1 100644
GIT binary patch
literal 2571
zcmb_dZByGu5Pr@O9E<`4C~caM7f2c#Qm!u{Noz_&LTSi2Z5ns@F6^^&i6wbX5)A*U
zo$0ibe(3abe^jT>Ns8@Y8!{b#(Vg~o_u1Qh_V%BD|NINUT|6xyhp{}y9h}32!0apc
z(3LIMZ^|DJUa49nFtMq99c>AW6-)b*IFHFZ3J#{=2t2F>o@@lMk!?59%8z8I%%QF+
zx#zW8@`Y;ZFfu#}{5`)B7%$mYQyr@!uw(`+J#*V_Wd!b5`Y^oYXqflZusnrn%;Yia
z;3DP(HvX3vftBjZ;AqG_wp*>|hL;ssE>^mUs|0?tTuKFTq+7DWBqZ@HIQYN@bK?}J
zKg8aFGB)}T9ei|__H*OvP+9Gd9bC5BS5NWHfNcSn99+dUfw}P5Ye#_>?wGh4?ke5%
z1=jlW-LNOJ+NaDr-N14lD-LermO!a5$HOcI<{R3tXD$<X#wKvBSn9&ln-}=99@k#8
z)?wU=$_3m;F^`giRjdhI?f~}d3gnwA+HoUSV1aJC^+}0c&f`;o=|tSAQXZ0w>v%m$
z>LEPH_$+YgMeIk~Q~Ns92Q9Vj`$3d2J`{LR2~1OlZKM5W!?>P03e0PHpj<zc4Yw8r
z=2*HN1GybX!I3tqUKSXC9Mnm&nTqyRN{^pix@Q3^LCtOLyGGmpOgJ9B)Wmz#P2|aI
zyk~C`dEQfXO^6-Uc1`55!T0KXBzlsWkewm6$nnleC!ch&_->5H?YD9MbfQBxy8-uB
z)2Of=_@S~CNH#-?P~IZgWR*;Hqu4MxwKIEi6o|97-FjPtRe8&{-Zac)z1HRW(%}1M
zOc%JAS)|=*-w=W3X*Qehmr$GBm@oQqMvL&>&SoBMCZCMTnZVP&d<;qa*^vnps+=}8
zwW}@vZx7)@&wyFC4K7d|*nMH7j0%_uB{P#UU$pZai302V=IoT?{xi<X39g@W&Dpo}
zgv_3CeDeDRH6&NT_1x+o5WglSU-D~@ff){6Bu=S-4cy}&YmGTNw#F{kF|HR@e?xxl
z4KC#H?9ML~jKMmw;~KcaxRw$}*Hh)p5zTNP59n};dSBsde#_LicSt3hlzc-;4qKFQ
z7;!fUc771-GM%i90G3m22<+k@*dk#|BY@?290Gf35bQc(<p^NE#lsBtkSVvdU0`jm
zyuo#W%G&Sv<Zs;RE%9`sbC;#wV8Hi!B3Q`ET;SO@9?_e<(Bn>-7x|Z-?R3t*qbx1>
PE_dH2rGL^P^d9gZdz+c-

literal 2088
zcmb_eYflqF6uq+rDp2I5DDsekN_mbi#H56X5+kN4Qq%8CJCuR$&SrKO(to9iiNO#4
z0DqM6%x)<NEuiqBxp!vIoHO?^H~sbd$4?@9PKzC6Q6fn#DQcxQMm@XszRfGPTjn3P
zc11B@)V3sD87wnOWTp!3bc5QH)RCf2N-=s>R1V)(q2`_)NZ|(D7kXb71z&T#3f~lE
z=?5C0l)L6`EA2#XKE@abqY>R0v~GKz(2N#yXEdDXQ#1DXV78NPQg@PiQq)U*j28Zj
zg;8&QM;)vR&(?v1_*N>oa$jaD7v(7oWQFGtVx)E}MYm~y(S$kDBy^nL(8v#?@l4DS
z<vOR_a<(Dq-4qQP()2l`A3|qKXcO>IiiR&jZ)jWk!k|Y}bl;#y&*8>}laxjo&gAc?
z(oG_*6`9fCX6Ode5e4bXt%_K2T@^%a;4^xeQ@YH3PfNGFt!+mfD80wGgzfr#+b#x5
zSGiq3z*oXR9Y`%oSw<~yR0(P9&Pi9q3HWS-9@WXIqFpK2TAFojvnAM((0hHhnU2D^
zWWz$a*RMKWpd5cyhh^WCAMfULLogcn`yN&A=q~S0VV90Cg(N%5<)yH=$BiH2<yC7>
z%jfx%y4hu1r9Cgpt{sFLalb#)l~*9{cSK1djmMq8R;ovN+_ES`C5r#k<zmvp_mt}k
zyxrJo(mYXc#S33ZlK}ror6Z5=RTOWf>7B_Y_c<}K=FQ7zlxf(xejv0^D4F23BUwsg
zWLm^%3_r_^P1tb^-!|BZn#JtJ>H$_9mch18e<$`8jzte^AfhgM1m6$<K$Db#ML$v>
zQ08y}E6X6Jzftm#x)|kVzF?h*ILxRgjHnJ8h<FBKY>mf!ouX+l%oqmPcxM*g9Cj?4
zhlc?N&uH1O3D_>9HFHS)7Ol^o78^pm!;#on46ccpP&hpXVJB#wK-Q|u#yd~36U#mW
z3L_BfMzVJr$)-U&ehspirA=h-HIki#Y~~tdF_fFgjx>^;gY5j3Wi9+0FjZctH|GnY
EKUt*!Y5)KL

diff --git a/target/classes/com/four/patient/service/RegistrationInformationService.class b/target/classes/com/four/patient/service/RegistrationInformationService.class
index fb98979647f226ebcce34e25fae8ad5986493ec7..8c39bca136dd3dddf8e38e13b963ccd67709d6c9 100644
GIT binary patch
delta 121
zcmbQlI+1lk{KSXe6FYb&>oA@d6bR19FAuKFEhx#)Ep{m?O`ljO&g7*r*^W_t;$D@>
pzZrvE*%%lZ*cliYm>4)%7#X-2Q2E?wd>#f~xOzSyiyy30003dN6e|D#

delta 122
zcmbQpI*D~cyqI8cMt-?VYC&RANp5OhiDOO<BZH8}#Od;r*E0GtDo=J~l%80vKXKdn
n$-fwbT)7w+8Q2*Z7?>EiSr{337*P4VXna0oK2Rq=Sf>C02Rajg

diff --git a/target/classes/mapper/GiftMapper.xml b/target/classes/mapper/GiftMapper.xml
index debad76..7b90323 100644
--- a/target/classes/mapper/GiftMapper.xml
+++ b/target/classes/mapper/GiftMapper.xml
@@ -11,7 +11,8 @@
         values (
         <if test="null!=giverId and ''!=giverId">#{giverId},</if>
         <if test="null!=giftId and ''!=giftId">#{giftId},</if>
-        #{giftGivingTime})
+        #{giftGivingTime}
+        )
     </insert>
     <update id="updPatientMoney">
         update sys_user set
@@ -42,7 +43,7 @@
         from gift
         <where>
             <if test="null!=gift_id and ''!=gift_id">
-                gift_id = #{giftId}
+               and gift_id = #{giftId}
             </if>
         </where>
     </select>
@@ -50,7 +51,7 @@
         select user_id from registration_information
                        <where>
                            <if test="null!=registration_information_id and ''!=registration_information_id">
-                               registration_information_id=#{registrationInformationId}
+                             and registration_information_id=#{registrationInformationId}
                            </if>
                        </where>
     </select>
diff --git a/target/classes/mapper/RegistrationInformationMapper.xml b/target/classes/mapper/RegistrationInformationMapper.xml
index f61eb31..237d297 100644
--- a/target/classes/mapper/RegistrationInformationMapper.xml
+++ b/target/classes/mapper/RegistrationInformationMapper.xml
@@ -50,7 +50,7 @@
         <include refid="selectRegistrationInformation"></include>
         <where>
             <if test="null!=medicalDepartmentId and ''!=medicalDepartmentId">
-                r.medical_department_id = #{medicalDepartmentId}
+               and r.medical_department_id = #{medicalDepartmentId}
             </if>
         </where>
         ORDER BY r.consulting_price DESC
@@ -59,7 +59,7 @@
         <include refid="selectRegistrationInformation"></include>
         <where>
             <if test="null!=medicalDepartmentId and ''!=medicalDepartmentId">
-                r.medical_department_id = #{medicalDepartmentId}
+               and r.medical_department_id = #{medicalDepartmentId}
             </if>
         </where>
         ORDER BY r.number_patients_served DESC
@@ -68,24 +68,18 @@
         <include refid="selectRegistrationInformation"></include>
         <where>
             <if test="null!=medicalDepartmentId and ''!=medicalDepartmentId">
-                r.medical_department_id = #{medicalDepartmentId}
+               and r.medical_department_id = #{medicalDepartmentId}
             </if>
         </where>
         ORDER BY r.praise DESC
     </select>
-    <select id="ShowDepartmentAll" resultType="com.four.common.duck.communitypatients.SymptomsDrugs">
-        select symptoms_drugs.id,
-               symptoms_drugs.name
-        from symptoms_drugs
-        where pid = 1
-    </select>
     <select id="ShowRegistrationInformationAll" resultMap="ResponseRegistrationInformation">
         <include refid="selectRegistrationInformation"></include>
         <where>
             <if test="null!=medicalDepartmentId and ''!=medicalDepartmentId">
-                r.medical_department_id=#{medicalDepartmentId}
+               and r.medical_department_id=#{medicalDepartmentId}
             </if>
         </where>
-        ORDER BY .consulting_price,r.number_patients_served,r.praise DESC
+        ORDER BY r.consulting_price,r.number_patients_served,r.praise DESC
     </select>
 </mapper>
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 4cb4bef..6d5bded 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -9,6 +9,7 @@ com\four\patient\mapper\RegistrationInformationMapper.class
 com\four\patient\service\Impl\FollowDoctorServiceImpl.class
 com\four\patient\controller\PatientEvaluatorController.class
 com\four\patient\controller\RegistrationInformationController.class
+com\four\patient\feign\SymptomsDrugsFeign.class
 com\four\doctor\service\GiftRecordDoctorService.class
 com\four\doctor\mapper\PatientDoctorMapper.class
 com\four\Instantmessaging\controller\InstantController.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 53104c9..b941cbc 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -17,6 +17,7 @@ D:\Project\dimensional-health-interrogation\src\main\java\com\four\Interrogation
 D:\Project\dimensional-health-interrogation\src\main\java\com\four\doctor\mapper\GiftRecordDoctorMapper.java
 D:\Project\dimensional-health-interrogation\src\main\java\com\four\patient\service\FollowDoctorService.java
 D:\Project\dimensional-health-interrogation\src\main\java\com\four\doctor\service\HistoricalDoctorService.java
+D:\Project\dimensional-health-interrogation\src\main\java\com\four\patient\feign\SymptomsDrugsFeign.java
 D:\Project\dimensional-health-interrogation\src\main\java\com\four\doctor\controller\HistoricalDoctorController.java
 D:\Project\dimensional-health-interrogation\src\main\java\com\four\Instantmessaging\controller\InstantController.java
 D:\Project\dimensional-health-interrogation\src\main\java\com\four\patient\controller\GiftController.java