重构代码

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

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,"结束问诊成功");
+    }
 }

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());

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);
+    }
+
+
 }

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);
 }

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();
 }

src/main/java/com/four/patient/service/HistoricalConsultationService.java

@@ -10,4 +10,6 @@ public interface HistoricalConsultationService {
     List<HistoricalConsultation> ShowHistoricalConsultation();
 
 
+    Integer updateHisorical(Long historicalConsultationId);
+
 }

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;
+    }
 }

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;
+    }
+
 
 }

src/main/java/com/four/patient/service/RegistrationInformationService.java

@@ -20,4 +20,5 @@ public interface RegistrationInformationService {
 
     List<SymptomsDrugs> ShowSymptomsDrug();
 
+    List<ResponseRegistrationInformation> ShowRegistration(Long registrationInformationId);
 }

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

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,

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>

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>

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>

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

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