5 Commits 8d88282889 ... 70e2bb3a1d

Autore SHA1 Messaggio Data
  LAPTOP-KB9HII50\70708 70e2bb3a1d 代码修改 1 settimana fa
  LAPTOP-KB9HII50\70708 036359bb14 代码修改 1 settimana fa
  LAPTOP-KB9HII50\70708 9ba610ddd3 Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0 1 settimana fa
  LAPTOP-KB9HII50\70708 64babbc7d8 代码修改 1 settimana fa
  LAPTOP-KB9HII50\70708 2b6314293e 代码修改 1 settimana fa

+ 2 - 0
common/common-entity/src/db/2025.sql

@ -60,6 +60,8 @@ INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict
-- ysj 2025-07-30
ALTER TABLE `wlyy_followup`
    ADD COLUMN `followup_form_type` varchar(10) DEFAULT NULL COMMENT '随访表单类型';
ALTER TABLE `wlyy_rehabilitation_plan_detail`
    ADD COLUMN `followup_form_type` varchar(10) DEFAULT NULL COMMENT '随访表单类型';
ALTER TABLE `wlyy_followup`
    ADD COLUMN `last_followup_id` int(11) DEFAULT NULL COMMENT '上次随访id';
update wlyy_followup set followup_form_type = '1' where followup_form_type is null;

+ 4 - 3
common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationDetailDO.java

@ -61,7 +61,8 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
    private String relationCode;//业务关联code
    @Column(name = "followup_detail_type")
    private Integer followupDetailType;//默认0,1是冠心病社区表单
    @Column(name = "followup_form_type")
    private String followupFormType; // 随访表单类型,字典 followup_form_type
    private Integer reservationType;//复诊类型:1线上,2线下,3远程
    private Date createTime;
    private String createUser;
@ -82,7 +83,7 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
    private String value1;
    private String value2;
    private String value3;
    private String followupFormType; // 随访表单类型,字典 followup_form_type
    @Column(name = "reservation_type")
    public Integer getReservationType() {
@ -419,7 +420,7 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
    public void setValue3(String value3) {
        this.value3 = value3;
    }
    @Transient
    public String getFollowupFormType() {
        return followupFormType;
    }

+ 0 - 2
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/controller/RehabilitationPlanController.java

@ -44,8 +44,6 @@ public class RehabilitationPlanController extends EnvelopRestEndpoint {
    @Autowired
    private RehabilitationOperateRecordsDao rehabilitationOperateRecordsDao;
    @Autowired
    private ImUtil imUtill;
    @RequestMapping(value = "getRehabilitationPlanLog", method = RequestMethod.GET)
    @ApiOperation(value = "获取康复计划修改记录")

+ 4 - 2
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationPlanService.java

@ -303,8 +303,9 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
                "WHERE d.id='" + planDO.getDisease() + "' and t.id =d.rehabilitation_template_id ";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        if (list.size() > 0) {
            planDO.setPlanDoctor(list.get(0).get("plan_doctor") + "");
            planDO.setPlanDoctorName(list.get(0).get("plan_doctor_name") + "");
            Map<String, Object> map = list.get(0);
            planDO.setPlanDoctor(map.get("plan_doctor") + "");
            planDO.setPlanDoctorName(map.get("plan_doctor_name") + "");
        }
        PatientMedicalRecordsDO recordsDO = planDO.getMedicalRecordsDO();
@ -339,6 +340,7 @@ public class RehabilitationPlanService extends BaseJpaService<RehabilitationPlan
            RehabilitationDetailDO detail = new RehabilitationDetailDO();
            detail.setHospitalServiceItemId(templateDetailDO.getHospitalServiceItemId());
            detail.setFollowupFormType(detailDO.getFollowupFormType());
            detail.setCreateTime(new Date());
            detail.setStatus(0);
            detail.setType(1);