Merge branch 'dev' of zd_123/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/doctor/archive/ArchiveInfo.java

@@ -38,28 +38,20 @@ public class ArchiveInfo extends IdEntity {
    private int education;//  文化程度【1.文盲及半文盲 2.小学 3.初中 4.高中/技校/中专 5.大学大专及以上 6.不详】
    private int occupation;//  职业【1、国家机关、党群组织、企业、事业单位负责人 2、专业技术人员 3、办事人员和有关人员 4、商业、服务业员工 5、农、林、牧、渔、水利生产人员 6、生产、运输设备操作人员及有关人员 7、军人 8、不便分类的其他从业人员】
    private int medicalExpenses;//  支付方式【7.贫困救助 5.商业医疗保险 1.全公费 8.全自费 99.其它】
    private String medicalExpenssContent;//  支付方式其它内容
    private String allergic;//  药物过敏史【0无 1青霉素 2磺胺 3链霉素 4其他】
    private String allergicOtherContent;//  药物过敏史--其它内容
    private String  past;//  既往史--疾病【0无 1高血压 2 糖尿病 4其他】
    private String  pastHypertensionDate;//  既往史--疾病--高血压日期
    private String  pastDiabetesDate;//  既往史--疾病--糖尿病日期
    private String  pastOtherContent;//  既往史--疾病--其他内容
    private String  pastOtherContentDate;//  既往史--疾病--其它日期
    private String  pastDate;//既往史--日期
    private String pastOtherContent;//其他既往史内容
    private int  genetic;//  遗传病史【0 无 1 有】
    private String  geneticDiseaseName;//  疾病名称
    private String  disability;// 有无残疾--无残疾【1无 2视力残疾 3听力残疾 4言语残疾 5肢体残疾 6智力残疾 7其他残疾】
    private String  disabilityOtherContent;//  有无残疾--其它残疾内容
    private int  familyNone;//  家族史【0无 1有】
    private String  familyFather;//  家族史--父亲【0无 1高血压 2糖尿病 3冠心病 4慢性阻塞性肺疾病 5恶性肿瘤 6脑卒中 7重性精神疾病 8结核病 9肝炎 10先天畸形 11其他】
    private String  familyFatherOtherContent;//  家族史--父亲--其它内容
    private String  familyMother;//  家族史--母亲【0无 1高血压 2糖尿病 3冠心病 4慢性阻塞性肺疾病 5恶性肿瘤 6脑卒中 7重性精神疾病 8结核病 9肝炎 10先天畸形 11其他】
    private String  familyMotheOtherContent;//  家族史--母亲--其它内容
    private String  familyBrothers;//  家族史--兄弟姐妹【0无 1高血压 2糖尿病 3冠心病 4慢性阻塞性肺疾病 5恶性肿瘤 6脑卒中 7重性精神疾病 8结核病 9肝炎 10先天畸形 11其他】
    private String  familyBrothersOtherContent;//  家族史--兄弟姐妹--其它内容
    private String  familyChildren;//  家族史--子女【0无 1高血压 2糖尿病 3冠心病 4慢性阻塞性肺疾病 5恶性肿瘤 6脑卒中 7重性精神疾病 8结核病 9肝炎 10先天畸形 11其他】
    private String familyChildrenOtherContent;//  家族史--子女--其它内容
    public String getCode() {
        return code;
@@ -269,14 +261,6 @@ public class ArchiveInfo extends IdEntity {
        this.medicalExpenses = medicalExpenses;
    }
    public String getMedicalExpenssContent() {
        return medicalExpenssContent;
    }
    public void setMedicalExpenssContent(String medicalExpenssContent) {
        this.medicalExpenssContent = medicalExpenssContent;
    }
    public String getAllergic() {
        return allergic;
    }
@@ -301,20 +285,12 @@ public class ArchiveInfo extends IdEntity {
        this.past = past;
    }
    public String getPastHypertensionDate() {
        return pastHypertensionDate;
    }
    public void setPastHypertensionDate(String pastHypertensionDate) {
        this.pastHypertensionDate = pastHypertensionDate;
    public String getPastDate() {
        return pastDate;
    }
    public String getPastDiabetesDate() {
        return pastDiabetesDate;
    }
    public void setPastDiabetesDate(String pastDiabetesDate) {
        this.pastDiabetesDate = pastDiabetesDate;
    public void setPastDate(String pastDate) {
        this.pastDate = pastDate;
    }
    public String getPastOtherContent() {
@@ -325,14 +301,6 @@ public class ArchiveInfo extends IdEntity {
        this.pastOtherContent = pastOtherContent;
    }
    public String getPastOtherContentDate() {
        return pastOtherContentDate;
    }
    public void setPastOtherContentDate(String pastOtherContentDate) {
        this.pastOtherContentDate = pastOtherContentDate;
    }
    public int getGenetic() {
        return genetic;
    }
@@ -381,14 +349,6 @@ public class ArchiveInfo extends IdEntity {
        this.familyFather = familyFather;
    }
    public String getFamilyFatherOtherContent() {
        return familyFatherOtherContent;
    }
    public void setFamilyFatherOtherContent(String familyFatherOtherContent) {
        this.familyFatherOtherContent = familyFatherOtherContent;
    }
    public String getFamilyMother() {
        return familyMother;
    }
@@ -397,14 +357,6 @@ public class ArchiveInfo extends IdEntity {
        this.familyMother = familyMother;
    }
    public String getFamilyMotheOtherContent() {
        return familyMotheOtherContent;
    }
    public void setFamilyMotheOtherContent(String familyMotheOtherContent) {
        this.familyMotheOtherContent = familyMotheOtherContent;
    }
    public String getFamilyBrothers() {
        return familyBrothers;
    }
@@ -413,14 +365,6 @@ public class ArchiveInfo extends IdEntity {
        this.familyBrothers = familyBrothers;
    }
    public String getFamilyBrothersOtherContent() {
        return familyBrothersOtherContent;
    }
    public void setFamilyBrothersOtherContent(String familyBrothersOtherContent) {
        this.familyBrothersOtherContent = familyBrothersOtherContent;
    }
    public String getFamilyChildren() {
        return familyChildren;
    }
@@ -428,12 +372,4 @@ public class ArchiveInfo extends IdEntity {
    public void setFamilyChildren(String familyChildren) {
        this.familyChildren = familyChildren;
    }
    public String getFamilyChildrenOtherContent() {
        return familyChildrenOtherContent;
    }
    public void setFamilyChildrenOtherContent(String familyChildrenOtherContent) {
        this.familyChildrenOtherContent = familyChildrenOtherContent;
    }
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/doctor/archive/vo/ArchiveInfoDto.java

@@ -3,7 +3,7 @@ package com.yihu.wlyy.entity.doctor.archive.vo;
/**
 * Created by zhangdan on 2018/1/4.
 * Created by zhangdan on 2018/1/4
 */
public class ArchiveInfoDto {
@@ -34,27 +34,20 @@ public class ArchiveInfoDto {
    private int education;//  文化程度【1.文盲及半文盲 2.小学 3.初中 4.高中/技校/中专 5.大学大专及以上 6.不详】
    private int occupation;//  职业【1、国家机关、党群组织、企业、事业单位负责人 2、专业技术人员 3、办事人员和有关人员 4、商业、服务业员工 5、农、林、牧、渔、水利生产人员 6、生产、运输设备操作人员及有关人员 7、军人 8、不便分类的其他从业人员】
    private int medicalExpenses;//  支付方式【7.贫困救助 5.商业医疗保险 1.全公费 8.全自费 99.其它】
    private String medicalExpenssContent;//  支付方式其它内容
    private String allergic;//  药物过敏史【0无 1青霉素 2磺胺 3链霉素 4其他】
    private String allergicOtherContent;//  药物过敏史--其它内容
    private String  past;//  既往史--疾病【0无 1高血压 2 糖尿病 4其他】
    private String  pastHypertensionDate;//  既往史--疾病--高血压日期
    private String  pastDiabetesDate;//  既往史--疾病--糖尿病日期
    private String  pastOtherContent;//  既往史--疾病--其他内容
    private String  pastOtherContentDate;//  既往史--疾病--其它日期
    private String  pastDate;//  既往史--疾病--日期
    private String pastOtherContent;//其他既往史内容
    private int  genetic;//  遗传病史【0 无 1 有】
    private String  geneticDiseaseName;//疾病名称
    private String  disability;// 有无残疾--无残疾【1无 2视力残疾 3听力残疾 4言语残疾 5肢体残疾 6智力残疾 7其他残疾】
    private String  disabilityOtherContent;//  有无残疾--其它残疾内容
    private int  familyNone;//  家族史【0无 1有】
    private String  familyFather;//家族史--父亲【0无 1高血压 2糖尿病 3冠心病 4慢性阻塞性肺疾病 5恶性肿瘤 6脑卒中 7重性精神疾病 8结核病 9肝炎 10先天畸形 11其他】
    private String  familyFatherOtherContent;//  家族史--父亲--其它内容
    private String  familyMother;//  家族史--母亲【0无 1高血压 2糖尿病 3冠心病 4慢性阻塞性肺疾病 5恶性肿瘤 6脑卒中 7重性精神疾病 8结核病 9肝炎 10先天畸形 11其他】
    private String  familyMotheOtherContent;//  家族史--母亲--其它内容
    private String  familyBrothers;//  家族史--兄弟姐妹【0无 1高血压 2糖尿病 3冠心病 4慢性阻塞性肺疾病 5恶性肿瘤 6脑卒中 7重性精神疾病 8结核病 9肝炎 10先天畸形 11其他】
    private String  familyBrothersOtherContent;//  家族史--兄弟姐妹--其它内容
    private String  familyChildren;//  家族史--子女【0无 1高血压 2糖尿病 3冠心病 4慢性阻塞性肺疾病 5恶性肿瘤 6脑卒中 7重性精神疾病 8结核病 9肝炎 10先天畸形 11其他】
    private String familyChildrenOtherContent;//  家族史--子女--其它内容
    public long getId() {
        return id;
@@ -272,14 +265,6 @@ public class ArchiveInfoDto {
        this.medicalExpenses = medicalExpenses;
    }
    public String getMedicalExpenssContent() {
        return medicalExpenssContent;
    }
    public void setMedicalExpenssContent(String medicalExpenssContent) {
        this.medicalExpenssContent = medicalExpenssContent;
    }
    public String getAllergic() {
        return allergic;
    }
@@ -304,20 +289,12 @@ public class ArchiveInfoDto {
        this.past = past;
    }
    public String getPastHypertensionDate() {
        return pastHypertensionDate;
    }
    public void setPastHypertensionDate(String pastHypertensionDate) {
        this.pastHypertensionDate = pastHypertensionDate;
    }
    public String getPastDiabetesDate() {
        return pastDiabetesDate;
    public String getPastDate() {
        return pastDate;
    }
    public void setPastDiabetesDate(String pastDiabetesDate) {
        this.pastDiabetesDate = pastDiabetesDate;
    public void setPastDate(String pastDate) {
        this.pastDate = pastDate;
    }
    public String getPastOtherContent() {
@@ -328,14 +305,6 @@ public class ArchiveInfoDto {
        this.pastOtherContent = pastOtherContent;
    }
    public String getPastOtherContentDate() {
        return pastOtherContentDate;
    }
    public void setPastOtherContentDate(String pastOtherContentDate) {
        this.pastOtherContentDate = pastOtherContentDate;
    }
    public int getGenetic() {
        return genetic;
    }
@@ -384,14 +353,6 @@ public class ArchiveInfoDto {
        this.familyFather = familyFather;
    }
    public String getFamilyFatherOtherContent() {
        return familyFatherOtherContent;
    }
    public void setFamilyFatherOtherContent(String familyFatherOtherContent) {
        this.familyFatherOtherContent = familyFatherOtherContent;
    }
    public String getFamilyMother() {
        return familyMother;
    }
@@ -400,14 +361,6 @@ public class ArchiveInfoDto {
        this.familyMother = familyMother;
    }
    public String getFamilyMotheOtherContent() {
        return familyMotheOtherContent;
    }
    public void setFamilyMotheOtherContent(String familyMotheOtherContent) {
        this.familyMotheOtherContent = familyMotheOtherContent;
    }
    public String getFamilyBrothers() {
        return familyBrothers;
    }
@@ -416,14 +369,6 @@ public class ArchiveInfoDto {
        this.familyBrothers = familyBrothers;
    }
    public String getFamilyBrothersOtherContent() {
        return familyBrothersOtherContent;
    }
    public void setFamilyBrothersOtherContent(String familyBrothersOtherContent) {
        this.familyBrothersOtherContent = familyBrothersOtherContent;
    }
    public String getFamilyChildren() {
        return familyChildren;
    }
@@ -432,11 +377,4 @@ public class ArchiveInfoDto {
        this.familyChildren = familyChildren;
    }
    public String getFamilyChildrenOtherContent() {
        return familyChildrenOtherContent;
    }
    public void setFamilyChildrenOtherContent(String familyChildrenOtherContent) {
        this.familyChildrenOtherContent = familyChildrenOtherContent;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/PatientInfoService.java

@@ -519,7 +519,7 @@ public class PatientInfoService extends BaseService {
        archiveInfo.setHomeAddress(archive.getAdress());
        archiveInfo.setOrgId("0");
        archiveInfo.setResidence(1);
        archiveInfo.setNational(archive.getAdress());
        archiveInfo.setNational(archive.getNation());
        archiveInfo.setOrigo("350200");
        archiveInfo.setBlood(Integer.valueOf(archive.getBlood()));
        archiveInfo.setBloodRh(1);
@@ -533,9 +533,6 @@ public class PatientInfoService extends BaseService {
        json.put("TRANSFUSION","0");//   "TRANSFUSION":"既往史--输血--【0 无 1 有】(同一类别，新增时，默认选无)",
        json.put("EXPOSE_WITHOUT","1");//"EXPOSE_WITHOUT":"暴露史--无【0不勾选 1勾选】(同一类别，新增时，默认勾选)",
        archiveInfo.setAllergic("0");
        archiveInfo.setPast("0");
        archiveInfo.setGenetic(0);
        //教育程度
        if(StringUtils.isNotBlank(archive.getEducation())){
@@ -574,6 +571,7 @@ public class PatientInfoService extends BaseService {
                if("4".equals(str)){
                    json.put("ALLERGIC_OTHER","1");//药物过敏史--其它
                    allergicStr +="4,";
                    archiveInfo.setAllergicOtherContent(archive.getDrugOtherContent());
                }
            }
            if (allergicStr.length()>1){
@@ -587,6 +585,7 @@ public class PatientInfoService extends BaseService {
        //既往史
        if(StringUtils.isNotBlank(archive.getPastHistorys())){
            String pastStr = "";
            String pastDateStr = "";
            json.put("PAST_NONE","0");//既往史
            String phs[] = archive.getPastHistorys().split(",");
            String dates[] = archive.getPastHistoryDate().split(",");
@@ -596,14 +595,14 @@ public class PatientInfoService extends BaseService {
                    pastStr +="1,";
                    if(!"0".equals(dates[i])){
                        json.put("PAST_HYPERTENSION_DATE",dates[i]);//既往史--疾病--高血压日期
                        archiveInfo.setPastHypertensionDate(dates[i]);
                        pastDateStr += dates[i]+",";
                    }
                }else if("2".equals(phs[i])){
                    json.put("PAST_DIABETES","1");//既往史--疾病--糖尿病【0不勾选 1勾选】
                    pastStr +="2,";
                    if(!"0".equals(dates[i])){
                        json.put("PAST_DIABETES_DATE",dates[i]);//既往史--疾病--糖尿病日期
                        archiveInfo.setPastDiabetesDate(dates[i]);
                        pastDateStr += dates[i]+",";
                    }
                }
//                if("3".equals(phs[i])){
@@ -617,14 +616,19 @@ public class PatientInfoService extends BaseService {
                    pastStr +="4,";
                    if(!"0".equals(dates[i])){
                        json.put("PAST_OTHER_CONTENT_DATE",dates[i]);//既往史--疾病--高血压日期
                        archiveInfo.setPastOtherContentDate(dates[i]);
                        pastDateStr += dates[i]+",";
                    }
                    archiveInfo.setPastOtherContent(archive.getPastHistoryContent());
                }
            }
            if (pastStr.length()>1){
                pastStr = pastStr.substring(0,pastStr.length()-1);
            }
            archiveInfo.setPast(pastStr);
            if (pastDateStr.length()>1){
                pastDateStr = pastDateStr.substring(0,pastDateStr.length()-1);
            }
            archiveInfo.setPastDate(pastDateStr);
        }else{
            json.put("PAST_NONE","1");//既往史
            archiveInfo.setPast("0");
@@ -634,7 +638,7 @@ public class PatientInfoService extends BaseService {
        if(StringUtils.isNotBlank(archive.getGeneticFlag())){
            json.put("GENETIC","1");//遗传病史【0 无 1 有】
            json.put("GENETIC_DISEASENAME",archive.getGeneticContent());//疾病名称
            archiveInfo.setGenetic(0);
            archiveInfo.setGenetic(1);
            archiveInfo.setGeneticDiseaseName(archive.getGeneticContent());
        }else{
            json.put("GENETIC","0");//遗传病史【0 无 1 有】
@@ -692,7 +696,7 @@ public class PatientInfoService extends BaseService {
        //家族史
        if(StringUtils.isNotBlank(archive.getFamilyHistoryFlag())&&"1".equals(archive.getFamilyHistoryFlag())){
            archiveInfo.setFamilyNone(1);
            //父亲
            if(StringUtils.isNotBlank(archive.getFamilyFatherHistorys())){
                String fatherStr ="";
@@ -982,7 +986,7 @@ public class PatientInfoService extends BaseService {
        archiveInfo.setHomeAddress(archive.getAdress());
        archiveInfo.setOrgId("0");
        archiveInfo.setResidence(1);
        archiveInfo.setNational(archive.getAdress());
        archiveInfo.setNational(archive.getNation());
        archiveInfo.setOrigo("350200");
        archiveInfo.setBlood(Integer.valueOf(archive.getBlood()));
        archiveInfo.setBloodRh(1);
@@ -995,10 +999,6 @@ public class PatientInfoService extends BaseService {
        json.put("TRANSFUSION","0");//   "TRANSFUSION":"既往史--输血--【0 无 1 有】(同一类别，新增时，默认选无)",
        json.put("EXPOSE_WITHOUT","1");//"EXPOSE_WITHOUT":"暴露史--无【0不勾选 1勾选】(同一类别，新增时，默认勾选)",
        archiveInfo.setAllergic("0");
        archiveInfo.setPast("0");
        archiveInfo.setGenetic(0);
        //教育程度
        if(StringUtils.isNotBlank(archive.getEducation())){
            json.put("EDUCATION",archive.getEducation()+"");//文化程度
@@ -1012,7 +1012,7 @@ public class PatientInfoService extends BaseService {
        //支付方式
        if(StringUtils.isNotBlank(archive.getPayment())){
            json.put("MEDICAL_EXPENSES",archive.getPayment()+"");//支付方式
            archiveInfo.setMedicalExpenses(Integer.getInteger(archive.getPayment()));
            archiveInfo.setMedicalExpenses(Integer.valueOf(archive.getPayment()));
        }
        //药物过敏史
@@ -1036,6 +1036,7 @@ public class PatientInfoService extends BaseService {
                if("4".equals(str)){
                    json.put("ALLERGIC_OTHER","1");//药物过敏史--其它
                    allergicStr +="4,";
                    archiveInfo.setAllergicOtherContent(archive.getDrugOtherContent());
                }
            }
            if (allergicStr.length()>1){
@@ -1049,6 +1050,7 @@ public class PatientInfoService extends BaseService {
        //既往史
        if(StringUtils.isNotBlank(archive.getPastHistorys())){
            String pastStr = "";
            String pastDateStr = "";
            json.put("PAST_NONE","0");//既往史
            String phs[] = archive.getPastHistorys().split(",");
            String dates[] = archive.getPastHistoryDate().split(",");
@@ -1058,14 +1060,14 @@ public class PatientInfoService extends BaseService {
                    pastStr +="1,";
                    if(!"0".equals(dates[i])){
                        json.put("PAST_HYPERTENSION_DATE",dates[i]);//既往史--疾病--高血压日期
                        archiveInfo.setPastHypertensionDate(dates[i]);
                        pastDateStr += dates[i]+",";
                    }
                }else if("2".equals(phs[i])){
                    json.put("PAST_DIABETES","1");//既往史--疾病--糖尿病【0不勾选 1勾选】
                    pastStr +="2,";
                    if(!"0".equals(dates[i])){
                        json.put("PAST_DIABETES_DATE",dates[i]);//既往史--疾病--糖尿病日期
                        archiveInfo.setPastDiabetesDate(dates[i]);
                        pastDateStr += dates[i]+",";
                    }
                }
//                if("3".equals(phs[i])){
@@ -1079,8 +1081,9 @@ public class PatientInfoService extends BaseService {
                    pastStr +="4,";
                    if(!"0".equals(dates[i])){
                        json.put("PAST_OTHER_CONTENT_DATE",dates[i]);//既往史--疾病--高血压日期
                        archiveInfo.setPastOtherContentDate(dates[i]);
                        pastDateStr += dates[i]+",";
                    }
                    archiveInfo.setPastOtherContent(archive.getPastHistoryContent());
                }
            }
@@ -1088,6 +1091,10 @@ public class PatientInfoService extends BaseService {
                pastStr = pastStr.substring(0,pastStr.length()-1);
            }
            archiveInfo.setPast(pastStr);
            if (pastDateStr.length()>1){
                pastDateStr = pastDateStr.substring(0,pastDateStr.length()-1);
            }
            archiveInfo.setPastDate(pastDateStr);
        }else{
            json.put("PAST_NONE","1");//既往史
            archiveInfo.setPast("0");
@@ -1095,10 +1102,15 @@ public class PatientInfoService extends BaseService {
        //遗传病史
        if(StringUtils.isNotBlank(archive.getGeneticFlag())){
            json.put("GENETIC","1");//遗传病史【0 无 1 有】
            json.put("GENETIC_DISEASENAME",archive.getGeneticContent());//疾病名称
            archiveInfo.setGenetic(0);
            archiveInfo.setGeneticDiseaseName(archive.getGeneticContent());
            if ("1".equals(archive.getGeneticFlag())){
                json.put("GENETIC","1");//遗传病史【0 无 1 有】
                json.put("GENETIC_DISEASENAME",archive.getGeneticContent());//疾病名称
                archiveInfo.setGenetic(1);
                archiveInfo.setGeneticDiseaseName(archive.getGeneticContent());
            }else{
                json.put("GENETIC","0");//遗传病史【0 无 1 有】
                archiveInfo.setGenetic(0);
            }
        }else{
            json.put("GENETIC","0");//遗传病史【0 无 1 有】
            archiveInfo.setGenetic(0);
@@ -1155,7 +1167,7 @@ public class PatientInfoService extends BaseService {
        //家族史
        if(StringUtils.isNotBlank(archive.getFamilyHistoryFlag())&&"1".equals(archive.getFamilyHistoryFlag())){
            archiveInfo.setFamilyNone(1);
            //父亲
            if(StringUtils.isNotBlank(archive.getFamilyFatherHistorys())){
                String fatherStr ="";

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/archives/PatientArchiveInfoService.java

@@ -51,12 +51,13 @@ public class PatientArchiveInfoService {
    public List<Map<String,Object>> findArchiveList(String doctorCode, String signStatus, String startTime, String endTime, String keyWord, int pageNo, int pageSize){
        List<Map<String,Object>> archiveInfoList = new ArrayList<>();
        String sql = "SELECT " +
                " ai.code AS code, " +
                " ai.sick_name AS sickName, " +
                " ai.identity_card_no AS identityCardNo, " +
                " ai.archive_time archiveTime, " +
                " ai.sign_status AS signStatus, " +
                " c.name AS zoneName " +
                " c.code AS zoneCode " +
                " c.name AS zoneName, " +
                " c.code AS zoneCode, " +
                " c.jw_code AS jwZoneCode " +
                " FROM " +
                " wlyy_archive_info ai " +
@@ -79,7 +80,7 @@ public class PatientArchiveInfoService {
                    " )";
        }
        int start = (pageNo-1)*pageSize;
        sql += "limit ?,?";
        sql += " ORDER BY ai.archive_time DESC limit ?,?";
        archiveInfoList = jdbcTemplate.queryForList(sql,new Object[]{start,pageSize});
        return  archiveInfoList;
    }
@@ -91,6 +92,8 @@ public class PatientArchiveInfoService {
        BeanUtils.copyProperties(archiveInfo,archiveInfoDto);
        List<SystemDict> bloodType = systemDictDao.findByDictName("BLOOD_TYPE");
        List<SystemDict> marryState = systemDictDao.findByDictName("MARRY_STATE");
        String sql = "SELECT t.NATION_CODE,t.NATION_NAME FROM zy_nation_dict t ";
        List<Map<String,Object>> rs = jdbcTemplate.queryForList(sql);
        //设置血型字典里的值返回前端
        if (bloodType!=null && bloodType.size()>0){
            for (SystemDict blood : bloodType){
@@ -120,6 +123,15 @@ public class PatientArchiveInfoService {
        if (city!=null){
            archiveInfoDto.setOrigoStr(city.getName());
        }
        //设置民族具体名称
        if (rs!=null && rs.size()>0){
            for (Map<String,Object> map : rs){
                if ((map.get("NATION_CODE")+"").equals(archiveInfoDto.getNational())){
                    archiveInfoDto.setNational(map.get("NATION_NAME")+"");
                }
            }
        }
        return archiveInfoDto;
    }
}

patient-co/patient-co-wlyy/src/main/resources/application-devtest.yml

@@ -11,6 +11,10 @@ spring:
      url: jdbc:mysql://172.19.103.85/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: linzhou
      password: linzhou
    jkedu:
      url: jdbc:mysql://172.19.103.85/jkedudb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: linzhou
      password: linzhou
  redis:
    host: 172.19.103.88 # Redis server host.