Merge branch 'server' into web

@@ -63,7 +63,7 @@ exports.getPatientDetail = async ctx => {
         return;
         return;
     }
     }
 
 
-    const { patientId } = ctx.request.body;
+    const { patientId } = ctx.params;
     const patient = await User.findByUserId(patientId);
     const patient = await User.findByUserId(patientId);
     if(!patient || patient.useYn !== 'Y') {
     if(!patient || patient.useYn !== 'Y') {
         ctx.status = 404;
         ctx.status = 404;

@@ -17,7 +17,7 @@ doctor.get('/patient', doctorCtrl.getPatientList);
  * url : http://localhost:4000/doctor/patient/:patientId
  * url : http://localhost:4000/doctor/patient/:patientId
  * return : patient Detail
  * return : patient Detail
  */
  */
-doctor.get('/patient/detail', doctorCtrl.getPatientDetail);
+doctor.get('/patient/:patientId', doctorCtrl.getPatientDetail);
 
 
 /**
 /**
  * 현재 로그인한 유저(의사)의 관리 약병 상세 정보를 가져옴
  * 현재 로그인한 유저(의사)의 관리 약병 상세 정보를 가져옴

@@ -26,7 +26,7 @@ user.get('/doctorrequest', userCtrl.viewAllDoctorRegister);
  * url : http://localhost:4000/api/user/doctorrequest/:doctorId
  * url : http://localhost:4000/api/user/doctorrequest/:doctorId
  * return : null
  * return : null
  */
  */
-user.post('/doctorrequest/accept', userCtrl.acceptDoctorRegister);
+user.post('/doctorrequest', userCtrl.acceptDoctorRegister);
 
 
 
 
 module.exports = user;
 module.exports = user;