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

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

@@ -1606,7 +1606,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            List<BaseDoctorHospitalDO> hospitalDOs =  baseDoctorHospitalDao.findByDoctorCode(doctorDO.getId());
            if(hospitalDOs!=null&&hospitalDOs.size()>0){
               rs.put("hospital",hospitalDOs.get(0));
               BaseOrgDO org = baseOrgDao.findOne(hospitalDOs.get(0).getOrgCode());
               BaseOrgDO org = baseOrgDao.findByCode(hospitalDOs.get(0).getOrgCode());
               rs.put("winNo",org.getWinNo());
            }else{
               rs.put("hospital",null);
@@ -2113,9 +2113,22 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return convertToModels(times,timeVOs,WlyyDoctorWorkTimeVO.class);
    }
//    public Map<String,Object> findPatientInfo(String patient){
//
//    }
    public Map<String,Object> findPatientInfo(String patient){
        Map<String,Object> rs = new HashedMap();
        BasePatientDO basePatientDO = basePatientDao.findById(patient);
        rs.put("id",patient);
        rs.put("name",basePatientDO.getName());
        rs.put("sex",basePatientDO.getSex());
        rs.put("provinceCode",basePatientDO.getProvinceCode());
        rs.put("provinceName",basePatientDO.getProvinceName());
        rs.put("cityCode",basePatientDO.getCityCode());
        rs.put("cityName",basePatientDO.getCityName());
        rs.put("townCode",basePatientDO.getTownCode());
        rs.put("townName",basePatientDO.getTownName());
        rs.put("idcard",basePatientDO.getIdcard());
        rs.put("mobile",basePatientDO.getMobile());
        return rs;
    }
    @Autowired
    private HttpClientUtil httpClientUtil;

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

@@ -476,13 +476,13 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    }
//    @PostMapping(value = BaseHospitalRequestMapping.Prescription.findPatientInfo)
//    @ApiOperation(value = "排班批量保存接口", notes = "排班批量保存接口")
//    public ObjEnvelop findPatientInfo(@ApiParam(name = "type", value = "1.全医院，2.科室，3.医生")
//                                      @RequestParam(value = "type", required = true)String patient){
//        return success(prescriptionService.findPatientInfo(type,codes,workTimeJson));
//
//    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findPatientInfo)
    @ApiOperation(value = "获取居民信息接口", notes = "获取居民信息接口")
    public ObjEnvelop findPatientInfo(@ApiParam(name = "patient", value = "居民ID")
                                      @RequestParam(value = "patient", required = true)String patient){
        return success(prescriptionService.findPatientInfo(patient));
    }
    //===========