|  | @ -27,6 +27,7 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
 | 
												
													
														
															|  | import org.springframework.jdbc.core.JdbcTemplate;
 |  | import org.springframework.jdbc.core.JdbcTemplate;
 | 
												
													
														
															|  | import org.springframework.stereotype.Service;
 |  | import org.springframework.stereotype.Service;
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | import java.text.DecimalFormat;
 | 
												
													
														
															|  | import java.util.*;
 |  | import java.util.*;
 | 
												
													
														
															|  | import java.util.stream.Collectors;
 |  | import java.util.stream.Collectors;
 | 
												
													
														
															|  | 
 |  | 
 | 
												
											
												
													
														
															|  | @ -681,10 +682,14 @@ public class StatisticsService {
 | 
												
													
														
															|  |                 "where  dict.dict_name='service_type' and  dict.dict_code is not null and dict_code<>5  \n" +
 |  |                 "where  dict.dict_name='service_type' and  dict.dict_code is not null and dict_code<>5  \n" +
 | 
												
													
														
															|  |                 " GROUP BY dict.dict_code; ";
 |  |                 " GROUP BY dict.dict_code; ";
 | 
												
													
														
															|  |         List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
 |  |         List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
 | 
												
													
														
															|  | //        List<SaveModel> list = statisticsUtilService.findDateAllQuotaLevel1Sort(endDate,endDate,area,level,"37",SaveModel.timeLevel_DDL,null,null);
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |         String older = "  select count(id) from base_patient where archive_type=1 ";
 | 
												
													
														
															|  | 
 |  |         Integer count = jdbcTemplate.queryForObject(older,Integer.class);
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |         for(Map<String,Object> map:list){
 |  |         for(Map<String,Object> map:list){
 | 
												
													
														
															|  |             JSONObject json = new JSONObject();
 |  |             JSONObject json = new JSONObject();
 | 
												
													
														
															|  |             json.put("num",Integer.parseInt(map.get("total").toString()) );
 |  | 
 | 
												
													
														
															|  | 
 |  |             DecimalFormat df = new DecimalFormat("0.00");
 | 
												
													
														
															|  | 
 |  |             json.put("num", df.format((Integer.parseInt(map.get("total").toString())*1.00) / count * 100));
 | 
												
													
														
															|  |             json.put("code",map.get("dict_code").toString());
 |  |             json.put("code",map.get("dict_code").toString());
 | 
												
													
														
															|  |             json.put("name",map.get("dict_value").toString());
 |  |             json.put("name",map.get("dict_value").toString());
 | 
												
													
														
															|  |             jsonArray.add(json);
 |  |             jsonArray.add(json);
 |