病案首页字段转义

src/main/java/com/diagbot/enums/data/FamousFamilyEnum.java

@@ -0,0 +1,100 @@
+package com.diagbot.enums.data;
+
+import lombok.Setter;
+
+public enum FamousFamilyEnum implements AKeyedNamed {
+    CHUANQINGREN("59", "穿青人"),
+    QITAZU("57", "其他族"),
+    GELAOZU("37", "仡佬族"),
+    SALAZU("35", "撒拉族"),
+    QIANGZU("33", "羌族"),
+    NAXIZU("27", "纳西族"),
+    MANZU("11", "满族"),
+    PUMIZU("40", "普米族"),
+    NUZU("42", "怒族"),
+    TATAZU("50", "塔塔族"),
+    TUJIAZU("15", "土家族"),
+    WAIGUOJI("58", "外国籍"),
+    TUZU("30", "土族"),
+    SHEZU("22", "畲族"),
+    LISUZY("20", "傈僳族"),
+    TAJIKE("41", "塔吉克"),
+    SHUIZU("25", "水族"),
+    KEZ("29", "柯尔克"),
+    JINGZU("49", "京族"),
+    LAHUZU("24", "拉祜族"),
+    LUOBAZU("55", "珞巴族"),
+    HEZHEZU("53", "赫哲族"),
+    HASAKE("17", "哈萨克"),
+    JINGPOZU("28", "景颇族"),
+    JINUOZU("56", "基诺族"),
+    MULAOZU("32", "仫佬族"),
+    MENGGUZU("2", "蒙古族"),
+    MIAOZU("6", "苗族"),
+    MAONANZU("36", "毛难族"),
+    LIZU("19", "黎族"),
+    YIZU("7", "彝族"),
+    MENBAZU("54", "门巴族"),
+    HUIZU("3", "回族"),
+    WEIWUER("5", "维吾尔"),
+    CHAOXIANZU("10", "朝鲜族"),
+    DULONGZU("51", "独龙族"),
+    DAWOER("31", "达斡族"),
+    BAIZU("14", "白族"),
+    BULANGZU("34", "布朗族"),
+    BENGLONGZU("46", "崩龙族"),
+    BUYIZU("9", "布依族"),
+    DONGXIANGZU("26", "东乡族"),
+    EWENKE("45", "鄂温克"),
+    GAOSHANZU("23", "高山族"),
+    HANIZU("16", "哈尼族"),
+    ELUOSI("44", "俄罗斯"),
+    DONGZU("12", "侗族"),
+    DAIZU("18", "傣族"),
+    ELUNCHUN("52", "鄂伦春"),
+    XIBOZU("38", "锡伯族"),
+    WUZIBIE("43", "乌孜别"),
+    WAZU("21", "佤族"),
+    YUGUZU("48", "裕固族"),
+    ZHUANGZU("8", "壮族"),
+    ZANGZU("4", "藏族"),
+    YAOZU("13", "瑶族"),
+    ACANGZU("39", "阿昌族"),
+    BAOANZU("47", "保安族"),
+    HANZU("1", "汉族");
+
+    @Setter
+    private String key;
+
+    @Setter
+    private String name;
+
+    FamousFamilyEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static FamousFamilyEnum getEnum(String key) {
+        for (FamousFamilyEnum item : FamousFamilyEnum.values()) {
+            if (key.equals(item.getKey())) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        FamousFamilyEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

src/main/java/com/diagbot/enums/data/NationalityEnum.java

@@ -0,0 +1,263 @@
+package com.diagbot.enums.data;
+
+import lombok.Setter;
+
+public enum NationalityEnum implements AKeyedNamed {
+    MLXY("116", "马来西亚"),
+    MSBJ("117", "莫桑比克"),
+    XGLDNY("118", "新喀里多尼亚"),
+    MLQS("113", "毛里求斯"),
+    MEDF("114", "马尔代夫"),
+    MXG("115", "墨西哥"),
+    NRE("119", "尼日尔"),
+
+    NW("123", "挪威"),
+    NBE("124", "尼泊尔"),
+    MDD("125", "毛德地"),
+    NFKD("120", "诺福克岛"),
+    NRLY("121", "尼日利亚"),
+    HL("122", "荷兰"),
+    MET("112", "马耳他"),
+    MLG("102", "摩洛哥"),
+    MNG("103", "摩纳哥"),
+    MDJSJ("104", "马达加斯加"),
+    LTE("99", "莱索托"),
+    LSB("100", "卢森堡"),
+    LBY("101", "利比亚"),
+    ZTD("105", "中途岛"),
+    MTNK("109", "马提尼克"),
+    MLTNY("110", "毛里塔尼亚"),
+    MTSLT("111", "蒙特塞拉特"),
+    ML("106", "马里"),
+    MG("107", "蒙古"),
+    AOMEN("108", "澳门"),
+    NL("126", "瑙鲁"),
+    BLS("14", "比利时"),
+    WLSHFTNQD("187", "瓦利斯和富图纳群岛"),
+    MSWEJQD("204", "美属维尔京群岛"),
+    BLZ("25", "伯利兹"),
+    BL("138", "波兰"),
+    MJL("13", "孟加拉"),
+    FDQ("203", "梵蒂酋"),
+    NMBY("199", "纳米比亚"),
+    MLW("198", "马拉维"),
+    GLL("197", "格陵兰"),
+    TSNY("202", "坦桑尼亚"),
+    DDW("201", "东帝汶"),
+    NJLG("200", "尼加拉瓜"),
+    BELS("24", "白俄罗斯"),
+    AM("130", "阿曼"),
+    BNM("131", "巴拿马"),
+    TPYQD("132", "太平洋群岛"),
+    ZJDD("127", "中间地带"),
+    NAD("128", "纽埃岛"),
+    XXL("129", "新西兰"),
+    MILU("133", "秘鲁"),
+    BJST("137", "巴基斯坦"),
+    BD("21", "不丹"),
+    BWD("23", "布维岛"),
+    FSBLNXY("134", "法属波利尼西亚"),
+    BBYXJNY("135", "巴布亚新几内亚"),
+    FLB("136", "菲律宾"),
+    YN("185", "越南"),
+    WNRL("183", "委内瑞拉"),
+    SWSTHGLNDS("182", "圣文森特和格林纳丁斯"),
+    ADE("2", "安道尔"),
+    ALBLHQZG("212", "阿拉伯联合酋长国"),
+    WLAT("186", "瓦努阿图"),
+    SLLA("158", "塞拉利昂"),
+    JND("26", "加拿大"),
+    YSWEJQD("184", "英属维尔京群岛"),
+    LW("92", "老挝"),
+    MD("22", "缅甸"),
+    BN("17", "贝宁"),
+    KMQD("91", "开曼群岛"),
+    AFH("3", "阿富汗"),
+    NWS("87", "圣基茨-尼维斯-安圭拉"),
+    KML("86", "科摩罗"),
+    JLBS("85", "基里巴斯"),
+    KWT("90", "科威特"),
+    NCX("89", "南朝鲜"),
+    CX("88", "朝鲜"),
+    JPZ("84", "柬埔寨"),
+    YD("80", "约旦"),
+    YMJ("79", "牙买加"),
+    ATG("4", "安提瓜"),
+    KNY("83", "肯尼亚"),
+    YHSDD("82", "约翰斯顿岛"),
+    RB("81", "日本"),
+    NBN("93", "黎巴嫩"),
+    ASEBY("47", "埃塞俄比亚"),
+    XBY("46", "西班牙"),
+    AJ("45", "埃及"),
+    FG("51", "法国"),
+    FL("50", "法罗"),
+    FJ("48", "斐济"),
+    EGDE("44", "厄瓜多尔"),
+    SLLK("96", "斯里兰卡"),
+    YSYDYLT("97", "英属印度洋领土"),
+    LBLY("98", "利比里亚"),
+    AEJLY("43", "阿尔及利亚"),
+    SLXY("94", "圣卢西亚"),
+    LZDTD("95", "列支敦土登"),
+    JP("52", "加蓬"),
+    GG("28", "刚果"),
+    KKQD("27", "可可（基林）群岛"),
+    YDL("78", "意大利"),
+    ZL("31", "智利"),
+    KUKEQUNDAO("30", "库克群岛"),
+    RS("29", "瑞士"),
+    BINGDAO("77", "冰岛"),
+    JN("56", "加纳"),
+    GLND("54", "格林纳达"),
+    YG("53", "英国"),
+    YL("76", "伊朗"),
+    YLK("75", "伊拉克"),
+    GBY("57", "冈比亚"),
+    GSDNJ("34", "哥斯达黎加"),
+    GLBY("33", "哥伦比亚"),
+    AGL("7", "安哥拉"),
+    FDJ("37", "佛得角"),
+    GB("36", "古巴"),
+    KDHEDBLQD("35", "坎顿和恩德贝里群岛"),
+    NJZ("8", "南极洲"),
+    ZBLT("218", "直布罗陀"),
+    FKLQD("217", "福克兰群岛（马尔维纳斯）"),
+    XCHL("216", "西撤哈拉"),
+    AGT("9", "阿根廷"),
+    MSSMY("10", "美属萨摩亚"),
+    XL("219", "希腊"),
+    SPLS("39", "塞浦路斯"),
+    HD("68", "海地"),
+    HDLS("67", "洪都拉斯"),
+    XG("65", "香港"),
+    AEL("72", "爱尔兰"),
+    SWET("70", "上沃尔特"),
+    XYL("69", "匈牙利"),
+    GYN("64", "圭亚那"),
+    GDLP("59", "瓜德罗普"),
+    DM("41", "丹麦"),
+    JBT("40", "吉布提"),
+    JNYBS("63", "几内亚比绍"),
+    GD("62", "关岛"),
+    WDML("61", "危地马拉"),
+    DMNJ("215", "多米尼加"),
+    WGD("179", "乌干达"),
+    SDMHPLXB("163", "圣多美和普林西比"),
+    SDD("38", "圣诞岛"),
+    SLMQD("151", "所罗门群岛"),
+    ZD("169", "乍得"),
+    TEQ("175", "土耳其"),
+    DMNJGHG("42", "多米尼加共和国"),
+    ELS("220", "俄罗斯"),
+    HDD("66", "赫德岛"),
+    YDNXY("71", "印度尼西亚"),
+    FENLAN("49", "芬兰"),
+    FSGYN("55", "法属圭亚那"),
+    CDJNY("60", "赤道几内亚"),
+    SSE("152", "塞舌尔"),
+    XYHA("211", "象牙海岸"),
+    ZF("210", "中非"),
+    BCWN("209", "博茨瓦纳"),
+    DG("214", "德国"),
+    JKSLFK("213", "捷克斯洛伐克"),
+    ZHONGGUO("1", "中国"),
+    BHM("208", "巴哈马"),
+    ADL("11", "奥地利"),
+    JNY("58", "几内亚"),
+    SD("153", "苏丹"),
+    WL("207", "文莱"),
+    BLD("206", "布隆迪"),
+    BBDS("205", "巴巴多斯"),
+    YSL("73", "以色列"),
+    LNW("147", "留尼汪"),
+    KNE("146", "卡诺尔"),
+    BLG("145", "巴拉圭"),
+    BMD("18", "百慕大"),
+    BALIN("16", "巴林"),
+    BJLY("15", "保加利亚"),
+    GML("32", "喀麦隆"),
+    BDNG("141", "波多黎各"),
+    PTKED("140", "皮特凯恩岛"),
+    SPAEHMKL("139", "圣皮埃尔和密克隆"),
+    MSTPYQD("144", "美属太平洋群岛"),
+    PTY("143", "葡萄牙"),
+    BLST("142", "巴勒斯坦"),
+    BLWY("19", "玻利维亚"),
+    NF("193", "南非（阿札尼亚）"),
+    NSLF("192", "南斯拉夫"),
+    YM("191", "也门"),
+    JBBW("196", "津巴布韦"),
+    ZYE("195", "扎伊尔"),
+    ZBY("194", "赞比亚"),
+    MZYM("190", "民主也门"),
+    LWD("149", "卢旺达"),
+    LMLY("148", "罗马尼亚"),
+    BX("20", "巴西"),
+    XSMY("189", "西萨摩亚"),
+    WKD("188", "威克岛"),
+    STALB("150", "沙特阿拉伯"),
+    WKL("178", "乌克兰"),
+    TWL("177", "图瓦卢"),
+    TLNDHDBG("176", "特立尼达和多哥巴"),
+    SLN("162", "苏里南"),
+    WLG("181", "乌拉圭"),
+    MEIGUO("180", "美国"),
+    TJ("174", "汤加"),
+    DUOGE("170", "多哥"),
+    TKSHKKSQD("168", "特克斯和凯科斯群岛"),
+    YINGDU("74", "印度"),
+    TNS("173", "突尼斯"),
+    TKL("172", "托克劳"),
+    TG("171", "泰国"),
+    SL("164", "苏联"),
+    SMLN("159", "圣马力诺"),
+    SWBDQD("157", "斯瓦巴德群岛"),
+    SHLN("156", "圣赫勒拿"),
+    SNJE("160", "塞内加尔"),
+    ADLY("12", "澳大利亚"),
+    AEBNY("5", "阿尔巴尼亚"),
+    HSADLS("6", "荷属安的列斯"),
+    SWSL("167", "斯威士兰"),
+    XLY("166", "叙利亚"),
+    WEWD("165", "萨尔瓦多"),
+    SML("161", "索马里"),
+    XJP("155", "新加坡"),
+    RD("154", "瑞典"),
+    ;
+
+    @Setter
+    private String key;
+
+    @Setter
+    private String name;
+
+    NationalityEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static NationalityEnum getEnum(String key) {
+        for (NationalityEnum item : NationalityEnum.values()) {
+            if (key.equals(item.getKey())) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        NationalityEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

src/main/java/com/diagbot/enums/data/OccupationEnum.java

@@ -0,0 +1,67 @@
+package com.diagbot.enums.data;
+
+import lombok.Setter;
+
+public enum OccupationEnum implements AKeyedNamed{
+    UNKNOWN("20","未知"),
+    WORKER("6","工人"),
+    CIVIL_SERVANT("5-23","公务员"),
+    FARMER("7","农民"),
+    RETIREE("11","退休人员"),
+    SOLDIER("4","军人"),
+    LAWYER("1-03","律师"),
+    UNEMPLOYED("19","无业"),
+    KJRY("0-51","科技人员"),
+    OTHER("15","其他"),
+    STUDENT("1","学生"),
+    LIBERAL_PROFESSIONS("13","自由职业"),
+    DRIVER("9-54","司机"),
+    CHILDREN("18","儿童"),
+    COOK("5-31","厨师"),
+    ACCOUNTANTS("0-93","财会人员"),
+    ENGINEER("10","工程师"),
+    GTH("14","个体户"),
+    CLERK("17","文员"),
+    ATHLETES("1-30","运动员"),
+    STAFF_MEMBER("5","职员"),
+    BABY("16","婴幼儿"),
+    CADRE("2-14","干部"),
+    NURSE("0-73","护士"),
+    TEACHER("1-14","教师"),
+    DOCTOR("0-71", "医生");
+
+    @Setter
+    private String key;
+
+    @Setter
+    private String name;
+
+    OccupationEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static OccupationEnum getEnum(String key) {
+        for (OccupationEnum item : OccupationEnum.values()) {
+            if (key.equals(item.getKey())) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        OccupationEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

src/main/java/com/diagbot/enums/data/RelationshipEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums.data;
+
+import lombok.Setter;
+
+public enum RelationshipEnum implements AKeyedNamed{
+    BR_OR_HZ("01","本人或户主"),
+    SPOUSE("10","配偶"),
+    SON("20","子"),
+    GIRLFRIENDS_AND_GIRLFRIENDS("99","男女朋友"),
+    DAUGHTER("30","女"),
+    GRAND_SON("101","孙子、孙女、或外孙子、外孙女"),
+    PARENT("100","父母"),
+    GRANDPARENT("61","祖父母或外祖父母"),
+    BROTHERS_AND_SISTERS("70","兄、弟、姐、妹"),
+    OTHER("97", "其他");
+
+    @Setter
+    private String key;
+
+    @Setter
+    private String name;
+
+    RelationshipEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static RelationshipEnum getEnum(String key) {
+        for (RelationshipEnum item : RelationshipEnum.values()) {
+            if (key.equals(item.getKey())) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        RelationshipEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 @Component
 public class AHomePageFacade extends HomePageServiceImpl{
@@ -137,11 +138,15 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 //初始化入参
                 HomePage homePage=new HomePage();
                 BeanUtil.copyProperties(s,homePage);
-                if(StringUtil.isNotEmpty(s.getSex())){
+                if(StringUtil.isNotEmpty(s.getSex()) && Pattern.compile("^[-\\+]?[\\d]*$").matcher(s.getSex()).matches()){
                     //性别，1：男，2：女
                     homePage.setSex(SexEnum.getName(s.getSex()));
                 }
-                if(StringUtil.isNotEmpty(s.getMarriage())){
+//                if(StringUtil.isNotEmpty(s.getSex())){
+//                    //性别，1：男，2：女
+//                    homePage.setSex(SexEnum.getName(s.getSex()));
+//                }
+                if(StringUtil.isNotEmpty(s.getMarriage()) && Pattern.compile("^[-\\+]?[\\d]*$").matcher(s.getMarriage()).matches()){
                     //婚姻，1：未婚，2：已婚，3：丧偶，4：离婚，9：其他
                     homePage.setMarriage(MarriageEnum.getName(s.getMarriage()));
                 }
@@ -267,7 +272,6 @@ public class AHomePageFacade extends HomePageServiceImpl{
             }else{
                 //页面模式+接口引擎模式
                 String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
-
                 AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
                 analyzeRunVO.setBehospitalCode(behospitalCode);
                 analyzeRunVO.setHospitalId(hospitalId);

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -7,14 +7,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.data.AHomeOperationDTO;
 import com.diagbot.dto.data.AMedicalRecordDTO;
 import com.diagbot.dto.data.AMrContentDTO;
 import com.diagbot.entity.*;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.BasDeptInfoFacade;
-import com.diagbot.facade.BehospitalInfoFacade;
-import com.diagbot.facade.ModelHospitalFacade;
-import com.diagbot.facade.QcTypeFacade;
+import com.diagbot.enums.data.FamousFamilyEnum;
+import com.diagbot.enums.data.NationalityEnum;
+import com.diagbot.enums.data.OccupationEnum;
+import com.diagbot.enums.data.RelationshipEnum;
+import com.diagbot.facade.*;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
 import com.diagbot.service.impl.QcAbnormalServiceImpl;
 import com.diagbot.util.*;
@@ -72,14 +74,14 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
     private AHomePageFacade aHomePageFacade;
 
     public static final Map<String,String> CITY_MAP = MapUtil.getMap("cityCode.json");
+
     /**
      * 终末质控-同步前一天的病历记录
      */
     public void executeMrRecord() {
         //String sql="select * from mr_medicalrecords  where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
         //String sql="select * from mr_medicalrecords  where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
-        String sql="select * from ai_v_sendmrrecording where behospitalcode in(select behospitalcode from AI_V_SENDPATIENTINFO where leavehospitaldate >=to_date('2020-10-01','yyyy-mm-dd') and leavehospitaldate<to_date('2020-11-22','yyyy-mm-dd'))";
-//        String sql = sqlProperties.getRecordInfoSql();
+        String sql="select * from ai_v_sendmrrecording where behospitalcode in()";
         List<MedicalRecord> medicalRecordList = tzDBConn.getMedicalRecord(sql);
         execute(medicalRecordList);
     }
@@ -148,24 +150,28 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     }else if (aMedicalRecordVO.getContents() == null || aMedicalRecordVO.getContents().size() == 0) {
                         return RespDTO.onError("请输入文书详情!");
                     }
-
                 }
                 //更新文书信息
                 executeMrRecord(aMrContentVO.getRecords());
                 aMrContentVO.getRecords().stream().forEach(s -> {
-                    //更新文书详情
                     if(StringUtil.isNotEmpty(aMrContentVO.getTranscode())){
-                        long startTime=System.currentTimeMillis();
-                        String sql = "SELECT * FROM AI_V_SENDMRRECORDING WHERE RECID = '"+s.getRecId()+"'";
-                        List<MedicalRecordContent> medicalRecordContentList =  tzDBConn.getMedicalRecordContent(sql);
-                        aMedicalRecordContentFacade.execute(medicalRecordContentList);
-                        long endTime=System.currentTimeMillis();
-                        System.out.println((endTime-startTime));
-                    }else{
-                        aMedicalRecordContentFacade.executeMrRecordContent(s.getContents());
+                        String sql = "SELECT CONTENTS FROM AI_V_SENDMRRECORDING WHERE RECID = '"+s.getRecId()+"' AND BEHOSPITALCODE = '" + s.getBehospitalCode() + "'";
+                        s.getContents().get(0).setXmlText(tzDBConn.getRecordXml(sql));
                     }
+                    aMedicalRecordContentFacade.executeMrRecordContent(s.getContents());
+//                    //更新文书详情
+//                    if(StringUtil.isNotEmpty(aMrContentVO.getTranscode())){
+//                        long startTime=System.currentTimeMillis();
+//                        String sql = "SELECT * FROM AI_V_SENDMRRECORDING WHERE RECID = '"+s.getRecId()+"'";
+//                        List<MedicalRecordContent> medicalRecordContentList =  tzDBConn.getMedicalRecordContent(sql);
+//
+//                        aMedicalRecordContentFacade.execute(medicalRecordContentList);
+//                        long endTime=System.currentTimeMillis();
+//                        System.out.println((endTime-startTime));
+//                    }else{
+//                        aMedicalRecordContentFacade.executeMrRecordContent(s.getContents());
+//                    }
                 });
-
                 //评分后返回结构体
                 if(aMrContentVO.getRecords().get(0).getRecTypeId().equals("BASY")){
                     AHomePageIngVO aHomePageIngVO = new AHomePageIngVO();
@@ -175,7 +181,6 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 }else {
                     return mrIng(aMrContentVO);
                 }
-
             }else{
                 aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息","",JSON.toJSONString(aMrContentVO),"","未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
@@ -284,6 +289,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         if(StringUtil.isNotEmpty(paramsObj.getString("出生日期").replaceAll("[\u4e00-\u9fa5]","").trim())){
             aHomePageVO.setBirthday(paramsObj.getString("出生日期").replaceAll("[\u4e00-\u9fa5]","-"));
         }
+
         aHomePageVO.setAge(paramsObj.getString("新生儿年龄").replaceAll("[\u4e00-\u9fa5]",""));
         if(paramsObj.getString("新生儿年龄").contains("天")){
             aHomePageVO.setAgeUnit("天");
@@ -292,7 +298,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         }else {
             aHomePageVO.setAgeUnit("岁");
         }
-        aHomePageVO.setNationality(paramsObj.getString("国籍"));
+        aHomePageVO.setNationality(NationalityEnum.getName(paramsObj.getString("国籍")));
         aHomePageVO.setNewbornWeight(paramsObj.getString("新生儿出生体重"));
         //aHomePageVO.setNewbornBehospitalWeight("");
         String[] provinceList =  paramsObj.getString("省").split(" ");
@@ -324,10 +330,10 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         }
         aHomePageVO.setResidenceAddress(aHomePageVO.getResidenceAddress()+paramsObj.getString("户口地址其它"));
         aHomePageVO.setBornPlace(CITY_MAP.get(paramsObj.getString("籍贯_省")) + CITY_MAP.get(paramsObj.getString("籍贯_市")));
-        aHomePageVO.setNation(paramsObj.getString("民族"));
+        aHomePageVO.setNation(FamousFamilyEnum.getName(paramsObj.getString("民族")));
         aHomePageVO.setIdentityCardNo(paramsObj.getString("身份证号"));
-        aHomePageVO.setJobType(paramsObj.getString("职业"));
-        aHomePageVO.setMarriage(paramsObj.getString("婚姻"));//待定
+        aHomePageVO.setJobType(OccupationEnum.getName(paramsObj.getString("职业")));
+        aHomePageVO.setMarriage(paramsObj.getString("婚姻"));
         aHomePageVO.setCurAddress(CITY_MAP.get(paramsObj.getString("现住址_省"))+CITY_MAP.get(paramsObj.getString("现住址_市"))+CITY_MAP.get(paramsObj.getString("现住址_县"))+paramsObj.getString("现住址其它"));
         aHomePageVO.setCurPhone(paramsObj.getString("现住址电话"));
         aHomePageVO.setCurPostCode(paramsObj.getString("现住址邮编"));
@@ -336,21 +342,21 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         aHomePageVO.setWorkPhone(paramsObj.getString("工作单位电话"));
         aHomePageVO.setWorkPostCode(paramsObj.getString("工作单位邮编"));
         aHomePageVO.setContactName(paramsObj.getString("联系人姓名"));
-        aHomePageVO.setContactRelation(paramsObj.getString("联系人关系"));
+        aHomePageVO.setContactRelation(RelationshipEnum.getName(paramsObj.getString("联系人关系")));
         aHomePageVO.setContactAddress(paramsObj.getString("联系人地址"));
         aHomePageVO.setContactPhone(paramsObj.getString("联系人电话"));
-        if(StringUtil.isNotBlank(paramsObj.getString("入院途径"))){
+        if(StringUtil.isNotBlank(paramsObj.getString("入院途径"))){ //待定
             aHomePageVO.setBehospitalWay(paramsObj.getString("入院途径").split(" ")[0]);
         }
-        if(YWDateUtils.isDate(paramsObj.getString("入院时间"),"yyyy年MM月dd日 HH时mm分")){
+        if(YWDateUtils.isDate(paramsObj.getString("入院时间"),"yyyy年MM月dd日 HH时mm分") || YWDateUtils.isDate(paramsObj.getString("入院时间"),"yyyy-MM-dd HH:mm:ss")){
             aHomePageVO.setBehospitalDate(DateUtil.format(YWDateUtils.parseDateTime(paramsObj.getString("入院时间")),DateUtil.DATE_TIME_FORMAT));
         }
-        aHomePageVO.setBehospitalDept(paramsObj.getString("入院科别"));
+        aHomePageVO.setBehospitalDept(tzDBConn.getDeptName(paramsObj.getString("入院科别")));
         aHomePageVO.setBehospitalWard(paramsObj.getString("入院病房"));
         //aHomePageVO.setBehospitalBedId();
         //aHomePageVO.setBehospitalBedCode();
         aHomePageVO.setChangeDept(paramsObj.getString("转科科别"));
-        if(YWDateUtils.isDate(paramsObj.getString("出院时间"),"yyyy年MM月dd日 HH时mm分")){
+        if(YWDateUtils.isDate(paramsObj.getString("出院时间"),"yyyy-MM-dd HH:mm:ss") || YWDateUtils.isDate(paramsObj.getString("出院时间"),"yyyy年MM月dd日 HH时mm分")){
             aHomePageVO.setLeaveHospitalDate(DateUtil.format(YWDateUtils.parseDateTime(paramsObj.getString("出院时间")),DateUtil.DATE_TIME_FORMAT));
         }
         aHomePageVO.setLeaveHospitalDept(paramsObj.getString("出院科别"));
@@ -359,7 +365,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         //aHomePageVO.setLeaveHospitalBedCode();
         aHomePageVO.setBehospitalDayNum(paramsObj.getString("实际住院天数"));
         aHomePageVO.setOutpatientEmrDiagnose(paramsObj.getString("门急诊诊断"));
-        //aHomePageVO.setOutpatientEmrDiagnoseCode();
+        aHomePageVO.setOutpatientEmrDiagnoseCode(paramsObj.getString("门诊诊断编码"));
         aHomePageVO.setPoisonFactor(paramsObj.getString("损伤中毒因素"));
         aHomePageVO.setPoisonFactorCode(paramsObj.getString("损伤中毒因素编码"));
         aHomePageVO.setPathologyDiagnose(paramsObj.getString("病理诊断"));
@@ -370,18 +376,20 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         aHomePageVO.setAutopsy(paramsObj.getString("死亡患者尸检"));
         aHomePageVO.setBloodType(paramsObj.getString("血型"));
         aHomePageVO.setRh(paramsObj.getString("Rh"));
-        aHomePageVO.setDeptDirector(paramsObj.getString("科主任"));
-        //aHomePageVO.setDirectorDoctor();
+        aHomePageVO.setDeptDirector(tzDBConn.getDoctorName(paramsObj.getString("科主任")));
+        aHomePageVO.setDirectorDoctor(tzDBConn.getDoctorName(paramsObj.getString("主任医师")));
         aHomePageVO.setAttendingDoctor(paramsObj.getString("主治医师"));
-        aHomePageVO.setBehospitalDoctor(paramsObj.getString("住院医师"));
-        aHomePageVO.setResponseNurse(paramsObj.getString("责任护士"));
-        aHomePageVO.setStudyDoctor(paramsObj.getString("进修医师"));
-        aHomePageVO.setPracticeDoctor(paramsObj.getString("实习医师"));
-        aHomePageVO.setEncodeMan(paramsObj.getString("编码员"));
+        aHomePageVO.setBehospitalDoctor(tzDBConn.getDoctorName(paramsObj.getString("住院医师")));
+        aHomePageVO.setResponseNurse(tzDBConn.getDoctorName(paramsObj.getString("责任护士")));
+        aHomePageVO.setStudyDoctor(tzDBConn.getDoctorName(paramsObj.getString("进修医师")));
+        aHomePageVO.setPracticeDoctor(tzDBConn.getDoctorName(paramsObj.getString("实习医师")));
+        aHomePageVO.setEncodeMan(tzDBConn.getDoctorName(paramsObj.getString("编码员")));
         aHomePageVO.setHomePageQuality(paramsObj.getString("病案质量"));
-        aHomePageVO.setQcDoctor(paramsObj.getString("质控医师"));
-        aHomePageVO.setQcNurse(paramsObj.getString("质控护士"));
-        aHomePageVO.setQcDate(paramsObj.getString("质控日期"));//待定
+        aHomePageVO.setQcDoctor(tzDBConn.getDoctorName(paramsObj.getString("质控医师")));
+        aHomePageVO.setQcNurse(tzDBConn.getDoctorName(paramsObj.getString("质控护士")));
+        if(YWDateUtils.isDate(paramsObj.getString("质控日期"),"yyyy-MM-dd HH:mm:ss")){
+            aHomePageVO.setQcDate(DateUtil.format(YWDateUtils.parseDateTime(paramsObj.getString("质控日期")),DateUtil.DATE_TIME_FORMAT));
+        }
         aHomePageVO.setLeaveHospitalType(paramsObj.getString("离院方式"));
         aHomePageVO.setAcceptOrgCode(paramsObj.getString("接收机构名称"));
         aHomePageVO.setAgainBehospitalPlan(paramsObj.getString("三十一天内再住院计划"));
@@ -406,7 +414,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         aHomePageVO.setClinicPhysicFee(paramsObj.getString("临床物理治疗费"));
         aHomePageVO.setOperationTreatFee(paramsObj.getString("手术治疗费"));
         aHomePageVO.setAnaesthesiaFee(paramsObj.getString("麻醉费"));
-        //aHomePageVO.setOperationFee();
+//        aHomePageVO.setOperationFee();
         aHomePageVO.setHealthTypeFee(paramsObj.getString("康复类"));
         aHomePageVO.setChnTreatFee(paramsObj.getString("中医治疗费"));
         aHomePageVO.setWesternMedFee(paramsObj.getString("西药费"));
@@ -422,8 +430,8 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         aHomePageVO.setTreatMaterialFee(paramsObj.getString("治疗用一次性医用材料费"));
         aHomePageVO.setOperationMaterialFee(paramsObj.getString("手术用一次性医用材料费"));
         aHomePageVO.setOtherTypeFee(paramsObj.getString("其他类其他费"));
-        //aHomePageVO.setSingleDiagManage();
-        //aHomePageVO.setClinicPathwayManage();
+        aHomePageVO.setSingleDiagManage(paramsObj.getString("单病种管理").trim());
+        aHomePageVO.setClinicPathwayManage(paramsObj.getString("临床路径管理").trim());
         aHomePageVO.setIsOutpatientBehospital(paramsObj.getString("门诊与住院"));
         aHomePageVO.setIsLeaveBehospital(paramsObj.getString("入院与出院"));
         aHomePageVO.setIsOperationBeforeAfter(paramsObj.getString("术前与术后"));
@@ -432,32 +440,34 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
         //aHomePageVO.setRescueNum();
         //aHomePageVO.setRescueSuccessNum();
         //aHomePageVO.setIsAutoLeavehospital();
-        //aHomePageVO.setReturnToType();
+        aHomePageVO.setReturnToType(paramsObj.getString("转归情况").trim());
 
         List<Object> operationList = paramsObj.getJSONArray("手术信息");
-        if(operationList.size() > 0){
-            List<AHomeOperationVO> operationInfo = Lists.newLinkedList();
-            for (int i = 0; i < operationList.size(); i++) {
-                AHomeOperationVO aHomeOperationVO = new AHomeOperationVO();
-                aHomeOperationVO.setHomePageId(behospitalCode);
-                aHomeOperationVO.setHospitalId(hospitalId);
-                aHomeOperationVO.setOperationOrderNo(String.valueOf(i));
-                aHomeOperationVO.setOperationDate(((JSONArray) operationList).getJSONObject(i).getString("手术日期"));//待定2020-08-11
-                aHomeOperationVO.setOperationCode(((JSONArray) operationList).getJSONObject(i).getString("手术编码"));
-                aHomeOperationVO.setOperationDoctorId(((JSONArray) operationList).getJSONObject(i).getString("手术医生ID"));
-                aHomeOperationVO.setFirstAssistantId(((JSONArray) operationList).getJSONObject(i).getString("一助医生ID"));
-                aHomeOperationVO.setSecondAssistantId(((JSONArray) operationList).getJSONObject(i).getString("二助医生ID"));
-                aHomeOperationVO.setCutLevel(((JSONArray) operationList).getJSONObject(i).getString("切口等级"));
-                aHomeOperationVO.setHealingLevel(((JSONArray) operationList).getJSONObject(i).getString("愈合等级"));
-                aHomeOperationVO.setOperationName(((JSONArray) operationList).getJSONObject(i).getString("手术名称"));
-                aHomeOperationVO.setOperationLevel(((JSONArray) operationList).getJSONObject(i).getString("手术级别"));
-                aHomeOperationVO.setAnaesthesiaName(((JSONArray) operationList).getJSONObject(i).getString("麻醉方式"));
-                //aHomeOperationVO.setShamOperationName();
-
-                operationInfo.add(aHomeOperationVO);
-            }
-            aHomePageVO.setOperations(operationInfo);
-        }
+//        if(operationList.size() > 0){
+//            List<AHomeOperationVO> operationInfo = Lists.newLinkedList();
+//            for (int i = 0; i < operationList.size(); i++) {
+//                AHomeOperationVO aHomeOperationVO = new AHomeOperationVO();
+//                aHomeOperationVO.setHomePageId(behospitalCode);
+//                aHomeOperationVO.setHospitalId(hospitalId);
+//                aHomeOperationVO.setOperationOrderNo(String.valueOf(i));
+//                aHomeOperationVO.setOperationDate(((JSONArray) operationList).getJSONObject(i).getString("手术日期"));//待定2020-08-11
+//                aHomeOperationVO.setOperationCode(((JSONArray) operationList).getJSONObject(i).getString("手术编码"));
+//                aHomeOperationVO.setOperationDoctorId(((JSONArray) operationList).getJSONObject(i).getString("手术医生ID"));
+//                aHomeOperationVO.setFirstAssistantId(((JSONArray) operationList).getJSONObject(i).getString("一助医生ID"));
+//                aHomeOperationVO.setSecondAssistantId(((JSONArray) operationList).getJSONObject(i).getString("二助医生ID"));
+//                aHomeOperationVO.setCutLevel(((JSONArray) operationList).getJSONObject(i).getString("切口等级"));
+//                aHomeOperationVO.setHealingLevel(((JSONArray) operationList).getJSONObject(i).getString("愈合等级"));
+//                aHomeOperationVO.setOperationName(((JSONArray) operationList).getJSONObject(i).getString("手术名称"));
+//                aHomeOperationVO.setOperationLevel(((JSONArray) operationList).getJSONObject(i).getString("手术级别"));
+//                aHomeOperationVO.setAnaesthesiaName(((JSONArray) operationList).getJSONObject(i).getString("麻醉方式"));
+//                //aHomeOperationVO.setShamOperationName();
+//
+//                operationInfo.add(aHomeOperationVO);
+//            }
+//            aHomePageVO.setOperations(operationInfo);
+//        }
+        String sql = "SELECT * FROM AI_V_SENDHOMEPAGEING_SSQK t where t.homepageid = '"+behospitalCode+"'";
+        aHomePageVO.setOperations(tzDBConn.getHomePageOperation(sql));
         List<Object> diagnoseList = paramsObj.getJSONArray("出院诊断");
         if(diagnoseList.size() > 0){
             List<AHomeDiagnoseVO> leaveDiags = Lists.newLinkedList();
@@ -579,6 +589,16 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 behospitalInfo.setBehDeptId(behDeptId);
                 behospitalInfo.setBehDeptName(basDeptInfo.getDeptName());
                 behospitalInfo.setGmtModified(DateUtil.now());
+            }else if(behDeptId.equals("52424")){
+                /**儿科日间病历、24小时出入院记录的病历模板，映射儿科日间*/
+                behDeptId = "52903";
+                BasDeptInfo basDeptInfo = basDeptInfoFacade.getOne(new QueryWrapper<BasDeptInfo>()
+                        .eq("dept_id",behDeptId)
+                        .eq("hospital_id",behospitalInfo.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N));
+                behospitalInfo.setBehDeptId(behDeptId);
+                behospitalInfo.setBehDeptName(basDeptInfo.getDeptName());
+                behospitalInfo.setGmtModified(DateUtil.now());
             }
         }
         List<QcType> qcTypeList = qcTypeFacade.list(new QueryWrapper<QcType>()

src/main/java/com/diagbot/task/BehospitalInfoAnalyzeTask.java

@@ -53,7 +53,7 @@ public class BehospitalInfoAnalyzeTask implements SchedulingConfigurer {
                         && task001.getIsUsed().equals(1)) {
                     log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
                     TaskVO taskVO = new TaskVO();
-//                    behospitalInfoFacade.execute(taskVO, param);
+                    behospitalInfoFacade.execute(taskVO, param);
                 }
             }
         }, new Trigger() {

src/main/java/com/diagbot/util/TZDBConn.java

@@ -2,7 +2,7 @@ package com.diagbot.util;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.diagbot.entity.*;
-import com.diagbot.enums.data.DoctorAdviceStatusEnum;
+import com.diagbot.vo.data.AHomeOperationVO;
 import com.google.common.collect.Lists;
 
 import java.sql.*;
@@ -738,4 +738,85 @@ public class TZDBConn {
 		}
 		return medLisInfoList;
 	}
+
+	public String getRecordXml(String sql){
+		String xml = "";
+		try {
+			TZDBConn dbconn=new TZDBConn();
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				xml = rs.getString("CONTENTS");
+			}
+		}catch (Exception e){
+			e.printStackTrace();
+		}finally {
+			close();
+		}
+		return xml;
+	}
+
+	public String getDoctorName(String doctorId){
+		String doctorName = "";
+		String sql = "SELECT * FROM AI_V_SENDDOCTORINFOS t WHERE t.DOCTORID='" + doctorId + "' AND ROWNUM=1";
+		try {
+			TZDBConn dbconn=new TZDBConn();
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				doctorName = rs.getString("NAME");
+			}
+		}catch (Exception e){
+			e.printStackTrace();
+		}finally {
+			close();
+		}
+		return doctorName;
+	}
+
+	public String getDeptName(String deptId){
+		String deptName = "";
+		String sql = "SELECT * FROM AI_V_SENDDEPTINFOS t WHERE t.DEPTID='" + deptId + "'AND ROWNUM=1";
+		try {
+			TZDBConn dbconn=new TZDBConn();
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				deptName = rs.getString("DEPTNAME");
+			}
+		}catch (Exception e){
+			e.printStackTrace();
+		}finally {
+			close();
+		}
+		return deptName;
+	}
+
+	public List<AHomeOperationVO> getHomePageOperation(String sql) {
+		List<AHomeOperationVO> homeOperationVOList=Lists.newLinkedList();
+		try {
+			TZDBConn dbconn=new TZDBConn();
+			ResultSet rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				AHomeOperationVO ahomeOperationVO=new AHomeOperationVO();
+				ahomeOperationVO.setHomePageId(rs.getString("HOMEPAGEID"));//病案首页ID
+				ahomeOperationVO.setHospitalId(HOSPITAL_ID);//医院ID
+				ahomeOperationVO.setOperationOrderNo(rs.getString("OPERATIONORDERNO"));//手术序号
+				ahomeOperationVO.setOperationDate(rs.getString("OPERATIONDATE"));//手术日期
+				ahomeOperationVO.setOperationCode(rs.getString("OPERATIONCODE"));//手术编码
+				ahomeOperationVO.setOperationDoctorId(rs.getString("OPERATIONDOCTORID"));//手术医生
+				ahomeOperationVO.setFirstAssistantId(rs.getString("FIRSTASSISTANTID"));//一助医生
+				ahomeOperationVO.setSecondAssistantId(rs.getString("SECONDASSISTANTID"));//二助医生
+				ahomeOperationVO.setCutLevel(rs.getString("CUTLEVEL"));//切口等级
+				ahomeOperationVO.setHealingLevel(rs.getString("HEALINGLEVEL"));//愈合等级
+				ahomeOperationVO.setOperationName(rs.getString("OPERATIONNAME"));//手术名称
+				ahomeOperationVO.setOperationLevel(rs.getString("OPERATIONLEVEL"));//手术级别
+				ahomeOperationVO.setAnaesthesiaName(rs.getString("ANAESTHESIANAME"));//麻醉方式
+				ahomeOperationVO.setShamOperationName(rs.getString("SHAMOPERATIONNAME"));//拟手术名称
+				homeOperationVOList.add(ahomeOperationVO);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally {
+			close();
+		}
+		return homeOperationVOList;
+	}
 }

src/main/java/com/diagbot/util/YiWuFirstPageRecordXmlUtil.java

@@ -22,7 +22,7 @@ import java.util.Set;
  */
 public class YiWuFirstPageRecordXmlUtil {
 
-    public static final Map<String,String> CITY_MAP = MapUtil.getMap("cityCode.json");
+    public static final Map<String, String> CITY_MAP = MapUtil.getMap("cityCode.json");
     public static Map<String, String> leaveDiagMap = ImmutableMap.<String, String>builder()
             .put("出院诊断", "诊断名称")
             .put("出院诊断编码", "诊断编码")
@@ -56,6 +56,7 @@ public class YiWuFirstPageRecordXmlUtil {
         JSONArray operations = new JSONArray();
         specialProcess(structureMap, operationMap, operations);
         structureExtMap.put("手术信息", operations);
+//        structureExtMap = processToValue(structureExtMap);
         return structureExtMap;
     }
 
@@ -87,6 +88,9 @@ public class YiWuFirstPageRecordXmlUtil {
                             findElement(cellElement.element("XElements"), "XInputField").forEach(xInputFieldElement -> {
                                 xInputField(map, xInputFieldElement, tablePreTxt);
                             });
+                            findElement(cellElement.element("XElements"), "XTextRadioBox").forEach(xTextRadioBoxElement -> {
+                                xInputField(map, xTextRadioBoxElement, tablePreTxt);
+                            });
                         }
                     });
                 });
@@ -154,8 +158,12 @@ public class YiWuFirstPageRecordXmlUtil {
     private static String getXInputFieldValue(Element xInputFieldElement) {
         String value = null;
         Element innerValueElement = xInputFieldElement.element("InnerValue");
+        Element checkedElement = xInputFieldElement.element("Checked");
+        Element checkedValueElement = xInputFieldElement.element("CheckedValue");
         if (innerValueElement != null) {
             value = innerValueElement.getTextTrim();
+        } else if (checkedElement != null && checkedValueElement != null) {
+            value = checkedValueElement.getTextTrim();
         }
         if (StringUtil.isBlank(value)) {
             Element xElementsElement = xInputFieldElement.element("XElements");
@@ -203,7 +211,7 @@ public class YiWuFirstPageRecordXmlUtil {
 
     //针对key的一些特殊处理
     private static String keyHandle(String key) {
-        key =  StringUtil.isBlank(key) ? key : key.replaceAll("[\\s\\p{Zs}]", "");
+        key = StringUtil.isBlank(key) ? key : key.replaceAll("[\\s\\p{Zs}]", "");
         return key.replaceAll("[：:]", "");
     }
 
@@ -307,9 +315,9 @@ public class YiWuFirstPageRecordXmlUtil {
     }
 
     public static void main(String[] args) {
-//        xmlToMap(FileUtil.fileRead("C:\\Users\\Administrator\\Desktop\\义务\\jiexi\\n5.xml"));
+        //        xmlToMap(FileUtil.fileRead("C:\\Users\\Administrator\\Desktop\\义务\\jiexi\\n5.xml"));
         String xml = "";
-        Map<String,Object> ret = process(xml);
+        Map<String, Object> ret = process(xml);
         System.out.println(ret);
     }
 
@@ -376,7 +384,7 @@ public class YiWuFirstPageRecordXmlUtil {
             "联系电话=现住址电话",
             "损伤中毒外部因素=损伤中毒因素",
             "诊断类_实验室诊断费=实验室诊断费",
-            "年龄新=新生儿年龄",
+            "年龄=新生儿年龄",
             "诊断类_临床诊断项目费=临床诊断项目费",
             "耗材类_治疗用一次性医用材料费=治疗用一次性医用材料费",
             "诊断符合情况_临床与病理=临床与病理",
@@ -424,71 +432,71 @@ public class YiWuFirstPageRecordXmlUtil {
             "工作单位邮政编码=工作单位邮编"
     );
 
-    public static Map<String,Object> processToValue(Map<String,Object> map){
+    public static Map<String, Object> processToValue(Map<String, Object> map) {
 
-        String[] provinceList =  String.valueOf(map.get("省")).split(" ");
+        String[] provinceList = String.valueOf(map.get("省")).split(" ");
         String[] cityList = String.valueOf(map.get("市")).split(" ");
         String[] areaList = String.valueOf(map.get("县")).split(" ");
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("性别")))){
-            map.put("性别",SexEnum.getName(String.valueOf(map.get("性别"))));
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("性别")))) {
+            map.put("性别", SexEnum.getName(String.valueOf(map.get("性别"))));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("婚姻")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("婚姻")))) {
             map.put("婚姻", MarriageEnum.getName(String.valueOf(map.get("婚姻"))));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("入院途径")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("入院途径")))) {
             //入院途径，1：急诊，2：门诊，3：其他医疗机构，9：其他
             map.put("入院途径", BehospitalWayEnum.getName(String.valueOf(map.get("入院途径")).split(" ")[0]));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("血型")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("血型")))) {
             map.put("血型", BloodTypeEnum.getName(String.valueOf(map.get("血型"))));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("Rh")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("Rh")))) {
             map.put("Rh", RHEnum.getName(String.valueOf(map.get("Rh"))));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("离院方式")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("离院方式")))) {
             map.put("离院方式", LeaveHospitalTypeEnum.getName(String.valueOf(map.get("离院方式"))));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("门诊与住院")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("门诊与住院")))) {
             map.put("门诊与住院", DiagnoseTypeEnum.getName(String.valueOf(map.get("门诊与住院"))));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("入院与出院")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("入院与出院")))) {
             map.put("入院与出院", DiagnoseTypeEnum.getName(String.valueOf(map.get("入院与出院"))));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("术前与术后")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("术前与术后")))) {
             map.put("术前与术后", DiagnoseTypeEnum.getName(String.valueOf(map.get("术前与术后"))));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("临床与病理")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("临床与病理")))) {
             map.put("临床与病理", DiagnoseTypeEnum.getName(String.valueOf(map.get("临床与病理"))));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("放射与病理")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("放射与病理")))) {
             map.put("放射与病理", DiagnoseTypeEnum.getName(String.valueOf(map.get("放射与病理"))));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("药物过敏")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("药物过敏")))) {
             map.put("药物过敏", IsMedAllergyEnum.getName(String.valueOf(map.get("药物过敏"))));
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("三十一天内再住院计划")))){
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("三十一天内再住院计划")))) {
             map.put("三十一天内再住院计划", IsMedAllergyEnum.getName(String.valueOf(map.get("三十一天内再住院计划"))));
         }
