三院优化开发

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

@@ -11105,6 +11105,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            }else {
                prescriptionVO.setPayType(0);
            }
            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(prescriptionVO.getOutpatientId()).orElse(null);
            prescriptionVO.setOutpatientDO(wlyyOutpatientDO);
            return prescriptionVO;
        }

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

@@ -9011,14 +9011,16 @@ public class StatisticsEsService {
        }
        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, " +
                "COUNT(if(f.followup_date>=f.followup_plan_date,1,null)) overTimeNum,count(DISTINCT f.patient_code) patientNum " +
                "COUNT(if(f.`status`=1,if(f.followup_date<=f.followup_plan_date,1,null ),null)) ontimeNum, " +
                "COUNT(if(f.followup_date>f.followup_plan_date,1,null)) overTimeNum,count(DISTINCT IF(f.status=1,(f.patient_code),NULL)) patientNum " +
                ",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+"' " +
                "GROUP BY f.doctor_name,h.dept_name ";
        System.out.println("sql==========="+sql);
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        final String sortTmp = sort;
        Map<String, List<Map<String, Object>>> resList = list.stream().collect(Collectors.groupingBy(e -> e.get("deptName").toString()));
        List<Map<String,Object>> tmpList = new ArrayList<>();

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionVO.java

@@ -1,6 +1,7 @@
package com.yihu.jw.restmodel.hospital.prescription;
import com.yihu.jw.entity.hospital.prescription.WlyyInspectionDO;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionEmrDO;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
@@ -409,6 +410,16 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "是否特殊病种", example = "模块1")
    private String isDisease;
    @ApiModelProperty(value = "门诊表", example = "模块1")
    private WlyyOutpatientDO outpatientDO;
    public WlyyOutpatientDO getOutpatientDO() {
        return outpatientDO;
    }
    public void setOutpatientDO(WlyyOutpatientDO outpatientDO) {
        this.outpatientDO = outpatientDO;
    }
    public String getDiseaseCode() {
        return diseaseCode;