Merge remote-tracking branch 'origin/develop' into develop

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/controller/ConDoctorController.java

@@ -20,6 +20,7 @@ import com.renkang.consultation.mapper.ConDepartmentMapper;
 import com.renkang.consultation.mapper.ConResourceMapper;
 import com.renkang.consultation.mapper.ESConDoctorMapper;
 import com.renkang.consultation.service.IConDepartmentService;
+import com.renkang.consultation.service.IConDoctorSchedulingService;
 import com.renkang.consultation.service.IConDoctorService;
 import com.renkang.consultation.service.IConResourceService;
 import com.renkang.consultation.util.PicturesUtils;
@@ -85,6 +86,8 @@ public class ConDoctorController extends JeecgController<ConDoctor, IConDoctorSe
     private DictUtil dictUtil;
     @Autowired
     private ConDepartmentMapper conDepartmentMapper;
+    @Autowired
+    private IConDoctorSchedulingService conDoctorSchedulingService;
 
     /**
      * 分页列表查询
@@ -565,7 +568,14 @@ public class ConDoctorController extends JeecgController<ConDoctor, IConDoctorSe
                     doctorExAndUser.setConDoctor(doctorVO);
                     doctorExAndUser.setSysUserModel(userVO);
                     conDoctorService.saveDoctorUser(doctorExAndUser);
-
+                    // 生成专家排班
+                    String doctorId = doctorExAndUser.getConDoctor().getId();
+                    List<ConDoctorScheduling> doctorSchedulingList = conDoctorSchedulingService.getDoctorScheduling(doctorId);
+                    for (ConDoctorScheduling conDoctorScheduling : doctorSchedulingList) {
+                        conDoctorScheduling.setAmNum("8");
+                        conDoctorScheduling.setPmNum("8");
+                    }
+                    conDoctorSchedulingService.updateDoctorScheduling(doctorSchedulingList);
                     System.out.println(rowIndex);
                 }
                 return "处理成功";

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConDoctorServiceImpl.java

@@ -441,6 +441,7 @@ public class ConDoctorServiceImpl extends ServiceImpl<ConDoctorMapper, ConDoctor
 
         // 保存医生信息
         int i = saveDoctor(conDoctor);
+        conDoctorExAndUser.getConDoctor().setId(conDoctor.getId());
 
         // 检查是否成功插入医生信息，如果失败则返回错误
         if (i == 0) {