Merge branch 'dev' of trick9191/wlyy2.0 into dev

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -7,9 +7,6 @@ import com.yihu.jw.rm.base.BaseRequestMapping;
 */
public class BaseHospitalRequestMapping {
    @Deprecated
    public static final String api_base_common = "/svr-hospital";
    /**
     * 基础请求地址
     */
@@ -26,5 +23,69 @@ public class BaseHospitalRequestMapping {
    public static class Prescription extends BaseHospitalRequestMapping.Basic {
        public static final String PREFIX  = "/prescription";
        /**
         * 原处方记录
         */
        public static final String findOriginPrescriptionList = "/getOriginPrescriptionList";
        /**
         * 获取原来处方详情
         */
        public static final String findOriginPrescription = "/getOriginPrescriptionInfo";
        /**
         * 续方记录
         */
        public static final String findPrescriptionList = "/findPrescriptionList";
        /**
         * 获取所有居民相关信息，续方信息，物流信息，药品信息
         */
        public static final String findPrescriptionInfo ="/findPrescriptionInfo";
        /**
         * 判断是否可续方
         */
        public static final String checkPrescription = "/checkPrescription";
        /**
         * 获取医生及号员信息
         */
        public static final String findDoctorList = "/findDoctorList";
        //支付+预约
        public static final String appointmentRevisit = "/appointmentRevisit";
        /**
         * 进入候诊室
         */
        public static final String enterWaitingRoom = "/enterWaitingRoom";
        /**
         * 进入诊疗室
         */
        public static final String enterConsultingRoom = "/enterConsultingRoom";
        /**
         * 居民取消续方
         */
        public static final String cancelPrescription ="/cancelPrescription";
        /**
         * 支付续方
         */
        public static final String payOrder = "/payOrder";
        /**
         * 转物流
         */
        public static final String switchExpress ="/switchExpress";
        /**
         * 评价医生
         */
        public static final String evaluateDoctor = "/evaluateDoctor";
        //确认收货
        public static final String confirmReceipt ="/confirmReceipt";
        //医生下诊断
        public static final String diagnose ="/diagnose";
    }
}

gateway/ag-basic/src/main/resources/bootstrap.yml

@@ -12,7 +12,7 @@ spring:
  profiles: jwdev
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://192.168.131.174:1221}
      uri: ${wlyy-spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy-spring.config.label:jwdev}
---
@@ -20,7 +20,7 @@ spring:
  profiles: jwtest
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://192.168.131.174:1221}
      uri: ${wlyy-spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy-spring.config.label:jwdev}
---
@@ -28,5 +28,5 @@ spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://192.168.131.174:1221}
      uri: ${wlyy.pring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy.spring.config.label:jwprod}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -1,7 +1,18 @@
package com.yihu.jw.hospital.endpoint.prescription;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * Created by Trick on 2019/5/16.
 */
public class PrescriptionEndpoint {
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.Prescription.PREFIX)
@Api(value = "在线复诊", description = "在线复诊接口", tags = {"在线复诊接口"})
public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    
}