|  | @ -2407,15 +2407,23 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
												
													
														
															|  |             //构建医生排班
 |  |             //构建医生排班
 | 
												
													
														
															|  |             for(Map<String,Object> doctor:doctors){
 |  |             for(Map<String,Object> doctor:doctors){
 | 
												
													
														
															|  |                 for(WlyyDoctorWorkTimeDO time:wlyyDoctorWorkTimeDOs){
 |  |                 for(WlyyDoctorWorkTimeDO time:wlyyDoctorWorkTimeDOs){
 | 
												
													
														
															|  |                     time.setDoctor((String)doctor.get("id"));
 |  | 
 | 
												
													
														
															|  |                     time.setDoctorName((String)doctor.get("name"));
 |  | 
 | 
												
													
														
															|  |                     time.setDept((String)doctor.get("dept_code"));
 |  | 
 | 
												
													
														
															|  |                     time.setDeptName((String)doctor.get("dept_name"));
 |  | 
 | 
												
													
														
															|  |                     time.setHospital((String)doctor.get("org_code"));
 |  | 
 | 
												
													
														
															|  |                     time.setHospitalName((String)doctor.get("org_name"));
 |  | 
 | 
												
													
														
															|  |                     time.setCreateTime(new Date());
 |  | 
 | 
												
													
														
															|  |                     rs.add(time);
 |  | 
 | 
												
													
														
															|  | 
 |  |                     WlyyDoctorWorkTimeDO t = new WlyyDoctorWorkTimeDO();
 | 
												
													
														
															|  | 
 |  |                     t.setDoctor((String)doctor.get("id"));
 | 
												
													
														
															|  | 
 |  |                     t.setDoctorName((String)doctor.get("name"));
 | 
												
													
														
															|  | 
 |  |                     t.setDept((String)doctor.get("dept_code"));
 | 
												
													
														
															|  | 
 |  |                     t.setDeptName((String)doctor.get("dept_name"));
 | 
												
													
														
															|  | 
 |  |                     t.setHospital((String)doctor.get("org_code"));
 | 
												
													
														
															|  | 
 |  |                     t.setHospitalName((String)doctor.get("org_name"));
 | 
												
													
														
															|  | 
 |  |                     t.setCreateTime(new Date());
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |                     t.setType(time.getType());
 | 
												
													
														
															|  | 
 |  |                     t.setStartTime(time.getStartTime());
 | 
												
													
														
															|  | 
 |  |                     t.setEndTime(time.getEndTime());
 | 
												
													
														
															|  | 
 |  |                     t.setDate(time.getDate());
 | 
												
													
														
															|  | 
 |  |                     t.setTimeInterval(time.getTimeInterval());
 | 
												
													
														
															|  | 
 |  |                     rs.add(t);
 | 
												
													
														
															|  |                 }
 |  |                 }
 | 
												
													
														
															|  | 
 |  |                 logger.info(rs.size()+"");
 | 
												
													
														
															|  |             }
 |  |             }
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |         return rs;
 |  |         return rs;
 | 
												
											
												
													
														
															|  | @ -2434,11 +2442,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |             for(WlyyDoctorWorkTimeDO time : workTimeDOs){
 |  |             for(WlyyDoctorWorkTimeDO time : workTimeDOs){
 | 
												
													
														
															|  |                 //医生工作月份
 |  |                 //医生工作月份
 | 
												
													
														
															|  |                 String workMonth = time.getDoctor()+","+time.getDate().substring(0,6);
 |  | 
 | 
												
													
														
															|  | 
 |  |                 String workMonth = time.getDoctor()+","+time.getDate().substring(0,7);
 | 
												
													
														
															|  |                 //判断是否是首次插入医生月份数据,如果是首次,则删除该医生当前月份排班数据数据
 |  |                 //判断是否是首次插入医生月份数据,如果是首次,则删除该医生当前月份排班数据数据
 | 
												
													
														
															|  |                 if(!workMonths.contains(workMonth)){
 |  |                 if(!workMonths.contains(workMonth)){
 | 
												
													
														
															|  |                     workMonths.add(workMonth);
 |  |                     workMonths.add(workMonth);
 | 
												
													
														
															|  |                     List<WlyyDoctorWorkTimeDO> oldTimes = doctorWorkTimeDao.findDoctorWorkTimeByMonth(time.getDoctor(),"%"+time.getDate().substring(0,6)+"%");
 |  | 
 | 
												
													
														
															|  | 
 |  |                     List<WlyyDoctorWorkTimeDO> oldTimes = doctorWorkTimeDao.findDoctorWorkTimeByMonth(time.getDoctor(),"%"+time.getDate().substring(0,7)+"%");
 | 
												
													
														
															|  |                     doctorWorkTimeDao.delete(oldTimes);
 |  |                     doctorWorkTimeDao.delete(oldTimes);
 | 
												
													
														
															|  |                 }
 |  |                 }
 | 
												
													
														
															|  |             }
 |  |             }
 |