|  | @ -1265,7 +1265,7 @@ public class PatientInfoPlatFormService {
 | 
												
													
														
															|  |                 " INNER JOIN base_patient p ON ord.patient = p.id \n" +
 |  |                 " INNER JOIN base_patient p ON ord.patient = p.id \n" +
 | 
												
													
														
															|  |                 " AND p.del = 1 \n" +
 |  |                 " AND p.del = 1 \n" +
 | 
												
													
														
															|  |                 " WHERE " +
 |  |                 " WHERE " +
 | 
												
													
														
															|  |                 " ord.STATUS = 1 "+filter;
 |  | 
 | 
												
													
														
															|  | 
 |  |                 " ord.STATUS = 1  AND NOT EXISTS ( SELECT 1 FROM base_emergency_warn_log log WHERE log.order_id = ord.id ) "+filter;
 | 
												
													
														
															|  |         String sql2 = " SELECT \n" +
 |  |         String sql2 = " SELECT \n" +
 | 
												
													
														
															|  |                 " '22' AS 'OrderType',\n" +
 |  |                 " '22' AS 'OrderType',\n" +
 | 
												
													
														
															|  |                 " p.archive_type archiveType,\n" +
 |  |                 " p.archive_type archiveType,\n" +
 | 
												
											
												
													
														
															|  | @ -1287,7 +1287,7 @@ public class PatientInfoPlatFormService {
 | 
												
													
														
															|  |                 " FROM\n" +
 |  |                 " FROM\n" +
 | 
												
													
														
															|  |                 " base_security_monitoring_order ord \n" +
 |  |                 " base_security_monitoring_order ord \n" +
 | 
												
													
														
															|  |                 " INNER JOIN base_patient p ON ord.patient = p.id \n" +
 |  |                 " INNER JOIN base_patient p ON ord.patient = p.id \n" +
 | 
												
													
														
															|  |                 " where ord.status = 1"+filter;
 |  | 
 | 
												
													
														
															|  | 
 |  |                 " where ord.status = 1  AND NOT EXISTS ( SELECT 1 FROM base_emergency_warn_log log WHERE log.order_id = ord.id ) "+filter;
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         String sql = "select * FROM (" +
 |  |         String sql = "select * FROM (" +
 | 
												
													
														
															|  |                 " "+sql1+" UNION "+sql2 +
 |  |                 " "+sql1+" UNION "+sql2 +
 | 
												
											
												
													
														
															|  | @ -1380,13 +1380,13 @@ public class PatientInfoPlatFormService {
 | 
												
													
														
															|  |                 " base_emergency_assistance_order ord " +
 |  |                 " base_emergency_assistance_order ord " +
 | 
												
													
														
															|  |                 " INNER JOIN base_patient p ON ord.patient = p.id and p.del=1  \n" +
 |  |                 " INNER JOIN base_patient p ON ord.patient = p.id and p.del=1  \n" +
 | 
												
													
														
															|  |                 " WHERE\n" +
 |  |                 " WHERE\n" +
 | 
												
													
														
															|  |                 "  ord.STATUS = 1"+filter;
 |  | 
 | 
												
													
														
															|  | 
 |  |                 "  ord.STATUS = 1  AND NOT EXISTS ( SELECT 1 FROM base_emergency_warn_log log WHERE log.order_id = ord.id ) "+filter;
 | 
												
													
														
															|  |         //安防监护
 |  |         //安防监护
 | 
												
													
														
															|  |         String securitySql = "SELECT count( ord.id ) warningCount \n" +
 |  |         String securitySql = "SELECT count( ord.id ) warningCount \n" +
 | 
												
													
														
															|  |                 " FROM\n" +
 |  |                 " FROM\n" +
 | 
												
													
														
															|  |                 " base_security_monitoring_order ord\n" +
 |  |                 " base_security_monitoring_order ord\n" +
 | 
												
													
														
															|  |                 " INNER JOIN base_patient p ON ord.patient = p.id and p.del=1 \n" +
 |  |                 " INNER JOIN base_patient p ON ord.patient = p.id and p.del=1 \n" +
 | 
												
													
														
															|  |                 " AND ord.STATUS = 1"+filter;
 |  | 
 | 
												
													
														
															|  | 
 |  |                 " AND ord.STATUS = 1  AND NOT EXISTS ( SELECT 1 FROM base_emergency_warn_log log WHERE log.order_id = ord.id ) "+filter;
 | 
												
													
														
															|  |         String sqlCount = "SELECT\n" +
 |  |         String sqlCount = "SELECT\n" +
 | 
												
													
														
															|  |                 " sum( warningCount ) warningCount\n" +
 |  |                 " sum( warningCount ) warningCount\n" +
 | 
												
													
														
															|  |                 " FROM\n" +
 |  |                 " FROM\n" +
 |