|  | @ -822,7 +822,13 @@ public class PatientService extends TokenService {
 | 
												
													
														
															|  |                 "  s.server_type " +
 |  |                 "  s.server_type " +
 | 
												
													
														
															|  |                 ") c ON d. CODE = c.serverType " +
 |  |                 ") c ON d. CODE = c.serverType " +
 | 
												
													
														
															|  |                 "WHERE " +
 |  |                 "WHERE " +
 | 
												
													
														
															|  |                 " d.`year` = '" + DateUtil.getSignYear() + "' " +
 |  | 
 | 
												
													
														
															|  | 
 |  |                 " d.`year` = '" + DateUtil.getSignYear() + "' " ;
 | 
												
													
														
															|  | 
 |  |         if(isSlowDisease){
 | 
												
													
														
															|  | 
 |  |             //获取预警分组数量
 | 
												
													
														
															|  | 
 |  |             totalGSql = totalGSql +"  AND d. CODE in (4,5)  ";
 | 
												
													
														
															|  | 
 |  |         }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |         totalGSql = totalGSql +
 | 
												
													
														
															|  |                 "ORDER BY " +
 |  |                 "ORDER BY " +
 | 
												
													
														
															|  |                 " d.sort ASC";
 |  |                 " d.sort ASC";
 | 
												
													
														
															|  | 
 |  | 
 | 
												
											
												
													
														
															|  | @ -848,7 +854,7 @@ public class PatientService extends TokenService {
 | 
												
													
														
															|  |                 "   f.patient = p.code ";
 |  |                 "   f.patient = p.code ";
 | 
												
													
														
															|  |         if(isSlowDisease){
 |  |         if(isSlowDisease){
 | 
												
													
														
															|  |             //获取预警分组数量
 |  |             //获取预警分组数量
 | 
												
													
														
															|  |             fousGSql = fousGSql +"   AND p.standard_status = 1 ";
 |  | 
 | 
												
													
														
															|  | 
 |  |             fousGSql = fousGSql +"   AND p.standard_status = 1  ";
 | 
												
													
														
															|  |         }else{
 |  |         }else{
 | 
												
													
														
															|  |             //获取微信关注量分组数量
 |  |             //获取微信关注量分组数量
 | 
												
													
														
															|  |             fousGSql = fousGSql +"   AND p.openid IS NOT NULL AND p.openid <>'' " ;
 |  |             fousGSql = fousGSql +"   AND p.openid IS NOT NULL AND p.openid <>'' " ;
 | 
												
											
												
													
														
															|  | @ -867,7 +873,14 @@ public class PatientService extends TokenService {
 | 
												
													
														
															|  |                 "  s.server_type " +
 |  |                 "  s.server_type " +
 | 
												
													
														
															|  |                 ") c ON d. CODE = c.serverType " +
 |  |                 ") c ON d. CODE = c.serverType " +
 | 
												
													
														
															|  |                 "WHERE " +
 |  |                 "WHERE " +
 | 
												
													
														
															|  |                 " d.`year` = '" + DateUtil.getSignYear() + "' " +
 |  | 
 | 
												
													
														
															|  | 
 |  |                 " d.`year` = '" + DateUtil.getSignYear() + "' " ;
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |         if(isSlowDisease){
 | 
												
													
														
															|  | 
 |  |             //获取预警分组数量
 | 
												
													
														
															|  | 
 |  |             fousGSql = fousGSql +"  AND d. CODE in (4,5)  ";
 | 
												
													
														
															|  | 
 |  |         }
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |         fousGSql = fousGSql +
 | 
												
													
														
															|  |                 "ORDER BY " +
 |  |                 "ORDER BY " +
 | 
												
													
														
															|  |                 " d.sort ASC";
 |  |                 " d.sort ASC";
 | 
												
													
														
															|  |         List<Map<String, Object>> fousG = jdbcTemplate.queryForList(fousGSql);
 |  |         List<Map<String, Object>> fousG = jdbcTemplate.queryForList(fousGSql);
 |