Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

 Conflicts:

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

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

@@ -46,6 +46,16 @@ ALTER table wlyy_rehabilitation_patient_info add COLUMN `template_plan_name` var
ALTER table wlyy_patient_medical_records_rehabilitation add COLUMN `con_no` varchar(10) DEFAULT NULL COMMENT '就诊次数';
ALTER table wlyy_patient_medical_records_rehabilitation add COLUMN `event_type` varchar(1) DEFAULT NULL COMMENT '病历类型';
ALTER TABLE `wlyy_rehabilitation_template_detail`
ADD COLUMN `followup_form_type` varchar(100) DEFAULT NULL COMMENT '随访表单类型';
INSERT INTO `base`.`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 ('followup_form_type1', NULL, 'followup_form_type', '1', '全院通用', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '随访表单类型');
INSERT INTO `base`.`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 ('followup_form_type2', NULL, 'followup_form_type', '2', '骨科患者术后随访', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '随访表单类型');
INSERT INTO `base`.`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 ('followup_form_type3', NULL, 'followup_form_type', '3', '肿瘤科患者随访', NULL, 3, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '随访表单类型');
INSERT INTO `base`.`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 ('followup_form_type4', NULL, 'followup_form_type', '4', '手足外科患者随访', NULL, 4, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '随访表单类型');
-- ysj 2025-07-30
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 ('wound_healing_status', NULL, 'wound_healing_status', NULL, NULL, NULL, NULL, '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '伤口愈合情况');

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationTemplateDetailDO.java

@@ -31,6 +31,7 @@ public class RehabilitationTemplateDetailDO extends UuidIdentityEntityWithOperat
    private String dateCode;//日期code
    private Integer timeType;//时间类型
    private String remark;//备注
    private String followupFormType; // 随访表单类型，字典 followup_form_type
    private String name;//服务项名称
    private Integer expense;//费用
@@ -265,4 +266,13 @@ public class RehabilitationTemplateDetailDO extends UuidIdentityEntityWithOperat
    public void setExpense(Integer expense) {
        this.expense = expense;
    }
    @Column(name = "followup_form_type")
    public String getFollowupFormType() {
        return followupFormType;
    }
    public void setFollowupFormType(String followupFormType) {
        this.followupFormType = followupFormType;
    }
}