三院优化开发

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/DsyyPrescriptionService.java

@@ -336,6 +336,12 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                if (emrList!=null&&emrList.size()!=0){
                    JSONObject emrJson = emrList.getJSONObject(0);
                    WlyyPrescriptionEmrDO prescriptionEmrDO = new WlyyPrescriptionEmrDO();
                    prescriptionEmrDO.setMedicalHistory(emrJson.getString("MEDICALHISTORY"));
                    prescriptionEmrDO.setAssistExamination(emrJson.getString("ASSISTEXAMINATION"));
                    prescriptionEmrDO.setPhysicalExamination(emrJson.getString("PHYSICALEXAMINATION"));
                    prescriptionEmrDO.setPopularHistory(emrJson.getString("POPULARHISTORY"));
                    prescriptionEmrDO.setAllergicHistory(emrJson.getString("ALLERGICHISTORY"));
                    prescriptionEmrDO.setComplaint(emrJson.getString("COMPLAINT"));
                    wlyyPrescriptionVO.setWlyyPrescriptionEmrDO(prescriptionEmrDO);
                }

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

@@ -8918,7 +8918,7 @@ public class StatisticsEsService {
    }
    //诊后随访明细
    public List<Map<String,Object>> followupDetail(String startDate,String endDate,Integer flag,String sort){
    public List<Map<String,Object>> followupDetail(String startDate,String endDate,Integer flag,String sort,String deptCode){
        if(StringUtils.isBlank(sort)){
            sort = "complete";
        }
@@ -8934,6 +8934,10 @@ public class StatisticsEsService {
                endDate = DateUtil.getCurrentYearEndTime();
            }
        }
        String deptCondition= "";
        if (StringUtils.isNoneBlank(dept)){
          deptCondition += " and h.dept_code = '"+deptCode+"' ";
        }
        endDate = endDate +" 23:59:59";
        String sql = "SELECT COUNT(f.id) planNum,COUNT(if(f.`status`=1,1,null)) finishNum, " +
                "COUNT(if(f.`status`=1,if(f.followup_date<=f.followup_plan_date,1,null ),null)) ontimeNum, " +
@@ -8941,7 +8945,7 @@ public class StatisticsEsService {
                ",f.doctor_name doctorName,h.dept_name deptName" +
                " from wlyy_followup f,base_doctor_hospital h " +
                "WHERE f.doctor_code=h.doctor_code and h.del=1 " +
                " and f.followup_date>='"+startDate+"' and f.followup_date<='"+endDate+"' " +
                " and f.followup_date>='"+startDate+"' and f.followup_date<='"+endDate+"' " +deptCondition+
                "GROUP BY f.doctor_name,h.dept_name ";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        final String sortTmp = sort;

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

@@ -2143,9 +2143,11 @@ class EsStatisticsEndpoint extends EnvelopRestEndpoint {
                                             @ApiParam(name = "flag", value = "1本月2近半年3近一年0自定义")
                                             @RequestParam(value = "flag", required = false) Integer flag,
                                             @ApiParam(name = "sort", value = "排序 ")
                                             @RequestParam(value = "sort", required = false) String sort) {
                                             @RequestParam(value = "sort", required = false) String sort,
                                             @ApiParam(name = "dept", value = "科室编码")
                                             @RequestParam(value = "dept", required = false) String dept) {
        try {
            return ListEnvelop.getSuccess("查询成功",statisticsEsService.followupDetail(startTime,endTime,flag,sort));
            return ListEnvelop.getSuccess("查询成功",statisticsEsService.followupDetail(startTime,endTime,flag,sort,dept));
        } catch (Exception e) {
            e.printStackTrace();
            return ListEnvelop.getError("查询失败");