|
@ -1239,14 +1239,13 @@ public class DoctorController extends BaseController {
|
|
Doctor doctor = doctorInfoService.getDoctor2ByParient(parientCode, consultCode);
|
|
Doctor doctor = doctorInfoService.getDoctor2ByParient(parientCode, consultCode);
|
|
JSONObject json = null;
|
|
JSONObject json = null;
|
|
if (doctor != null) {
|
|
if (doctor != null) {
|
|
json = new JSONObject();
|
|
|
|
json.put("code", doctor.getCode());
|
|
|
|
json.put("name", doctor.getName());
|
|
|
|
json.put("photo", doctor.getPhoto());
|
|
|
|
json.put("id", doctor.getId());
|
|
|
|
json.put("hospital", doctor.getHospital());
|
|
|
|
json.put("hosptialName", doctor.getHospitalName());
|
|
|
|
|
|
|
|
|
|
json = new JSONObject(doctor);
|
|
|
|
if (json.has("password")) {
|
|
|
|
json.remove("password");
|
|
|
|
}
|
|
|
|
if (json.has("salt")) {
|
|
|
|
json.remove("salt");
|
|
|
|
}
|
|
JSONObject iswork = workTimeService.isDoctorWorking(doctor.getCode());
|
|
JSONObject iswork = workTimeService.isDoctorWorking(doctor.getCode());
|
|
if (iswork.getString("status").equals("1")) {
|
|
if (iswork.getString("status").equals("1")) {
|
|
json.put("isworking", 1);
|
|
json.put("isworking", 1);
|