Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionLogController.java

@@ -19,7 +19,7 @@ import java.util.List;
/**
 * Created by chenweida on 2017/7/27.
 */
@RestController
@RestController("doctorPrescriptionLogController")
@RequestMapping(value = "/doctor/prescriptionlog")
@Api("医生端-处方日志")
public class PrescriptionLogController extends BaseController {

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionController.java

@@ -11,10 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import java.util.Calendar;
import java.util.List;
@@ -26,7 +23,7 @@ import java.util.Random;
 *
 */
@Controller
@RestController("patientPrescriptionLogController")
@RequestMapping(value = "/patient/prescription", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-长处方接口")
public class PatientPrescriptionController extends BaseController {