suqinyi 1 年之前
父节点
当前提交
c4ddb8ddf1

+ 23 - 20
business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@ -6322,6 +6322,7 @@ public class StatisticsEsService {
     * 诊查费(21) + 处方费(3)
     */
    public JSONObject getDrugAndExaminationFeeList(ScreenQvo qvo) throws Exception {
        System.out.println("getDrugAndExaminationFeeList获取:诊查费(21) + 处方费(3)");
        if (qvo.getFlag() == 1) {
            //本月
            qvo.setStartDate(DateUtil.getFirstMonthDay());
@ -6335,6 +6336,7 @@ public class StatisticsEsService {
            qvo.setStartDate(DateUtil.getCurrentYearStartTime());
            qvo.setEndDate(DateUtil.getCurrentYearEndTime());
        }
        System.out.println("赋值时间-参数:"+JSON.toJSONString(qvo));
        HashMap<String, String> map = new HashMap<>();
        JSONObject result = new JSONObject();
        map.put("drugFree", "3"); //诊查费
@ -6349,6 +6351,7 @@ public class StatisticsEsService {
                result.put(key, array);
            } else {
                //按日
                System.out.println("执行dateTotalStatistics2方法==>时间"+qvo.getStartDate()+" -- "+qvo.getEndDate());
                JSONArray array = dateTotalStatistics2(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), value, null, SaveModel.timeLevel_ZL, null);
                result.put(key, addWeekdayToJSONArray(array));
            }
@ -6558,34 +6561,34 @@ public class StatisticsEsService {
            String header[] = {"科室", "医生", "问诊量", " 接诊量", "接诊率", "处方量", "诊查费", "药品费", "总收入"};
            int i = 0;
            for (String h : header) {
                addCell(sheet, 0, i, h);
                addCellHospital(sheet, 0, i, h);
                i++;
            }
            int j = 1;
            for (Map<String, Object> map : deptList) {
                addCell(sheet, j, 0, String.valueOf(map.get("deptName")) + "全体");
                addCell(sheet, j, 1, String.valueOf(map.get("doctorName")));
                addCell(sheet, j, 2, String.valueOf(map.get("total")));
                addCell(sheet, j, 3, String.valueOf(map.get("haveReceiveCount")));//接诊量
                addCell(sheet, j, 4, String.valueOf(map.get("jzl")));//接诊率
                addCell(sheet, j, 5, String.valueOf(map.get("prescription_volume")));//处方量
                addCell(sheet, j, 6, String.valueOf(map.get("free_exam")));//诊查费
                addCell(sheet, j, 7, String.valueOf(map.get("free_prescription")));//药品费
                addCell(sheet, j, 8, String.valueOf(map.get("fee_total")));//药品费
                addCellHospital(sheet, j, 0, String.valueOf(map.get("deptName")) + "全体");
                addCellHospital(sheet, j, 1, String.valueOf(map.get("doctorName")));
                addCellHospital(sheet, j, 2, String.valueOf(map.get("total")));
                addCellHospital(sheet, j, 3, String.valueOf(map.get("haveReceiveCount")));//接诊量
                addCellHospital(sheet, j, 4, String.valueOf(map.get("jzl")));//接诊率
                addCellHospital(sheet, j, 5, String.valueOf(map.get("prescription_volume")));//处方量
                addCellHospital(sheet, j, 6, String.valueOf(map.get("free_exam")));//诊查费
                addCellHospital(sheet, j, 7, String.valueOf(map.get("free_prescription")));//药品费
                addCellHospital(sheet, j, 8, String.valueOf(map.get("fee_total")));//药品费
                j++;//换行
                //填充医生数据
                List<Map<String, Object>> doctorList = (List<Map<String, Object>>) linkedHashMap.get(map.get("deptCode"));//取出科室的数据
                for (Map<String, Object> doctorMap : doctorList) {
                    addCell(sheet, j, 0, String.valueOf(map.get("deptName")));//科室
                    addCell(sheet, j, 1, String.valueOf(doctorMap.get("doctorName")));
                    addCell(sheet, j, 2, String.valueOf(doctorMap.get("total")));
                    addCell(sheet, j, 3, String.valueOf(doctorMap.get("haveReceiveCount")));//接诊量
                    addCell(sheet, j, 4, String.valueOf(doctorMap.get("jzl")));//接诊率
                    addCell(sheet, j, 5, String.valueOf(doctorMap.get("prescription_volume")));//处方量
                    addCell(sheet, j, 6, String.valueOf(doctorMap.get("free_exam")));//诊查费
                    addCell(sheet, j, 7, String.valueOf(doctorMap.get("free_prescription")));//药品费
                    addCell(sheet, j, 8, String.valueOf(doctorMap.get("fee_total")));//药品费
                    addCellHospital(sheet, j, 0, String.valueOf(map.get("deptName")));//科室
                    addCellHospital(sheet, j, 1, String.valueOf(doctorMap.get("doctorName")));
                    addCellHospital(sheet, j, 2, String.valueOf(doctorMap.get("total")));
                    addCellHospital(sheet, j, 3, String.valueOf(doctorMap.get("haveReceiveCount")));//接诊量
                    addCellHospital(sheet, j, 4, String.valueOf(doctorMap.get("jzl")));//接诊率
                    addCellHospital(sheet, j, 5, String.valueOf(doctorMap.get("prescription_volume")));//处方量
                    addCellHospital(sheet, j, 6, String.valueOf(doctorMap.get("free_exam")));//诊查费
                    addCellHospital(sheet, j, 7, String.valueOf(doctorMap.get("free_prescription")));//药品费
                    addCellHospital(sheet, j, 8, String.valueOf(doctorMap.get("fee_total")));//药品费
                    j++;//换行
                }
            }
@ -6945,7 +6948,7 @@ public class StatisticsEsService {
    /**
     * excel 增加单元格
     */
    private void addCell(WritableSheet ws, int row, int column, String data) throws WriteException {
    private void addCellHospital(WritableSheet ws, int row, int column, String data) throws WriteException {
        Label label = new Label(column, row, data);
        ws.addCell(label);
    }

+ 8 - 8
business/es-service/src/main/java/com/yihu/jw/es/util/ElasticsearchUtil.java

@ -848,7 +848,7 @@ public class ElasticsearchUtil {
            }
        }
        sql.append(groupBy);
        logger.info("sql:"+sql);
        //logger.info("sql:"+sql);
        return excuteEs7(sql.toString(), SaveModel.class, "", "");
    }
@ -955,7 +955,7 @@ public class ElasticsearchUtil {
            }
        }
        sql.append(groupBy);
        logger.info("sql:"+sql);
        //logger.info("sql:"+sql);
        return excuteEs7(sql.toString(), SaveModel.class, "", "");
    }
@ -1310,7 +1310,7 @@ public class ElasticsearchUtil {
            }
        }
        sql.append(groupBy);
        logger.info("sql:"+sql);
        //logger.info("sql:"+sql);
        return excuteEs7(sql.toString(), SaveModel.class, "", "");
    }
