代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/disease/service/BaseDiseaseHospitalService.java

@@ -76,6 +76,13 @@ public class BaseDiseaseHospitalService extends BaseJpaService<BaseDiseaseHospit
    @Value("${wechat.id}")
    private String wxId;
    //病种关联科室
    public List<Map<String,Object>> diseaseDeptList(){
        String sql = "SELECT DISTINCT dept,dept_name from base_disease_survey WHERE `status`=1 ORDER BY dept ";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        return list;
    }
    public void manageSurveyReocrd(String id,String status,String doctor){
        WlyySurveyRecordDO recordDO = wlyySurveyRecordDao.findById(id).orElse(null);
        recordDO.setStatus(status);
@@ -367,8 +374,7 @@ public class BaseDiseaseHospitalService extends BaseJpaService<BaseDiseaseHospit
                //添加管理记录
                WlyySurveyRecordDO recordDO = new WlyySurveyRecordDO();
                recordDO.setDiseaseCode(diseaseCode);
                recordDO.setDoctor(doctor);
                recordDO.setDoctorName(doctorDO.getName());
                recordDO.setCreateUser(doctor);
                recordDO.setIdcard(surveyScreenResult.getIdcard());
                recordDO.setMobile(surveyScreenResult.getMobile());
                recordDO.setName(surveyScreenResult.getPatientName());
@@ -377,8 +383,6 @@ public class BaseDiseaseHospitalService extends BaseJpaService<BaseDiseaseHospit
                recordDO.setStatus("0");
                wlyySurveyRecordDao.save(recordDO);
            }
        }
        //修改短信模板
        SmsTemplateDO smsTemplateDO = findSmsTemplate(smsTemplateId);

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

