chenweida 7 rokov pred
rodič
commit
231e3d2746

+ 0 - 1
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/controller/GcHospitalController.java

@ -40,7 +40,6 @@ public class GcHospitalController {
    ) {
        List<Hospital> hospitals = hospitalService.getHospitals(null, provinceId, cityId, townId, hospitalName, hospitalId, page, pageSize);
        ;
        List<HospitalModel> hospitalModels = new ArrayList<>();
        for (Hospital hospital : hospitals) {
            HospitalModel hospitalModel = new HospitalModel();

+ 17 - 9
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/controller/doctor/GcDoctorController.java

@ -41,8 +41,11 @@ public class GcDoctorController {
            @ApiParam(name = "code", value = "医生code", required = true) @RequestParam(value = "code", required = true) String code
    ) {
        Doctor doctor = doctorService.findDoctorByCode(code);
        DoctorModel doctorModel = new DoctorModel();
        BeanUtils.copyProperties(doctor, doctorModel);
        DoctorModel doctorModel = null;
        if (doctor != null) {
            doctorModel = new DoctorModel();
            BeanUtils.copyProperties(doctor, doctorModel);
        }
        return new ResultOneModel(doctorModel);
    }
@ -57,11 +60,13 @@ public class GcDoctorController {
    ) {
        List<Doctor> doctors = doctorService.findDoctors(hospitalCode, name, level, page, pageSize);
        List<DoctorModel> doctorModelList = new ArrayList<>();
        doctors.stream().forEach(one -> {
            DoctorModel doctorModel = new DoctorModel();
            BeanUtils.copyProperties(one, doctorModel);
            doctorModelList.add(doctorModel);
        });
        if (doctors != null && doctors.size() > 0) {
            doctors.stream().forEach(one -> {
                DoctorModel doctorModel = new DoctorModel();
                BeanUtils.copyProperties(one, doctorModel);
                doctorModelList.add(doctorModel);
            });
        }
        return new ResultPageListModel(page, pageSize, doctorService.findDoctorCounts(hospitalCode, name, level), doctorModelList);
    }
@ -72,8 +77,11 @@ public class GcDoctorController {
            @ApiParam(name = "code", value = "患者code", required = true) @RequestParam(value = "code", required = true) String code
    ) {
        Patient patient = patientService.findByCode(code);
        PatientModel patientModel = new PatientModel();
        BeanUtils.copyProperties(patient, patientModel);
        PatientModel patientModel = null;
        if (patientModel != null) {
            patientModel = new PatientModel();
            BeanUtils.copyProperties(patient, patientModel);
        }
        return new ResultOneModel(patientModel);
    }

+ 2 - 1
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/controller/patient/GcPatientController.java

@ -36,8 +36,9 @@ public class GcPatientController {
            @ApiParam(name = "code", value = "患者code", required = true) @RequestParam(value = "code", required = true) String code
    ) {
        Patient patient = patientService.findByCode(code);
        PatientModel patientModel = new PatientModel();
        PatientModel patientModel = null;
        if (patient != null) {
            patientModel = new PatientModel();
            SignFamily signFamily = signFamilyDao.findSignByPatient(patient.getCode());
            BeanUtils.copyProperties(patient, patientModel);
            if (signFamily != null) {