-        if(provinceList.length > 0){
-            if(provinceList[0].length() > 1){
-                map.put("出生地",CITY_MAP.get(provinceList[0]) + CITY_MAP.get(cityList[0]) + CITY_MAP.get(areaList[0]));
+        if (provinceList.length > 0) {
+            if (provinceList[0].length() > 1) {
+                map.put("出生地", CITY_MAP.get(provinceList[0]) + CITY_MAP.get(cityList[0]) + CITY_MAP.get(areaList[0]));
             }
-            if(provinceList[1].length() > 1){
-                map.put("户口地址",CITY_MAP.get(provinceList[1]) + CITY_MAP.get(cityList[1]) + CITY_MAP.get(areaList[1]) + map.get("户口地址其它"));
+            if (provinceList[1].length() > 1) {
+                map.put("户口地址", CITY_MAP.get(provinceList[1]) + CITY_MAP.get(cityList[1]) + CITY_MAP.get(areaList[1]) + map.get("户口地址其它"));
             }
         }
-        if(StringUtil.isNotEmpty(String.valueOf(map.get("籍贯_省")).replaceAll("[\u4e00-\u9fa5]",""))){
-            map.put("籍贯",CITY_MAP.get(map.get("籍贯_省"))+CITY_MAP.get(map.get("籍贯_市")));
+        if (StringUtil.isNotEmpty(String.valueOf(map.get("籍贯_省")).replaceAll("[\u4e00-\u9fa5]", ""))) {
+            map.put("籍贯", CITY_MAP.get(map.get("籍贯_省")) + CITY_MAP.get(map.get("籍贯_市")));
         }
-        map.put("现住址",CITY_MAP.get(map.get("现住址_省")) +CITY_MAP.get(map.get("现住址_市")) + CITY_MAP.get(map.get("现住址_县")) + map.get("现住址其它"));
-        if(StringUtil.isEmpty(String.valueOf(map.get("出生日期")).replaceAll("[\u4e00-\u9fa5]","").trim())){
-            map.put("出生日期","");
+        map.put("现住址", CITY_MAP.get(map.get("现住址_省")) + CITY_MAP.get(map.get("现住址_市")) + CITY_MAP.get(map.get("现住址_县")) + map.get("现住址其它"));
+        if (StringUtil.isEmpty(String.valueOf(map.get("出生日期")).replaceAll("[\u4e00-\u9fa5]", "").trim())) {
+            map.put("出生日期", "");
         }
-        if(!YWDateUtils.isDate(String.valueOf(map.get("入院时间")),"yyyy年MM月dd日 HH时mm分")){
-            map.put("入院日期","");
+        if (!YWDateUtils.isDate(String.valueOf(map.get("入院时间")), "yyyy年MM月dd日 HH时mm分")) {
+            map.put("入院日期", "");
         }
-        if(!YWDateUtils.isDate(String.valueOf(map.get("出院时间")),"yyyy年MM月dd日 HH时mm分")){
-            map.put("出院时间","");
+        if (!YWDateUtils.isDate(String.valueOf(map.get("出院时间")), "yyyy年MM月dd日 HH时mm分")) {
+            map.put("出院时间", "");
         }
         return map;
     }

src/main/resources/application-local.yml

@@ -59,7 +59,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://172.17.14.227:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://172.17.14.227:3306/qc_test?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息