@@ -8687,7 +8687,7 @@ public class StatisticsEsService {
        String followupSql = "SELECT COUNT(f.id) planNum,COUNT(if(f.`status`=1,1,null)) finishNum from wlyy_followup f" +
                " where f.followup_date >='"+startDate+"' and f.followup_date <='"+endDate+"' ";
        if(StringUtils.isNotBlank(deptCode)){
            followupSql = "SELECT COUNT(f.id) planNum,COUNT(if(f.`status`=1,1,null)) finishNum from wlyy_followup f,base_doctor_hospital h " +
            followupSql = "SELECT COUNT(distinct f.id) planNum,COUNT(distinct if(f.`status`=1,f.id,null)) finishNum from wlyy_followup f,base_doctor_hospital h " +
                    " where f.doctor_code=h.doctor_code and h.del=1 and h.dept_code='"+deptCode+"' " +
                    " and f.followup_date >='"+startDate+"' and f.followup_date <='"+endDate+"' ";
        }
@@ -8720,10 +8720,10 @@ public class StatisticsEsService {
                turnSqlT += " and dept = '"+deptCode+"' ";
                turnPersonSqlH += " and dept = '"+deptCode+"' ";
                turnPersonSqlT += " and dept = '"+deptCode+"' ";
                followupSqlH = "SELECT COUNT(f.id) planNum from wlyy_followup f,base_doctor_hospital h " +
                followupSqlH = "SELECT COUNT(distinct f.id) planNum from wlyy_followup f,base_doctor_hospital h " +
                        " where f.doctor_code=h.doctor_code and h.del=1 and h.dept_code='"+deptCode+"' " +
                        " and f.followup_date >='"+period[0]+"' and f.followup_date <='"+period[1]+"' ";
                followupSqlT = "SELECT COUNT(f.id) planNum from wlyy_followup f,base_doctor_hospital h " +
                followupSqlT = "SELECT COUNT(distinct f.id) planNum from wlyy_followup f,base_doctor_hospital h " +
                        " where f.doctor_code=h.doctor_code and h.del=1 and h.dept_code='"+deptCode+"' " +
                        " and f.followup_date >='"+periodYear[0]+"' and f.followup_date <='"+periodYear[1]+"' ";
            }
@@ -8845,7 +8845,8 @@ public class StatisticsEsService {
                String healthNum = healthMap.get(currentWeek);
                if(map == null){
                    map = new HashMap<>();
                    map.put("date",currentWeek);
                    String cw[] = currentWeek.split("_");
                    map.put("date",getWeekFistday(Integer.parseInt(cw[0]),Integer.parseInt(cw[1])));
                    map.put("callNum","0");
                    map.put("consultNum","0");
                    map.put("doorNum","0");
@@ -8902,7 +8903,17 @@ public class StatisticsEsService {
            week = "0" + week;
        }
        String year = Integer.toString(now.getYear());
        return year + week;
        return year +"_"+ week;
    }
    public String getWeekFistday(int year,int week){
        WeekFields weekFields= WeekFields.ISO;
        LocalDate now = LocalDate.now();
        //输入你想要的年份和周数
        LocalDate localDate = now.withYear(year).with(weekFields.weekOfYear(),week);
        //以周一为每周的第一天
        LocalDate localDate1 = localDate.with(weekFields.dayOfWeek(), 1L);
        return localDate1.toString();
    }
    //诊后随访明细

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyRecordDO.java

@@ -23,6 +23,7 @@ public class WlyySurveyRecordDO extends UuidIdentityEntityWithCreateTime {
    private String operateTime;//操作时间
    private String doctor;//操作人
    private String doctorName;
    private String createUser;//创建者
    private String statusName;//状态0 待接待 1已接待 2患者拒诊
    private String diseaseName;//病种名称
@@ -101,6 +102,15 @@ public class WlyySurveyRecordDO extends UuidIdentityEntityWithCreateTime {
        this.doctorName = doctorName;
    }
    @Column(name = "create_user")
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    @Transient
    public String getStatusName() {
        return statusName;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/BaseServiceNologin.java

@@ -40,7 +40,7 @@ public class BaseServiceNologin extends EnvelopRestEndpoint {
        try {
            HSSFWorkbook wb = new HSSFWorkbook(new FileInputStream("/home/医生模板信息.xls"));
            HSSFWorkbook wb = new HSSFWorkbook(new FileInputStream("/home/doctor.xls"));
// 根据页面index 获取sheet页

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/specialist/BaseDiseaseHospitalController.java

@@ -41,6 +41,17 @@ public class BaseDiseaseHospitalController extends EnvelopRestEndpoint {
    @Autowired
    private ExportUtl exportUtl;
    @GetMapping(value = "diseaseDeptList")
    @ApiOperation(value = " 病种关联科室")
    public ListEnvelop diseaseDeptList() {
        try {
            return ListEnvelop.getSuccess("查询成功",baseDiseaseHospitalService.diseaseDeptList());
        } catch (Exception e) {
            e.printStackTrace();
            return failedListEnvelopException(e);
        }
    }
    @GetMapping(value = "open/exportExcel/exportSurveyRecord")
    @ApiOperation(value = " 导出筛查患者管理")
    public ListEnvelop exportSurveyRecord(
@@ -74,7 +85,7 @@ public class BaseDiseaseHospitalController extends EnvelopRestEndpoint {
            WritableSheet ws;
            ws = wwb.createSheet("sheet", 1);
            String[] header = {"姓名", "联系电话", "证件号码", "病种名称", "关联科室", "接待状态", "操作时间","操作人"};
            String[] header = {"姓名", "联系电话", "证件号码", "病种名称", "关联科室", "接待状态", "操作时间","操作人","短信内容"};
            int k = 0;
            for (String h : header) {
                exportUtl.addCell(ws, 0, k, h);//表名，行，列，header
@@ -91,6 +102,7 @@ public class BaseDiseaseHospitalController extends EnvelopRestEndpoint {
                exportUtl.addCell(ws, i, 5, m.getStatusName());
                exportUtl.addCell(ws, i, 6, m.getOperateTime());
                exportUtl.addCell(ws, i, 7, m.getDoctorName());
                exportUtl.addCell(ws, i, 8, m.getContent());
                i++;
            }
            wwb.write();

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/followup/service/FollowUpService.java

@@ -171,8 +171,9 @@ public class FollowUpService {
                                    String followupStatus,String doctorName){
        String sql = "SELECT DISTINCT f.id,f.patient_name patientName,f.patient_code patientCode,p.idcard,p.birthday,p.sex,p.mobile,p.address, " +
                "f.doctor_code doctorCode,f.doctor_name doctorName,pl.disease_name businessTypeName,pl.disease businessType, " +
                "h.dept_code deptCode,h.dept_name deptName,f.`status`,date_format(f.followup_date, '%Y-%m-%d %H:%i:%s') followupDate,'诊后康复' businessSource," +
                "date_format(f.followup_plan_date, '%Y-%m-%d %H:%i:%s') followupPlanDate,date_format(pl.create_time, '%Y-%m-%d %H:%i:%s') turnDownDate,pl.plan_doctor_name planDoctorName,h2.dept_name turnDownDeptName ";
                "h.dept_code deptCode,h.dept_name deptName,f.`status`,if(f.`status`=1,date_format(f.followup_date, '%Y-%m-%d %H:%i:%s'),'') followupDate," +
                "'诊后康复' businessSource,date_format(f.followup_plan_date, '%Y-%m-%d %H:%i:%s') followupPlanDate," +
                "date_format(pl.create_time, '%Y-%m-%d %H:%i:%s') turnDownDate,pl.plan_doctor_name planDoctorName,h2.dept_name turnDownDeptName ";
        String filter = " from wlyy_followup f " +
                "INNER JOIN base_service_item_plan ip on  f.id = ip.relation_code and ip.relation_type='6' " +
                "LEFT JOIN wlyy_patient_rehabilitation_plan pl on pl.id = ip.plan_id " +