代码修改

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

@@ -190,3 +190,33 @@ INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`,
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 ('adl1', NULL, 'adl', '1', '独立进食/穿衣', NULL, '1', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '日常生活能力');
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 ('adl2', NULL, 'adl', '2', '需部分辅助', NULL, '2', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '日常生活能力');
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 ('adl3', NULL, 'adl', '3', '完全依赖他人', NULL, '3', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '日常生活能力');
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_status20', NULL, 'wound_healing_status2', NULL, NULL, NULL, NULL, '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '伤口愈合情况');
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_status21', NULL, 'wound_healing_status2', '1', '干燥', NULL, '1', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '伤口愈合情况');
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_status22', NULL, 'wound_healing_status2', '2', '渗液', NULL, '2', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '伤口愈合情况');
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 ('peripheral_blood_circulation', NULL, 'peripheral_blood_circulation', NULL, NULL, NULL, NULL, '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '末梢血运（手指/足趾）');
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 ('peripheral_blood_circulation1', NULL, 'peripheral_blood_circulation', '1', '红润', NULL, '1', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '末梢血运（手指/足趾）');
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 ('peripheral_blood_circulation2', NULL, 'peripheral_blood_circulation', '2', '青紫', NULL, '2', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '末梢血运（手指/足趾）');
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 ('peripheral_blood_circulation3', NULL, 'peripheral_blood_circulation', '3', '苍白', NULL, '3', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '末梢血运（手指/足趾）');
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 ('joint_range', NULL, 'joint_range', NULL, NULL, NULL, NULL, '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节活动范围');
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 ('joint_range1', NULL, 'joint_range', '1', '良好', NULL, '1', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节活动范围');
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 ('joint_range2', NULL, 'joint_range', '2', '差很多', NULL, '2', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节活动范围');
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 ('joint_range3', NULL, 'joint_range', '3', '动不了', NULL, '3', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节活动范围');
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 ('swelling_limbs', NULL, 'swelling_limbs', NULL, NULL, NULL, NULL, '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '肢体肿胀情况');
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 ('swelling_limbs1', NULL, 'swelling_limbs', '1', '轻', NULL, '1', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '肢体肿胀情况');
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 ('swelling_limbs2', NULL, 'swelling_limbs', '2', '中', NULL, '2', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '肢体肿胀情况');
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 ('swelling_limbs3', NULL, 'swelling_limbs', '3', '重', NULL, '3', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '肢体肿胀情况');
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 ('joint_function', NULL, 'joint_function', NULL, NULL, NULL, NULL, '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节功能');
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 ('joint_function1', NULL, 'joint_function', '1', '能完全下蹲', NULL, '1', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节功能');
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 ('joint_function2', NULL, 'joint_function', '2', '部分下蹲', NULL, '2', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节功能');
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 ('joint_function3', NULL, 'joint_function', '3', '无法下蹲', NULL, '3', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节功能');
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 ('joint_gait', NULL, 'joint_gait', NULL, NULL, NULL, NULL, '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节步态');
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 ('joint_gait1', NULL, 'joint_gait', '1', '正常', NULL, '1', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节步态');
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 ('joint_gait2', NULL, 'joint_gait', '2', '跛行', NULL, '2', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节步态');
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 ('joint_gait3', NULL, 'joint_gait', '3', '需助行器', NULL, '3', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '关节步态');

common/common-entity/src/main/java/com/yihu/jw/entity/followup/FollowupHandFoot.java

@@ -24,26 +24,26 @@ public class FollowupHandFoot extends IdEntityWithCreateTime {
    private String sex; // 性别
    private Integer age; // 年龄
    private String mobile; // 联系电话
    private String visitNo; // 门诊号
    private String visitNo; // 门诊号/住院号
    private String operationDate; // 手术日期
    private String operationType; // 手术类型
    private String chiefDoctor; // 主刀医生ID
    private String chiefDoctorName; // 主刀医生姓名
    private String woundHealingStatus; // 伤口愈合情况
    private String peripheralBloodCirculation; // 末梢血液循环
    private String isHandSurgery; // 是否手外科手术
    private String jointRange; // 关节活动范围
    private String isFootSurgery; // 是否足外科手术
    private String swellingLimbs; // 肢体肿胀情况
    private String jointFunction; // 关节功能
    private String jointGait; // 关节步态
    private String isMicrosurgery; // 是否显微外科手术
    private String woundHealing; // 伤口愈合
    private String peripheralBloodCirculation2; // 末梢血液循环(二次检查)
    private String isDiabetes; // 是否糖尿病
    private String diabetesWoundHealing; // 糖尿病伤口愈合
    private String diabetesFootFeel; // 糖尿病足感觉
    private String diabetesBloodSugar; // 糖尿病血糖
    private String woundHealingStatus; // 伤口愈合情况 字典wound_healing_status2
    private String peripheralBloodCirculation; // 末梢血运（手指/足趾） 字典peripheral_blood_circulation
    private String isHandSurgery; // 是否手外科 1是 0否
    private String jointRange; // 关节活动范围 字典joint_range
    private String isFootSurgery; // 是否足踝外科 1是 0否
    private String swellingLimbs; // 肢体肿胀情况 字典swelling_limbs
    private String jointFunction; // 关节功能 字典joint_function
    private String jointGait; // 关节步态 字典joint_gait
    private String isMicrosurgery; // 是否显微外科手术专项随访 1是 0否
    private String woundHealing; // 伤口愈合 字典wound_healing_status2
    private String peripheralBloodCirculation2; // 是否显微外科手术专项随访-末梢血运（手指/足趾） 字典peripheral_blood_circulation
    private String isDiabetes; // 是否糖尿病足专项随访  1是 0否
    private String diabetesWoundHealing; // 糖尿病伤口愈合 字典wound_healing_status2
    private String diabetesFootFeel; // 糖尿病足感觉  1有 0无
    private String diabetesBloodSugar; // 糖尿病血糖  1有 0无
    private String diabetesBloodSugarB;//糖尿病-血糖监测-餐前
    private String diabetesBloodSugarA;//糖尿病-血糖监测-餐后
    private String planTraining;//是否按计划进行康复训练 1是 0否

common/common-entity/src/main/java/com/yihu/jw/entity/followup/FollowupOncology.java

@@ -289,7 +289,7 @@ public class FollowupOncology extends IdEntityWithCreateTime {
        this.handFootSyndrome = handFootSyndrome;
    }
    @Column(name = "skin_redness,")
    @Column(name = "skin_redness")
    public String getSkinRedness() {
        return skinRedness;
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/SysDictEndpoint.java

@@ -158,15 +158,12 @@ public class SysDictEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "/findByHosAndDict")
    @ApiOperation(value = "根据医院和字典名查询")
    public Envelop findByHosAndDict(
            @ApiParam(name = "hospital", value = "医院编码", required = true)
            @RequestParam(value = "hospital", required = true) String hospital,
            @ApiParam(name = "hospital", value = "医院编码", required = false)
            @RequestParam(value = "hospital", required = false) String hospital,
            @ApiParam(name = "dictName", value = "字典名称", required = true)
            @RequestParam(value = "dictName", required = true) String dictName ) throws Exception {
        try {
            List<Map<String, Object>> list = sysDictService.findByHosAndDict(hospital, dictName);
            return success("查询成功",list);
        }catch (Exception e){
            return failedException(e);

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

@@ -1108,7 +1108,7 @@ public class FollowUpService {
     */
    public Object getFollowupProjectData(String id, String followupProject) throws Exception {
        Long followupId = Long.valueOf(id);
        if("1".equals(followupProject)){
        if("1".equals(followupProject)||StringUtils.isBlank(followupProject)){
            Map<String, String> re = new HashMap<>();
            List<FollowupContent> dataList = followupContentDao.findByFollowupIdAndFollowupProject(followupId, followupProject);
            for (FollowupContent item : dataList) {
@@ -1128,10 +1128,10 @@ public class FollowUpService {
                        BeanUtils.copyProperties(last,old);
                        old.setId(null);
                        old.setCreateTime(null);
                        old.setFollowupId(followupId);
                    }
                }
                if(StringUtils.isNotBlank(old.getPatient())){
                old.setFollowupId(followupId);
                if(StringUtils.isBlank(old.getPatient())){
                    //填写初始默认值
                    old.setPatient(followup.getPatientCode());
                    BasePatientDO patientDO = patientDao.findById(followup.getPatientCode()).get();
@@ -1162,10 +1162,10 @@ public class FollowUpService {
                        BeanUtils.copyProperties(last,old);
                        old.setId(null);
                        old.setCreateTime(null);
                        old.setFollowupId(followupId);
                    }
                }
                if(StringUtils.isNotBlank(old.getPatient())){
                old.setFollowupId(followupId);
                if(StringUtils.isBlank(old.getPatient())){
                    //填写初始默认值
                    old.setPatient(followup.getPatientCode());
                    BasePatientDO patientDO = patientDao.findById(followup.getPatientCode()).get();
@@ -1196,10 +1196,10 @@ public class FollowUpService {
                        BeanUtils.copyProperties(last,old);
                        old.setId(null);
                        old.setCreateTime(null);
                        old.setFollowupId(followupId);
                    }
                }
                if(StringUtils.isNotBlank(old.getPatient())){
                old.setFollowupId(followupId);
                if(StringUtils.isBlank(old.getPatient())){
                    //填写初始默认值
                    old.setPatient(followup.getPatientCode());
                    BasePatientDO patientDO = patientDao.findById(followup.getPatientCode()).get();
@@ -1239,7 +1239,8 @@ public class FollowUpService {
    @Transactional
    public void saveFollowupProjectData(String id, String followupProject, String followupProjectData,String doctorId) throws Exception {
        Long followupId = Long.valueOf(id);
        if("1".equals(followupProject)){
        if("1".equals(followupProject)||StringUtils.isBlank(followupProject)){
            followupProject = "1";
            //通用
            List<FollowupContent> dataList = followupContentDao.findByFollowupIdAndFollowupProject(followupId, followupProject);
            //删除原有记录

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/SynchronizePatientService.java

@@ -197,8 +197,12 @@ public class SynchronizePatientService  {
            rehabilitationPatientInfoDao.save(infoDO);
            return "患者无门诊病历或患者无出院小结";
        }
        infoDO.setSsc(ssc);
        infoDO.setMobile(mobile);
        if(StringUtils.isNotBlank(ssc)){
            infoDO.setSsc(ssc);
        }
        if(StringUtils.isNotBlank(mobile)){
            infoDO.setMobile(mobile);
        }
        infoDO.setHisPid(hisPid);
        infoDO.setEventType(eventType);
@@ -353,7 +357,7 @@ public class SynchronizePatientService  {
            planDO.setPlanDoctor(planDoctorId);
            planDO.setPlanDoctorName(planDoctor.getName());
        }else {
            if("1".equals(planDoctorId)){
            if(StringUtils.isNotBlank(doctorIdMz)){
                //1门诊医生
                doctorId = doctorIdMz;
                doctorName = doctorNameMz;