Merge remote-tracking branch 'origin/dev' into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/YkyyPrescriptionService.java

@@ -1843,7 +1843,7 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
     * @param authorization
     * @return
     */
    public String track(String source,String eventType,String eventName,String page,String referPage,String hospId,String hospName,String userName,String authorization){
    public String track(String source,String eventType,String eventName,String page,String referPage,String hospId,String hospName,String userName,String schoolName,String authorization){
        String url = newYktUrl+"/api/ext/ykt/track";
        Map<String, Object> params = new HashMap<>();
        params.put("source", source);
@@ -1854,6 +1854,7 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        params.put("hospId", hospId);
        params.put("hospName", hospName);
        params.put("userName", userName);
        params.put("schoolName",schoolName);
        Map<String,String> headerParams = new HashMap<>();
        headerParams.put("Authorization","Bearer "+authorization);
        return SignGenerator.requestYktAndHeader(params,headerParams,url);
@@ -2170,7 +2171,7 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
     * @return
     * @throws Exception
     */
    public String traceRecharge(String patientId,String source,String eventType,String eventName,String page,String referPage,String hospId,String hospName,String userName) throws Exception {
    public String traceRecharge(String patientId,String source,String eventType,String eventName,String page,String referPage,String hospId,String hospName,String userName,String schoolName) throws Exception {
        BasePatientDO patientDO = basePatientDao.findById(patientId);
        String authorization ="";
        String tokenRes=mobileOnly(patientDO.getMobile());
@@ -2184,6 +2185,6 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        if (!org.apache.commons.lang.StringUtils.isNotBlank(authorization)){
            throw new Exception("获取登录失效");
        }
        return track(source,eventType,eventName,page,referPage,hospId,hospName,userName,authorization);
        return track(source,eventType,eventName,page,referPage,hospId,hospName,userName,schoolName,authorization);
    }
}

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

@@ -528,10 +528,12 @@ public class YkyyPrescriptionEndpoint extends EnvelopRestEndpoint {
                                      @RequestParam(value = "hospId", required = false)String hospId,
                                  @ApiParam(name = "hospName", value = "医院名称")
                                      @RequestParam(value = "hospName", required = false)String hospName,
                                 @ApiParam(name = "schoolName", value = "学校名称")
                                     @RequestParam(value = "schoolName", required = false)String schoolName,
                                  @ApiParam(name = "userName", value = "姓名")
                                      @RequestParam(value = "userName", required = false)String userName)throws Exception {
        try {
            return success("ok",prescriptionService.traceRecharge(patientId,source,eventType,eventName,page,referPage,hospId,hospName,userName));
            return success("ok",prescriptionService.traceRecharge(patientId,source,eventType,eventName,page,referPage,hospId,hospName,userName,schoolName));
        }catch (Exception e) {
            return  failedListEnvelopException(e);
        }