代码修改

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

@@ -8846,7 +8846,7 @@ public class StatisticsEsService {
                String healthNum = healthMap.get(currentWeek);
                if(map == null){
                    map = new HashMap<>();
                    String cw[] = currentWeek.split("_");
                    String cw[] = currentWeek.split("-");
                    map.put("date",getWeekFistday(Integer.parseInt(cw[0]),Integer.parseInt(cw[1])));
                    map.put("callNum","0");
                    map.put("consultNum","0");
@@ -8904,7 +8904,7 @@ 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){

common/common-entity/src/db/2024.sql

@@ -435,14 +435,35 @@ INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`,
CREATE TABLE `wlyy_survey_third` (
    `id` varchar(50) NOT NULL,
    `survey_code` varchar(50) DEFAULT NULL,
    `patient` varchar(50) DEFAULT NULL,
    `doctor` varchar(50) DEFAULT NULL,
    `disease_code` varchar(50) DEFAULT NULL,
    `create_time` datetime DEFAULT NULL,
    PRIMARY KEY (`id`),
    KEY `index` (`survey_code`,`disease_code`)
) ENGINE=InnoDB;
CREATE TABLE `wlyy_survey_record` (
     `id` varchar(50) NOT NULL,
     `survey_code` varchar(50) DEFAULT NULL,
     `doctor` varchar(50) DEFAULT NULL,
     `disease_code` varchar(50) DEFAULT NULL,
     `name` varchar(50) DEFAULT NULL COMMENT '居民姓名',
     `mobile` varchar(50) DEFAULT NULL COMMENT '手机号',
     `idcard` varchar(50) DEFAULT NULL COMMENT '身份证',
     `disease_code` varchar(50) DEFAULT NULL COMMENT '病种code',
     `status` varchar(1) DEFAULT NULL COMMENT '状态0 待接待 1已接待 2患者拒诊',
     `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '短信内容',
     `operate_time` varchar(30) DEFAULT NULL COMMENT '操作时间',
     `doctor` varchar(50) DEFAULT NULL COMMENT '操作人',
     `doctor_name` varchar(50) DEFAULT NULL,
     `create_user` varchar(50) DEFAULT NULL,
     `create_user_name` varchar(50) DEFAULT NULL,
     `create_time` datetime DEFAULT NULL,
     PRIMARY KEY (`id`),
     KEY `index` (`survey_code`,`disease_code`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
     KEY `index1` (`name`,`mobile`,`idcard`),
     KEY `index2` (`disease_code`)
) ENGINE=InnoDB;
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`,
                                      `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/DictHospitalDeptVO.java

@@ -33,7 +33,11 @@ public class DictHospitalDeptVO extends IntegerIdentityVO{
	 */
	@ApiModelProperty(value = "科室标识", example = "")
    private String code;
    /**
     * 科室图片
     */
    private String deptImg;
    private String saasId;//排序
    /**
	 * 科室名称
	 */
@@ -86,4 +90,20 @@ public class DictHospitalDeptVO extends IntegerIdentityVO{
    public void setDeptTypeCode(String deptTypeCode) {
        this.deptTypeCode = deptTypeCode;
    }
    public String getDeptImg() {
        return deptImg;
    }
    public void setDeptImg(String deptImg) {
        this.deptImg = deptImg;
    }
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
}