小程序医生信息查询接口修改

xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java

@@ -115,7 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/login", "/register", "/captchaImage").anonymous()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
-                .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**", "/nurseApplet/**", "/nurseApp/**", "/specialDisease/getUserInfo", "/monitor/payTask/handCloseOrder", "/newapp/login/appLogin", "/system/hospitalPerson/**").permitAll()
+                .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**", "/nurseApplet/**", "/nurseApp/**", "/specialDisease/getUserInfo", "/monitor/payTask/handCloseOrder", "/newApp/login/**", "/system/hospitalPerson/**").permitAll()
                 .antMatchers(antMatchers.split(",")).permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()

xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/healthconsultation/HealthConsultationController.java

@@ -33,17 +33,6 @@ public class HealthConsultationController extends BaseController {
     @Resource
     private HealthConsultationService healthConsultationService;
 
-
-
-    /**
-     * 获取健康咨询-科室人员信息详细信息
-     */
-    @MobileRequestAuthorization
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(healthConsultationService.selectHospitalPersonInfoById(id));
-    }
-
     /**
      * 健康咨询-预约医生
      */

xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/newapp/NewAppLoginController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 
 @RestController
-@RequestMapping("/newapp/login")
+@RequestMapping("/newApp/login")
 public class NewAppLoginController {
 
     @Resource
@@ -30,4 +30,12 @@ public class NewAppLoginController {
         }
         return AjaxResult.success(newAppLoginService.login(personAccount, personPassword));
     }
+
+    /**
+     * 获取健康咨询-科室人员信息详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(newAppLoginService.selectHospitalPersonInfoById(id));
+    }
 }

xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/HealthConsultationService.java

@@ -1,13 +1,11 @@
 package com.xinelu.applet.service.healthconsultation;
 
 
-
 import com.xinelu.applet.vo.healthconsultation.HealthConsultationOrderDTO;
 import com.xinelu.applet.vo.healthconsultation.HealthConsultationVO;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.core.page.TableDataInfo;
 import com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo;
-import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO;
 
 import java.util.List;
 
@@ -18,14 +16,6 @@ import java.util.List;
  */
 public interface HealthConsultationService {
 
-    /**
-     * 查询健康咨询-科室人员信息
-     *
-     * @param id 健康咨询-科室人员信息主键
-     * @return 健康咨询-科室人员信息
-     */
-    HospitalPersonInfoVO selectHospitalPersonInfoById(Long id);
-
     /**
      * 健康咨询-预约医生
      *

xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/impl/HealthConsultationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xinelu.applet.service.healthconsultation.impl;
 
+import com.xinelu.applet.mapper.healthconsultation.HealthConsultationMapper;
 import com.xinelu.applet.service.healthconsultation.HealthConsultationService;
 import com.xinelu.applet.utils.AppointmentTimeUtil;
 import com.xinelu.applet.vo.healthconsultation.HealthConsultationOrderDTO;
@@ -23,11 +24,9 @@ import com.xinelu.manage.domain.patientinfo.PatientInfo;
 import com.xinelu.manage.domain.poserInfo.PoserInfo;
 import com.xinelu.manage.mapper.goodsOrder.GoodsOrderMapper;
 import com.xinelu.manage.mapper.goodsOrderDetails.GoodsOrderDetailsMapper;
-import com.xinelu.applet.mapper.healthconsultation.HealthConsultationMapper;
 import com.xinelu.manage.mapper.hospitalpersoninfo.HospitalPersonInfoMapper;
 import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper;
 import com.xinelu.manage.mapper.poserInfo.PoserInfoMapper;
-import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO;
 import com.xinelu.manage.vo.patientinfo.PatientInfoVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -68,17 +67,6 @@ public class HealthConsultationServiceImpl implements HealthConsultationService
     @Resource
     private PageServiceUtil pageServiceUtil;
 
-    /**
-     * 查询健康咨询-科室人员信息
-     *
-     * @param id 健康咨询-科室人员信息主键
-     * @return 健康咨询-科室人员信息
-     */
-    @Override
-    public HospitalPersonInfoVO selectHospitalPersonInfoById(Long id) {
-        return hospitalPersonInfoMapper.selectHospitalPersonInfoById(id);
-    }
-
     /**
      * 健康咨询-预约医生
      *

xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/newapp/NewAppLoginService.java

@@ -1,6 +1,7 @@
 package com.xinelu.applet.service.newapp;
 
 import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -12,4 +13,12 @@ public interface NewAppLoginService {
      * @return
      */
      AjaxResult login(String personAccount, String personPassword);
+
+    /**
+     * 查询健康咨询-科室人员信息
+     *
+     * @param id 健康咨询-科室人员信息主键
+     * @return 健康咨询-科室人员信息
+     */
+    HospitalPersonInfoVO selectHospitalPersonInfoById(Long id);
 }

xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/newapp/impl/NewAppLoginServiceImpl.java

@@ -4,6 +4,8 @@ import com.xinelu.applet.mapper.newapp.NewAppLoginMapper;
 import com.xinelu.applet.service.newapp.NewAppLoginService;
 import com.xinelu.applet.vo.newapp.LoginStatusVo;
 import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.manage.mapper.hospitalpersoninfo.HospitalPersonInfoMapper;
+import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -13,6 +15,8 @@ public class NewAppLoginServiceImpl implements NewAppLoginService {
 
     @Resource
     private NewAppLoginMapper newAppLoginMapper;
+    @Resource
+    private HospitalPersonInfoMapper hospitalPersonInfoMapper;
 
     /**
      * 新app登录
@@ -33,4 +37,15 @@ public class NewAppLoginServiceImpl implements NewAppLoginService {
             return AjaxResult.error("账号或密码错误！");
         }
     }
+
+    /**
+     * 查询健康咨询-科室人员信息
+     *
+     * @param id 健康咨询-科室人员信息主键
+     * @return 健康咨询-科室人员信息
+     */
+    @Override
+    public HospitalPersonInfoVO selectHospitalPersonInfoById(Long id) {
+        return hospitalPersonInfoMapper.selectHospitalPersonInfoById(id);
+    }
 }