|  | @ -3366,7 +3366,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
												
													
														
															|  |             } else {
 |  |             } else {
 | 
												
													
														
															|  |                 sql += " AND p.create_time <='" + endTime + " 23:59:59'";
 |  |                 sql += " AND p.create_time <='" + endTime + " 23:59:59'";
 | 
												
													
														
															|  |             }
 |  |             }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         }
 |  |         }
 | 
												
													
														
															|  |         sql += " order by p.create_time desc ";
 |  |         sql += " order by p.create_time desc ";
 | 
												
													
														
															|  |         /*       sql += " LIMIT " + (page - 1) * size + "," + size + "";*/
 |  |         /*       sql += " LIMIT " + (page - 1) * size + "," + size + "";*/
 | 
												
											
												
													
														
															|  | @ -3581,10 +3580,10 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
												
													
														
															|  |                 }
 |  |                 }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |                 String opf = "";
 |  |                 String opf = "";
 | 
												
													
														
															|  |                 if (m.get("oneself_pickup_flg") == null) {
 |  | 
 | 
												
													
														
															|  | 
 |  |                 if (m.get("oneselfPickupFlg") == null) {
 | 
												
													
														
															|  |                     opf = null;
 |  |                     opf = null;
 | 
												
													
														
															|  |                 }else {
 |  |                 }else {
 | 
												
													
														
															|  |                     String opff = m.get("oneself_pickup_flg").toString();
 |  | 
 | 
												
													
														
															|  | 
 |  |                     String opff = m.get("oneselfPickupFlg").toString();
 | 
												
													
														
															|  |                     if (opff.equals("1")){
 |  |                     if (opff.equals("1")){
 | 
												
													
														
															|  |                         opf = "自取";
 |  |                         opf = "自取";
 | 
												
													
														
															|  |                     }else if (opff.equals("0")){
 |  |                     }else if (opff.equals("0")){
 |