suqinyi преди 3 месеца
родител
ревизия
bfce4a3986

+ 1 - 0
business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@ -8038,6 +8038,7 @@ public class StatisticsEsService {
                "	)'count'\n" +
                "FROM\n" +
                "	age_table q ORDER BY q.sort ";
        System.out.println("患者年龄分布=>"+sql);
        HashMap<String, Object> resultMap = new HashMap<>();
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        int allCount = 0;

+ 6 - 10
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/health/controller/DoctorHealthController.java

@ -61,16 +61,12 @@ public class DoctorHealthController extends BaseController {
	 */
	@RequestMapping(value = "chart",method = RequestMethod.POST)
	@ApiOperation("根据患者标志获取健康指标(图表)")
	public String getHealthIndexChartByPatient(@ApiParam(name="patient",value="患者代码",defaultValue = "eb0b478fbe9245428ecf63cd7517206f")
												   @RequestParam(value="patient",required = true) String patient,
											   @ApiParam(name="type",value="指标类型",defaultValue = "1")
											   @RequestParam(value="type",required = true) int type,
											   @ApiParam(name="gi_type",value="就餐类型",defaultValue = "1")
												   @RequestParam(value = "gi_type",required = false) int gi_type,
											   @ApiParam(name="begin",value="开始时间",defaultValue = "2017-05-22 00:00:00")
											   @RequestParam(value="begin",required = true) String begin,
											   @ApiParam(name="end",value="结束时间",defaultValue = "2017-06-02 00:00:00")
												   @RequestParam(value="end",required = true) String end) {
	public String getHealthIndexChartByPatient(
			@ApiParam(name="patient",value="患者代码",defaultValue = "eb0b478fbe9245428ecf63cd7517206f") @RequestParam(value="patient",required = true) String patient,
			@ApiParam(name="type",value="指标类型",defaultValue = "1") @RequestParam(value="type",required = true) int type,
			@ApiParam(name="gi_type",value="就餐类型",defaultValue = "1") @RequestParam(value = "gi_type",required = false) int gi_type,
			@ApiParam(name="begin",value="开始时间",defaultValue = "2017-05-22 00:00:00") @RequestParam(value="begin",required = true) String begin,
			@ApiParam(name="end",value="结束时间",defaultValue = "2017-06-02 00:00:00") @RequestParam(value="end",required = true) String end) {
		try {
			JSONArray jsonArray = healthIndexService.findChartByPatient(patient,type,gi_type,begin,end);
			List<Map<String,Object>> maps = new ArrayList<>();