| 
															
																@ -444,7 +444,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " o.description AS \"description\", " + 
															 | 
															
															 | 
															
																                " o.description AS \"description\", " + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " o.disease_img AS \"diseaseImg\"," + 
															 | 
															
															 | 
															
																                " o.disease_img AS \"diseaseImg\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " o.consumer as \"consumer\"," + 
															 | 
															
															 | 
															
																                " o.consumer as \"consumer\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                " o.consumer_name as \"consumerName\", "; 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                " o.consumer_name as \"consumerName\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                " o.consumer_mobile as \"consumerMobile\", "; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        if ("xm_ykyy_wx".equals(wechatId)) { 
															 | 
															
															 | 
															
																        if ("xm_ykyy_wx".equals(wechatId)) { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            if (flag){ 
															 | 
															
															 | 
															
																            if (flag){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                sql = sql + "date_format(o.create_time ,'%Y-%m-%d %H:%i:%S' ) AS createTime,"; 
															 | 
															
															 | 
															
																                sql = sql + "date_format(o.create_time ,'%Y-%m-%d %H:%i:%S' ) AS createTime,"; 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -4166,7 +4167,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "patient.birthday AS \"birthday\"," + 
															 | 
															
															 | 
															
																                "patient.birthday AS \"birthday\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "room.consult_type AS \"consult_type\"," + 
															 | 
															
															 | 
															
																                "room.consult_type AS \"consult_type\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "outpatient.consumer as \"consumer\", " + 
															 | 
															
															 | 
															
																                "outpatient.consumer as \"consumer\", " + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "outpatient.consumer_name as \"consumerName\","; 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                "outpatient.consumer_name as \"consumerName\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                "outpatient.consumer_mobile as \"consumerMobile\", "; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        if ("xm_ykyy_wx".equals(wechatId)) { 
															 | 
															
															 | 
															
																        if ("xm_ykyy_wx".equals(wechatId)) { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            if(flag){ 
															 | 
															
															 | 
															
																            if(flag){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                sql += "date_format(room.reservation_time ,'yyyy-MM-dd hh24:mi:ss' ) AS \"timedate_format\","; 
															 | 
															
															 | 
															
																                sql += "date_format(room.reservation_time ,'yyyy-MM-dd hh24:mi:ss' ) AS \"timedate_format\","; 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -5541,7 +5543,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "outpatient.description AS \"description\"," + 
															 | 
															
															 | 
															
																                "outpatient.description AS \"description\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "outpatient.origin_con_no AS \"origin_con_no\"," + 
															 | 
															
															 | 
															
																                "outpatient.origin_con_no AS \"origin_con_no\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "outpatient.consumer as \"consumer\"," + 
															 | 
															
															 | 
															
																                "outpatient.consumer as \"consumer\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "outpatient.consumer_name as \"consumer_name\", " + 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                "outpatient.consumer_name as \"consumer_name\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                "outpatient.consumer_mobile as \"consumerMobile\"," + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "room.reservation_type AS \"reservation_type\" " + 
															 | 
															
															 | 
															
																                "room.reservation_type AS \"reservation_type\" " + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "FROM " + 
															 | 
															
															 | 
															
																                "FROM " + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "wlyy_hospital_waiting_room room," + 
															 | 
															
															 | 
															
																                "wlyy_hospital_waiting_room room," + 
															 |