@ -1439,7 +1439,7 @@ public class ElasticsearchUtil {
            }
        }
        sql.append(groupBy);
        logger.info("sql:"+sql);
        //logger.info("sql:"+sql);
        return excuteEs7(sql.toString(), SaveModel.class, "", "");
    }
@ -1609,7 +1609,7 @@ public class ElasticsearchUtil {
            }
        }
        sql.append(groupBy);
        logger.info("sql :" + sql.toString());
        //logger.info("sql :" + sql.toString());
        return excuteEs7(sql.toString(), SaveModel.class, "", "");
    }
@ -1748,7 +1748,7 @@ public class ElasticsearchUtil {
            }
        }
        sql.append(groupBy);
        logger.info("sql :" + sql.toString());
        //logger.info("sql :" + sql.toString());
        return excuteEs7(sql.toString(), SaveModel.class, "", "");
    }
@ -1890,7 +1890,7 @@ public class ElasticsearchUtil {
            }
        }
        sql.append(groupBy);
        logger.info("sql :" + sql.toString());
        //logger.info("sql :" + sql.toString());
        return excuteEs7(sql.toString(), SaveModel.class, "", "");
    }
@ -2028,7 +2028,7 @@ public class ElasticsearchUtil {
            }
        }
        sql.append(groupBy);
        logger.info("sql :" + sql.toString());
        //logger.info("sql :" + sql.toString());
        return excuteEs7(sql.toString(), SaveModel.class, "", "");
    }

+ 8 - 7
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/statistics/EsStatisticsEndpoint.java

@ -1197,6 +1197,7 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
            result = statisticsEsService.getTotal3Data(qvo);
        } catch (Exception e) {
            e.printStackTrace();
            System.out.println("接口(getTotal3Data):报错==>入参:"+JSON.toJSONString(qvo));
        }
        return success(result);
    }
@ -1214,6 +1215,7 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
            result = statisticsEsService.getKindsConsultCount(qvo);
        } catch (Exception e) {
            e.printStackTrace();
            System.out.println("接口(getKindsConsultCount):报错==>入参:"+JSON.toJSONString(qvo));
        }
        return success(result);
    }
@ -1235,6 +1237,7 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
            result = statisticsEsService.getConsultAndPrescriptionList(qvo);
        } catch (Exception e) {
            e.printStackTrace();
            System.out.println("接口(getConsultAndPrescriptionList):报错==>入参:"+JSON.toJSONString(qvo));
        }
        return success(result);
    }
@ -1257,6 +1260,7 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
            result = statisticsEsService.getDrugAndExaminationFeeList(qvo);
        } catch (Exception e) {
            e.printStackTrace();
            System.out.println("接口(getDrugAndExaminationFeeList):报错==>入参:"+JSON.toJSONString(qvo));
        }
        return success(result);
    }
@ -1276,6 +1280,7 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
            result = statisticsEsService.getDeptOrDoctorVolumeList(qvo);
        } catch (Exception e) {
            e.printStackTrace();
            System.out.println("接口(getDeptOrDoctorVolumeList):报错==>入参:"+JSON.toJSONString(qvo));
        }
        return success(result);
    }
@ -1297,6 +1302,7 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
            result = statisticsEsService.getAllHospitalDetails(qvo);
        } catch (Exception e) {
            e.printStackTrace();
            System.out.println("接口(getAllHospitalDetails):报错==>入参:"+JSON.toJSONString(qvo));
        }
        return success(result);
    }
@ -1308,22 +1314,17 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.Statistics.exportHospitalDetails)
    @ApiOperation(value = "【导出全院明细】")
    public void exportHospitalDetails(@RequestParam(required = true) String strJson, HttpServletResponse response) {
        JSONObject result = new JSONObject();
        ScreenQvo qvo = JSON.parseObject(strJson, ScreenQvo.class);
        try {
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename=" + new String("hospitalDetails.xls"));
            ScreenQvo qvo = JSON.parseObject(strJson, ScreenQvo.class);
            OutputStream os = response.getOutputStream();
            statisticsEsService.getAllDeptAndDoctorDetails(qvo,os); //导出
        } catch (Exception e) {
            e.printStackTrace();
            System.out.println("接口(exportHospitalDetails):报错==>入参:"+JSON.toJSONString(qvo));
        }
    }
    private void addCell(WritableSheet ws, int row, int column, String data) throws WriteException {
        Label label = new Label(column, row, data);
        ws.addCell(label);
    }
}