diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java
index 2cd5893..8e9490d 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java
@@ -627,7 +627,7 @@ public class DtdyrmFmService implements IdtdyrmFmService {
             patientsQuery.setYn(1);
             patientsQuery.setHospitalId("2100002419");
             for (AppointmentModel appointmentModel : list) {
-                if (StringUtils.isNotEmpty(appointmentModel.getDoctor())){
+
                     Map<String, Object> result = new LinkedHashMap<>();
                     String idCard=appointmentModel.getIdCard();
                     String phone=appointmentModel.getPhone();
@@ -685,11 +685,11 @@ public class DtdyrmFmService implements IdtdyrmFmService {
                     result.put("服务截至时间",DateUtil.gety_m_dhm(appointmentModel.getSerEndTime()));
                     result.put("建档时间",DateUtil.getYyyyMmDd(appointmentModel.getBookbuildingDate()));
                     result.put("就诊时间",DateUtil.gety_m_dhm(appointmentModel.getCheckTime()));
-                    result.put("就诊医生",appointmentModel.getDoctor());
+                    result.put("就诊医生",StringUtils.isNotEmpty(appointmentModel.getDoctor())?appointmentModel.getDoctor():"-");
                     result.put("科室", appointmentModel.getDept());
                     result.put("预约时间",DateUtil.gety_m_dhm(appointmentModel.getCreated()));
                     results.add(result);
-                }
+
             }
         }
         ResponseUtil.responseExcel(cnames, results, response);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java
index 7335334..650978a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java
@@ -675,7 +675,6 @@ public class PatientDtController extends BaseController {
                b=false;
            }
            List<AppointmentModel> checkList=new ArrayList<>();
-
            PatientsQuery patientsQuery =new PatientsQuery();
            patientsQuery.setYn(1);
            patientsQuery.setHospitalId(hospitalId);
@@ -828,8 +827,7 @@ public class PatientDtController extends BaseController {
             for (int i = 0,j=modelList.size(); i < j; i++) {
                 AppointmentModel appointmentModel=  modelList.get(i);
                 String depts=appointmentModel.getDept();
-                String doctorName=appointmentModel.getDoctor();
-                if (StringUtils.isNotEmpty(depts)&&StringUtils.isNotEmpty(doctorName)){
+                if (StringUtils.isNotEmpty(depts)){
                     AppointmentData appointmentData= params.get(depts);
                     if (appointmentData==null){
                         appointmentData=new AppointmentData();
@@ -949,8 +947,7 @@ public class PatientDtController extends BaseController {
             patientsQuery.setHospitalId(hospitalId);
             for (int i = 0,j=modelList.size(); i < j; i++) {
                 AppointmentModel appointmentModel=  modelList.get(i);
-                String doctorName=appointmentModel.getDoctor();
-                if (StringUtils.isNotEmpty(doctorName)){
+                String doctorName=StringUtils.isNotEmpty(appointmentModel.getDoctor())?appointmentModel.getDoctor():"-";
                     AppointmentData appointmentData= params.get(doctorName);
                     if (appointmentData==null){
                         appointmentData=new AppointmentData();
@@ -994,7 +991,6 @@ public class PatientDtController extends BaseController {
                     }
                     appointmentData.setAppointmentNum(appointmentData.getAppointmentNum()!=null?appointmentData.getAppointmentNum()+1:1);
                     params.put(doctorName,appointmentData);
-                }
             }
             baseResponse.setObject(params);
         }
@@ -1053,10 +1049,8 @@ public class PatientDtController extends BaseController {
                     patientsQuery.setHospitalId(hospitalId);
                     for (int i = 0,j=modelList.size(); i < j; i++) {
                         AppointmentModel appointmentModel=  modelList.get(i);
-                        String doctorName=appointmentModel.getDoctor();
-
-                        if (StringUtils.isNotEmpty(doctorName)){
-                            String depts=appointmentModel.getDept();
+                        String doctorName=StringUtils.isNotEmpty(appointmentModel.getDoctor())?appointmentModel.getDoctor():"-";
+                        String depts=appointmentModel.getDept();
                             Map<String,Object> appointmentData= params1.get(doctorName+","+depts);
                             if (appointmentData==null){
                                 appointmentData=new HashMap<>();
@@ -1098,7 +1092,7 @@ public class PatientDtController extends BaseController {
                             }
                             appointmentData.put("appointmentNum",appointmentData.get("appointmentNum")!=null?Integer.valueOf(String.valueOf(appointmentData.get("appointmentNum")))+1:1);
                             params1.put(doctorName+","+depts,appointmentData);
-                        }
+
                     }
                     for (Map.Entry<String,Map<String,Object>> entry: params1.entrySet()) {
                         Map<String,Object> value= entry.getValue();