代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/family/service/WlyyFamilyMemberService.java

@@ -346,6 +346,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
        result.setCardNo(idCard);
        result.setCardType(cardType);
        result.setMobile(phoneNum);
        result.setMedicare(medicare);
        //保存到base_patient表
        basePatientDO.setName(familyName);
        basePatientDO.setIdcard(idCard);
@@ -415,7 +416,19 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
                    patientMedicareCardDO.setType("A_01");
                    basePatientMedicareCardDao.save(patientMedicareCardDO);
                }
            }else{
                if (StringUtils.isNotBlank(medicare)){
                    PatientMedicareCardDO patientMedicareCardDO = basePatientMedicareCardDao.findByTypeAndPatientCodeAndDel("A_01",sucessPatient.getId(),"1");
                    if (patientMedicareCardDO==null){
                        patientMedicareCardDO = new PatientMedicareCardDO();
                    }
                    patientMedicareCardDO.setCode(medicare);
                    patientMedicareCardDO.setPatientCode(patientNewId);
                    patientMedicareCardDO.setDel("1");
                    patientMedicareCardDO.setParentType("A");
                    patientMedicareCardDO.setType("A_01");
                    basePatientMedicareCardDao.save(patientMedicareCardDO);
                }
            }
        }catch (Exception e){
@@ -1001,7 +1014,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
            String sql = "select t.id as \"id\",t.card_type as \"cardType\", " +
                    "t.patient as \"patient\",b.name as \"name\",b.sex as \"sex\","+
                    "b.birthday as\"birthday\",b.idcard as \"idcard\",b.mobile as \"mobile\"," +
                    "t.family_member as \"familyMember\",c.relation_name as \"relationName\" "+
                    "t.family_member as \"familyMember\",c.relation_name as \"relationName\",t.medicare as \"medicare\" "+
                    " from wlyy_patient_family_member t left join base_patient b" +
                    " on t.family_member = b.id left join base_patient_member_dict c on t.family_relation=c.id where 1=1 and t.is_del=1 ";
            if (StringUtils.isNotBlank(patientId)){
@@ -1084,7 +1097,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
        String sql="select t.id as \"id\",t.card_type as \"cardType\"," +
                "t.family_member as \"familyMember\",t.patient as \"patient\"," +
                "b.name as \"name\",b.idcard as \"idcard\",b.mobile as \"mobile\",t.clinicid as \"clinicid\"," +
                "c.relation_name \"relationName\",b.birthday as\"birthday\",b.sex as\"sex\"" +
                "c.relation_name \"relationName\",b.birthday as\"birthday\",b.sex as\"sex\",t.medicare as \"medicare\" " +
                " from wlyy_patient_family_member t left join base_patient b" +
                " on t.family_member = b.id left join base_patient_member_dict c on t.family_relation=c.id " +
                " where 1=1 and t.is_del = 1 ";

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

@@ -27,3 +27,6 @@ INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict
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 ('knowledge_question_scene2', NULL, 'knowledge_question_scene', '2', '专属服务导诊', NULL, NULL, 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 ('knowledge_question_scene3', NULL, 'knowledge_question_scene', '3', '在线候诊室', NULL, NULL, 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 ('knowledge_question_scene4', NULL, 'knowledge_question_scene', '4', '在线诊室', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '使用场景');
ALTER table wlyy_patient_family_member add COLUMN `medicare` varchar(50) DEFAULT NULL COMMENT '社保卡';

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/family/WlyyPatientFamilyMemberDO.java

@@ -1,6 +1,5 @@
package com.yihu.jw.entity.hospital.family;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
@@ -42,6 +41,7 @@ public class WlyyPatientFamilyMemberDO extends UuidIdentityEntityWithOperator {
    private String clinicid;
    private String mobile;
    private String medicare;//社保卡
    public String getMobile() {
        return mobile;
@@ -130,4 +130,12 @@ public class WlyyPatientFamilyMemberDO extends UuidIdentityEntityWithOperator {
    public void setIsDel(Integer isDel) {
        this.isDel = isDel;
    }
    public String getMedicare() {
        return medicare;
    }
    public void setMedicare(String medicare) {
        this.medicare = medicare;
    }
}