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

# Conflicts:
#	app/app-iot-server/pom.xml
#	app/app-iot-server/src/main/java/com/yihu/ehr/iot/AppIotServer.java
#	app/app-iot-server/src/main/java/com/yihu/iot/controller/common/LoginController.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/config/EhrWebHttpSessionConfiguration.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/config/EhrWebSecurityConfiguration.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebAccessDecisionManager.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebAuthenticationFailureHandler.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebAuthenticationToken.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebUserDetails.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebUserDetailsService.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebUsernamePasswordAuthenticationFilter.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/entryPoint/LoginEntryPoint.java
#	app/app-iot-server/src/main/resources/application.yml
#	app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebAuthenticationProvider.java
#	app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebAuthenticationSuccessHandler.java
#	app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebContextLogoutHandler.java
#	app/public-health-server/src/main/java/com/yihu/health/util/CurrentRequest.java
#	svr/svr-base/src/main/resources/application.yml
#	web-gateway/src/main/java/com/yihu/jw/controller/base/login/LoginContorller.java
#	web-gateway/src/main/resources/application.yml

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/AccountController.java

@@ -169,9 +169,17 @@ public class AccountController extends EnvelopRestEndpoint {
    @PostMapping(value = HealthBankMapping.healthBank.selectAccountByPatient)
    @ApiOperation(value = "根据id获取居民账户")
    public MixEnvelop<AccountDO, AccountDO> selectByPatient(@ApiParam(name = "patientId",value = "居民id")
                                                                   @RequestParam(value = "patientId",required = true)String patientId){
                                                                   @RequestParam(value = "patientId",required = true)String patientId,
                                                            @ApiParam(name = "name",value = "名字")
                                                            @RequestParam(value = "name",required = true)String name,
                                                            @ApiParam(name = "hospital",value = "机构code")
                                                                @RequestParam(value = "hospital",required = false)String hospital,
                                                            @ApiParam(name = "hospitalName",value = "机构名称")
                                                                @RequestParam(value = "hospitalName",required = false)String hospitalName,
                                                            @ApiParam(name = "idcard",value = "身份证")
                                                                @RequestParam(value = "idcard",required = false)String idcard){
        try {
            return service.selectByPatient(patientId);
            return service.selectByPatient(patientId,name,hospital,hospitalName,idcard);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/AccountService.java

@@ -404,11 +404,33 @@ public class AccountService extends BaseJpaService<AccountDO,AccountDao> {
     * @param patient
     * @return
     */
    public MixEnvelop<AccountDO, AccountDO> selectByPatient(String patient){
    public MixEnvelop<AccountDO, AccountDO> selectByPatient(String patient,String name,String hospital,String hospitalName,String idcard){
        MixEnvelop<AccountDO,AccountDO> envelop = new MixEnvelop<>();
        String sql = "select * from wlyy_health_bank_account where status = 1 and patient_id = '"+patient+"'";
        List<AccountDO> accountDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(AccountDO.class));
        envelop.setObj(accountDOS.get(0));
        if (accountDOS == null || accountDOS.size()==0){
            AccountDO accountDO = new AccountDO();
            accountDO.setTotal(0);
            accountDO.setId(getCode());
            accountDO.setPatientId(patient);
            accountDO.setAccountName(name);
            accountDO.setHospital(hospital);
            accountDO.setHospitalName(hospitalName);
            if(idcard.length()>=4){// 判断是否长度大于等于4
                String cardNumber=idcard.substring(idcard.length()- 4,idcard.length());//截取两个数字之间的部分
                int random = (int)((Math.random()*9+1)*100000);
                accountDO.setCardNumber(cardNumber+Integer.toString(random));
            }
            accountDO.setPassword("123456");
            accountDO.setSaasId("dev");
            accountDO.setStatus(1);
            accountDO.setCreateTime(new Date());
            accountDO.setUpdateTime(new Date());
            accountDO = accountDao.save(accountDO);
            envelop.setObj(accountDO);
        }else {
            envelop.setObj(accountDOS.get(0));
        }
        return envelop;
    }
}