Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java

@@ -161,4 +161,37 @@ public class WlyyBusinessService {
//            return users;
//        }
//    }
    
    /**
     * 根据居民CODE换取居民请求秘钥
     * @param patientId
     * @return
     * @throws Exception
     */
    public String wlyyGetPatientAccetokenByIdcard(String patientId) throws Exception {
        
        String idcard = "";
        String result = "";
        BasePatientDO basePatientDO = basePatientDao.findById(patientId);
        if(basePatientDO != null){
            idcard = basePatientDO.getIdcard();
    
            JSONObject param = new JSONObject();
            param.put("idCard",idcard);
            JSONObject rs = wlyyHttpService.sendWlyyMes("wlyyGetPatientAccetokenByIdcard",param);
            if(rs!=null){
                Integer status = rs.getInteger("status");
                if(200 == status){
                    JSONObject data = rs.getJSONObject("data");
                    result = data.getString("patientCode");
                }else{
                    logger.info(rs.toJSONString());
                    throw new Exception("请求i健康接口失败");
                }
            }
        }else {
            throw new Exception("该居民不存在");
        }
        return result;
    }
}

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

@@ -321,6 +321,10 @@ public class BaseHospitalRequestMapping {
        public static final String getDoctorIntroduction ="/getDoctorIntroduction";
        public static final String findByDict ="/findByDict";
    
    
        //根据居民CODE换取居民请求秘钥
        public static final String getPatientAccetokenByIdcard="getPatientAccetokenByIdcard";
    }
@@ -485,6 +489,7 @@ public class BaseHospitalRequestMapping {
    
        //医生端：医生提醒居民上线
        public static final String alertPatientOnline="alertPatientOnline";
    }
    /**

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

@@ -751,4 +751,11 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                  @RequestParam(value = "hospital", required = true)String hospital) {
        return success(prescriptionService.findByDict(name,hospital));
    }
    
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.getPatientAccetokenByIdcard)
    @ApiOperation(value = "根据居民CODE换取居民请求秘钥")
    public Envelop getPatientAccetokenByIdcard(@ApiParam(name = "patientCode", value = "居民CODE")
                                       @RequestParam(value = "patientCode",required = true) String patientCode)throws Exception{
        return success(wlyyBusinessService.wlyyGetPatientAccetokenByIdcard(patientCode));
    }
}