diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwNationEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwNationEnums.java
new file mode 100644
index 0000000..31efd1c
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwNationEnums.java
@@ -0,0 +1,114 @@
+package com.lyms.platform.common.enums;
+
+import com.lyms.platform.common.utils.StringUtils;
+
+/**
+ * 卫生信息数据-附件2
+ * 民族STD_NATIONALITY
+ */
+public enum CdGwNationEnums {
+    Career01("01", "汉族"),
+    Career02("02", "蒙古族"),
+    Career03("03", "回族"),
+    Career04("04", "藏族"),
+    Career05("05", "维吾尔族"),
+    Career06("06", "苗族"),
+    Career07("07", "彝族"),
+    Career08("08", "壮族"),
+    Career09("09", "布依族"),
+    Career10("10", "朝鲜族"),
+    Career11("11", "满族"),
+    Career12("12", "侗族"),
+    Career13("13", "瑶族"),
+    Career14("14", "白族"),
+    Career15("15", "土家族"),
+    Career16("16", "哈尼族"),
+    Career17("17", "哈萨克族"),
+    Career18("18", "傣族"),
+    Career19("19", "黎族"),
+    Career20("20", "傈僳族"),
+    Career21("21", "佤族"),
+    Career22("22", "畲族"),
+    Career23("23", "高山族"),
+    Career24("24", "拉祜族"),
+    Career25("25", "水族"),
+    Career26("26", "东乡族"),
+    Career27("27", "纳西族"),
+    Career28("28", "景颇族"),
+    Career29("29", "柯尔克孜族"),
+    Career30("30", "土族"),
+    Career31("31", "达斡尔族"),
+    Career32("32", "仫佬族"),
+    Career33("33", "羌族"),
+    Career34("34", "布朗族"),
+    Career35("35", "撒拉族"),
+    Career36("36", "毛南族"),
+    Career37("37", "仡佬族"),
+    Career38("38", "锡伯族"),
+    Career39("39", "阿昌族"),
+    Career40("40", "普米族"),
+    Career41("41", "塔吉克族"),
+    Career42("42", "怒族"),
+    Career43("43", "乌孜别克族"),
+    Career44("44", "俄罗斯族"),
+    Career45("45", "鄂温克族"),
+    Career46("46", "德昂族"),
+    Career47("47", "保安族"),
+    Career48("48", "裕固族"),
+    Career49("49", "京族"),
+    Career50("50", "塔塔尔族"),
+    Career51("51", "独龙族"),
+    Career52("52", "鄂伦春族"),
+    Career53("53", "赫哲族"),
+    Career54("54", "门巴族"),
+    Career55("55", "珞巴族"),
+    Career56("56", "基诺族"),
+    Career98("98", "外国血统"),
+    Career99("99", "其他");
+
+    CdGwNationEnums(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+
+    public static String getName(String id) {
+        if(StringUtils.isEmpty(id)) return "汉族";
+        CdGwNationEnums[] values = CdGwNationEnums.values();
+        for (CdGwNationEnums value : values) {
+            if (value.getId().equals(id)) {
+                return value.getName();
+            }
+        }
+        return "汉族";
+    }
+    public static String getId(String name) {
+        if(StringUtils.isEmpty(name)) return "01";
+        CdGwNationEnums[] values = CdGwNationEnums.values();
+        for (CdGwNationEnums value : values) {
+            if (value.getName().contains(name)) {
+                return value.getId();
+            }
+        }
+        return "01";//没有匹配到,默认汉族
+    }
+    private String id;
+    private String name;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwPcerteTypeIdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwPcerteTypeIdEnums.java
new file mode 100644
index 0000000..f271fee
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwPcerteTypeIdEnums.java
@@ -0,0 +1,65 @@
+package com.lyms.platform.common.enums;
+
+import com.lyms.platform.common.utils.StringUtils;
+
+/**
+ * 卫生信息数据-附件2
+ * 证件类型STD_PERSON_ID_TYPE
+ */
+public enum CdGwPcerteTypeIdEnums {
+    Nation01("01", "身份证/居民身份证"),
+    Nation02("02", "居民户口簿"),
+    Nation03("03", "护照"),
+    Nation04("04", "军官证"),
+    Nation05("05", "驾驶证"),
+    Nation06("06", "港澳居民来往内地通行证"),
+    Nation07("07", "台湾居民来往内地通行证"),
+    Nation08("99", "其他法定有效证件");
+
+
+    CdGwPcerteTypeIdEnums(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+
+    public static String getName(String id) {
+        if(StringUtils.isEmpty(id)) return "身份证";
+        CdGwPcerteTypeIdEnums[] values = CdGwPcerteTypeIdEnums.values();
+        for (CdGwPcerteTypeIdEnums value : values) {
+            if (value.getId().equals(id)) {
+                return value.getName();
+            }
+        }
+        return "身份证";
+    }
+    public static String getId(String name) {
+        if(StringUtils.isEmpty(name)) return "01";//(传空的话默认01)
+        CdGwPcerteTypeIdEnums[] values = CdGwPcerteTypeIdEnums.values();
+        for (CdGwPcerteTypeIdEnums value : values) {
+            if (value.getName().contains(name)) {
+                return value.getId();
+            }
+        }
+        return "01";
+    }
+    private String id;
+    private String name;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwPcountryEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwPcountryEnums.java
new file mode 100644
index 0000000..b0ec282
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwPcountryEnums.java
@@ -0,0 +1,295 @@
+package com.lyms.platform.common.enums;
+
+import com.lyms.platform.common.utils.StringUtils;
+
+/**
+ * 卫生信息数据-附件2
+ * 国籍STD_COUNTRY
+ */
+public enum CdGwPcountryEnums {
+    Career004("004", "阿富汗"),
+    Career008("008", "阿尔巴尼亚"),
+    Career010("010", "南极洲"),
+    Career012("012", "阿尔及利亚"),
+    Career016("016", "美属萨摩亚"),
+    Career020("020", "安道尔"),
+    Career024("024", "安哥拉"),
+    Career028("028", "安提瓜和巴布达"),
+    Career031("031", "阿塞拜疆"),
+    Career032("032", "阿根廷"),
+    Career036("036", "澳大利亚"),
+    Career040("040", "奥地利"),
+    Career044("044", "巴哈马"),
+    Career048("048", "巴林"),
+    Career050("050", "孟加拉国"),
+    Career051("051", "亚美尼亚"),
+    Career052("052", "巴巴多斯"),
+    Career056("056", "比利时"),
+    Career060("060", "百慕大"),
+    Career064("064", "不丹"),
+    Career068("068", "玻利维亚"),
+    Career070("070", "波黑"),
+    Career072("072", "博茨瓦纳"),
+    Career074("074", "布维岛"),
+    Career076("076", "巴西"),
+    Career084("084", "伯利兹"),
+    Career086("086", "英属印度洋领土"),
+    Career090("090", "所罗门群岛"),
+    Career092("092", "英属维尔京群岛"),
+    Career096("096", "文莱"),
+    Career100("100", "保加利亚"),
+    Career104("104", "缅甸"),
+    Career108("108", "布隆迪"),
+    Career112("112", "白俄罗斯"),
+    Career116("116", "柬埔寨"),
+    Career120("120", "喀麦隆"),
+    Career124("124", "加拿大"),
+    Career132("132", "佛得角"),
+    Career136("136", "开曼群岛"),
+    Career140("140", "中非"),
+    Career144("144", "斯里兰卡"),
+    Career148("148", "乍得"),
+    Career152("152", "智利"),
+    Career156("156", "中国"),
+    Career158("158", "台湾"),
+    Career162("162", "圣诞岛"),
+    Career166("166", "科科斯(基林)群岛"),
+    Career170("170", "哥伦比亚"),
+    Career174("174", "科摩罗"),
+    Career175("175", "马约特"),
+    Career178("178", "刚果（布）"),
+    Career180("180", "刚果（金）"),
+    Career184("184", "库克群岛"),
+    Career188("188", "哥斯达黎加"),
+    Career191("191", "克罗地亚"),
+    Career192("192", "古巴"),
+    Career196("196", "塞浦路斯"),
+    Career203("203", "捷克"),
+    Career204("204", "贝宁"),
+    Career208("208", "丹麦"),
+    Career212("212", "多米尼克"),
+    Career214("214", "多米尼加"),
+    Career218("218", "厄瓜多尔"),
+    Career222("222", "萨尔瓦多"),
+    Career226("226", "赤道几内亚"),
+    Career231("231", "埃塞俄比亚"),
+    Career232("232", "厄立特里亚"),
+    Career233("233", "爱沙尼亚"),
+    Career234("234", "法罗群岛"),
+    Career238("238", "福克兰群岛(马尔维纳斯)"),
+    Career239("239", "南乔治亚岛和南桑德韦奇岛"),
+    Career242("242", "斐济"),
+    Career246("246", "芬兰"),
+    Career250("250", "法国"),
+    Career254("254", "法属圭亚那"),
+    Career258("258", "法属波利尼西亚"),
+    Career260("260", "法属南部领地"),
+    Career262("262", "吉布提"),
+    Career266("266", "加蓬"),
+    Career268("268", "格鲁吉亚"),
+    Career270("270", "冈比亚"),
+    Career275("275", "巴勒斯坦"),
+    Career276("276", "德国"),
+    Career288("288", "加纳"),
+    Career292("292", "直布罗陀"),
+    Career296("296", "基里巴斯"),
+    Career300("300", "希腊"),
+    Career304("304", "格陵兰"),
+    Career308("308", "格林纳达"),
+    Career312("312", "瓜德罗普"),
+    Career316("316", "关岛"),
+    Career320("320", "危地马拉"),
+    Career324("324", "几内亚"),
+    Career328("328", "圭亚那"),
+    Career332("332", "海地"),
+    Career334("334", "赫德岛和麦克唐纳岛"),
+    Career336("336", "梵蒂冈"),
+    Career340("340", "洪都拉斯"),
+    Career344("344", "香港"),
+    Career348("348", "匈牙利"),
+    Career352("352", "冰岛"),
+    Career356("356", "印度"),
+    Career360("360", "印度尼西亚"),
+    Career364("364", "伊朗"),
+    Career368("368", "伊拉克"),
+    Career372("372", "爱尔兰"),
+    Career376("376", "以色列"),
+    Career380("380", "意大利"),
+    Career384("384", "科特迪瓦"),
+    Career388("388", "牙买加"),
+    Career392("392", "日本"),
+    Career398("398", "哈萨克斯坦"),
+    Career400("400", "约旦"),
+    Career404("404", "肯尼亚"),
+    Career408("408", "朝鲜"),
+    Career410("410", "韩国"),
+    Career414("414", "科威特"),
+    Career417("417", "吉尔吉斯斯坦"),
+    Career418("418", "老挝"),
+    Career422("422", "黎巴嫩"),
+    Career426("426", "莱索托"),
+    Career428("428", "拉脱维亚"),
+    Career430("430", "利比里亚"),
+    Career434("434", "利比亚"),
+    Career438("438", "列支敦士登"),
+    Career440("440", "立陶宛"),
+    Career442("442", "卢森堡"),
+    Career446("446", "澳门"),
+    Career450("450", "马达加斯加"),
+    Career454("454", "马拉维"),
+    Career458("458", "马来西亚"),
+    Career462("462", "马尔代夫"),
+    Career466("466", "马里"),
+    Career470("470", "马耳他"),
+    Career474("474", "马提尼克"),
+    Career478("478", "毛里塔尼亚"),
+    Career480("480", "毛里求斯"),
+    Career484("484", "墨西哥"),
+    Career492("492", "摩纳哥"),
+    Career496("496", "蒙古"),
+    Career498("498", "摩尔多瓦"),
+    Career500("500", "蒙特塞拉特"),
+    Career504("504", "摩洛哥"),
+    Career508("508", "莫桑比克"),
+    Career512("512", "阿曼"),
+    Career516("516", "纳米比亚"),
+    Career520("520", "瑙鲁"),
+    Career524("524", "尼泊尔"),
+    Career528("528", "荷兰"),
+    Career530("530", "荷属安的列斯"),
+    Career533("533", "阿鲁巴"),
+    Career540("540", "新喀里多尼亚"),
+    Career548("548", "瓦努阿图"),
+    Career554("554", "新西兰"),
+    Career558("558", "尼加拉瓜"),
+    Career562("562", "尼日尔"),
+    Career566("566", "尼日利亚"),
+    Career570("570", "纽埃"),
+    Career574("574", "诺福克岛"),
+    Career578("578", "挪威"),
+    Career580("580", "北马里亚纳"),
+    Career581("581", "美国本土外小岛屿"),
+    Career583("583", "密克罗尼西亚联邦"),
+    Career584("584", "马绍尔群岛"),
+    Career585("585", "帕劳"),
+    Career586("586", "巴基斯坦"),
+    Career591("591", "巴拿马"),
+    Career598("598", "巴布亚新几内亚"),
+    Career600("600", "巴拉圭"),
+    Career604("604", "秘鲁"),
+    Career608("608", "菲律宾"),
+    Career612("612", "皮特凯恩"),
+    Career616("616", "波兰"),
+    Career620("620", "葡萄牙"),
+    Career624("624", "几内亚比绍"),
+    Career626("626", "东帝汶"),
+    Career630("630", "波多黎各"),
+    Career634("634", "卡塔尔"),
+    Career638("638", "留尼汪"),
+    Career642("642", "罗马尼亚"),
+    Career643("643", "俄罗斯联邦"),
+    Career646("646", "卢旺达"),
+    Career654("654", "圣赫勒拿"),
+    Career659("659", "圣基茨和尼维斯"),
+    Career660("660", "安圭拉"),
+    Career662("662", "圣卢西亚"),
+    Career666("666", "圣皮埃尔和密克隆"),
+    Career670("670", "圣文森特和格林纳丁斯"),
+    Career674("674", "圣马力诺"),
+    Career678("678", "圣多美和普林西比"),
+    Career682("682", "沙特阿拉伯"),
+    Career686("686", "塞内加尔"),
+    Career690("690", "塞舌尔"),
+    Career694("694", "塞拉利昂"),
+    Career702("702", "新加坡"),
+    Career703("703", "斯洛伐克"),
+    Career704("704", "越南"),
+    Career705("705", "斯洛文尼亚"),
+    Career706("706", "索马里"),
+    Career710("710", "南非"),
+    Career716("716", "津巴布韦"),
+    Career724("724", "西班牙"),
+    Career732("732", "西撒哈拉"),
+    Career736("736", "苏丹"),
+    Career740("740", "苏里南"),
+    Career744("744", "斯瓦尔巴岛和扬马延岛"),
+    Career748("748", "斯威士兰"),
+    Career752("752", "瑞典"),
+    Career756("756", "瑞士"),
+    Career760("760", "叙利亚"),
+    Career762("762", "塔吉克斯坦"),
+    Career764("764", "泰国"),
+    Career768("768", "多哥"),
+    Career772("772", "托克劳"),
+    Career776("776", "汤加"),
+    Career780("780", "特立尼达和多巴哥"),
+    Career784("784", "阿联酋"),
+    Career788("788", "突尼斯"),
+    Career792("792", "土耳其"),
+    Career795("795", "土库曼斯坦"),
+    Career796("796", "特克斯和凯科斯群岛"),
+    Career798("798", "图瓦卢"),
+    Career800("800", "乌干达"),
+    Career804("804", "乌克兰"),
+    Career807("807", "前南马其顿"),
+    Career818("818", "埃及"),
+    Career826("826", "英国"),
+    Career834("834", "坦桑尼亚"),
+    Career840("840", "美国"),
+    Career850("850", "美属维尔京群岛"),
+    Career854("854", "布基纳法索"),
+    Career858("858", "乌拉圭"),
+    Career860("860", "乌兹别克斯坦"),
+    Career862("862", "委内瑞拉"),
+    Career876("876", "瓦利斯和富图纳"),
+    Career882("882", "萨摩亚"),
+    Career887("887", "也门"),
+    Career891("891", "南斯拉夫"),
+    Career894("894", "赞比亚");
+
+    CdGwPcountryEnums(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+
+    public static String getName(String id) {
+        if(StringUtils.isEmpty(id)) return "中国";
+        CdGwPcountryEnums[] values = CdGwPcountryEnums.values();
+        for (CdGwPcountryEnums value : values) {
+            if (value.getId().equals(id)) {
+                return value.getName();
+            }
+        }
+        return "中国";
+    }
+    public static String getId(String name) {
+        if(StringUtils.isEmpty(name)) return "156";
+        CdGwPcountryEnums[] values = CdGwPcountryEnums.values();
+        for (CdGwPcountryEnums value : values) {
+            if (value.getName().contains(name)) {
+                return value.getId();
+            }
+        }
+        return "156";//没有匹配到,默认中国
+    }
+    private String id;
+    private String name;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwPprofessionTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwPprofessionTypeEnums.java
new file mode 100644
index 0000000..100c813
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CdGwPprofessionTypeEnums.java
@@ -0,0 +1,88 @@
+package com.lyms.platform.common.enums;
+
+import com.lyms.platform.common.utils.StringUtils;
+
+/**
+ * 卫生信息数据-附件2
+ * 职业类别STD_OCCUPATION
+ */
+public enum CdGwPprofessionTypeEnums {
+    Career1("0", "国家机关人员"),
+    Career2("0-3", "党群组织负责人"),
+    Career3("0-4", "事业单位负责人"),
+    Career4("1-9", "医生"),
+    Career5("2-4", "教师"),
+    Career6("1-98", "护士"),
+    Career7("3-1", "办公文员"),
+    Career8("4-9", "商业、服务业人员"),
+    Career9("5-9", "农、林、牧、渔、水利业生产人员"),
+    Career10("9-9", "司机"),
+    Career11("X", "军人"),
+    Career12("2-31", "法官"),
+    Career13("2-33", "律师"),
+    Career14("2-32", "检察官"),
+    Career15("3-21", "警察"),
+    Career16("2-2", "金融从业人员"),
+    Career17("0-41", "校长"),
+    Career18("1-9", "卫生单位负责人"),
+    Career19("0-5", "企业经理"),
+    Career20("4", "经济业务人员"),
+    Career21("2-6", "运动员"),
+    Career22("1-1", "科学研究人员"),
+    Career23("1-5", "工程技术人员"),
+    Career24("2-5", "设计师"),
+    Career25("1-41", "航天员"),
+    Career26("Y", "其他"),
+    Career27("2-4", "教师/公务员/职员"),
+    Career28("5-9", "农民"),
+    Career29("8-8", "工人"),
+    Career30("4-9", "服务业"),
+    Career31("4-9", "经商"),
+    Career32("Y", "家务");
+
+    CdGwPprofessionTypeEnums(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+
+    public static String getName(String id) {
+        if(StringUtils.isEmpty(id)) return "不便分类的其他从业人员";
+        CdGwPprofessionTypeEnums[] values = CdGwPprofessionTypeEnums.values();
+        for (CdGwPprofessionTypeEnums value : values) {
+            if (value.getId().equals(id)) {
+                return value.getName();
+            }
+        }
+        return "不便分类的其他从业人员";
+    }
+    public static String getId(String name) {
+        if(StringUtils.isEmpty(name)) return "Y";
+        CdGwPprofessionTypeEnums[] values = CdGwPprofessionTypeEnums.values();
+        for (CdGwPprofessionTypeEnums value : values) {
+            if (value.getName().contains(name)) {
+                return value.getId();
+            }
+        }
+        return "Y";//没有匹配到,不便分类的其他从业人员
+    }
+    private String id;
+    private String name;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PcerteTypeIdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PcerteTypeIdEnums.java
deleted file mode 100644
index b61af1a..0000000
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/PcerteTypeIdEnums.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.lyms.platform.common.enums;
-
-import com.lyms.platform.common.utils.StringUtils;
-
-/**
- * 卫生信息数据-附件2
- * 民族STD_PERSON_ID_TYPE
- */
-public enum PcerteTypeIdEnums {
-    Nation01("01", "身份证/居民身份证"),
-    Nation02("02", "居民户口簿"),
-    Nation03("03", "护照"),
-    Nation04("04", "军官证"),
-    Nation05("05", "驾驶证"),
-    Nation06("06", "港澳居民来往内地通行证"),
-    Nation07("07", "台湾居民来往内地通行证"),
-    Nation08("99", "其他法定有效证件");
-
-
-    PcerteTypeIdEnums(String id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-
-    public static String getName(String id) {
-        if(StringUtils.isEmpty(id)) return "身份证";
-        PcerteTypeIdEnums[] values = PcerteTypeIdEnums.values();
-        for (PcerteTypeIdEnums value : values) {
-            if (value.getId().equals(id)) {
-                return value.getName();
-            }
-        }
-        return "身份证";
-    }
-    public static String getId(String name) {
-        if(StringUtils.isEmpty(name)) return "01";//(传空的话默认01)
-        PcerteTypeIdEnums[] values = PcerteTypeIdEnums.values();
-        for (PcerteTypeIdEnums value : values) {
-            if (value.getName().contains(name)) {
-                return value.getId();
-            }
-        }
-        return "01";
-    }
-    private String id;
-    private String name;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PcountryEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PcountryEnums.java
deleted file mode 100644
index b954206..0000000
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/PcountryEnums.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.lyms.platform.common.enums;
-
-import com.lyms.platform.common.utils.StringUtils;
-
-/**
- * 卫生信息数据-附件2
- * 国籍STD_COUNTRY
- */
-public enum PcountryEnums {
-    Career1("156", "中国"),
-    Career2("004", "阿富汗");
-
-    PcountryEnums(String id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-
-    public static String getName(String id) {
-        if(StringUtils.isEmpty(id)) return "中国";
-        PcountryEnums[] values = PcountryEnums.values();
-        for (PcountryEnums value : values) {
-            if (value.getId().equals(id)) {
-                return value.getName();
-            }
-        }
-        return "中国";
-    }
-    public static String getId(String name) {
-        if(StringUtils.isEmpty(name)) return "156";
-        PcountryEnums[] values = PcountryEnums.values();
-        for (PcountryEnums value : values) {
-            if (value.getName().contains(name)) {
-                return value.getId();
-            }
-        }
-        return "156";//没有匹配到,默认中国
-    }
-    private String id;
-    private String name;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PprofessionTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PprofessionTypeEnums.java
deleted file mode 100644
index b5fd7c8..0000000
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/PprofessionTypeEnums.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.lyms.platform.common.enums;
-
-import com.lyms.platform.common.utils.StringUtils;
-
-/**
- * 卫生信息数据-附件2
- * 职业类别STD_OCCUPATION
- */
-public enum PprofessionTypeEnums {
-    Career1("0", "国家机关人员"),
-    Career2("0-3", "党群组织负责人"),
-    Career3("0-4", "事业单位负责人"),
-    Career4("1-9", "医生"),
-    Career5("2-4", "教师"),
-    Career6("1-98", "护士"),
-    Career7("3-1", "办公文员"),
-    Career8("4-9", "商业、服务业人员"),
-    Career9("5-9", "农、林、牧、渔、水利业生产人员"),
-    Career10("9-9", "司机"),
-    Career11("X", "军人"),
-    Career12("2-31", "法官"),
-    Career13("2-33", "律师"),
-    Career14("2-32", "检察官"),
-    Career15("3-21", "警察"),
-    Career16("2-2", "金融从业人员"),
-    Career17("0-41", "校长"),
-    Career18("1-9", "卫生单位负责人"),
-    Career19("0-5", "企业经理"),
-    Career20("4", "经济业务人员"),
-    Career21("2-6", "运动员"),
-    Career22("1-1", "科学研究人员"),
-    Career23("1-5", "工程技术人员"),
-    Career24("2-5", "设计师"),
-    Career25("1-41", "航天员"),
-    Career26("Y", "其他"),
-    Career27("2-4", "教师/公务员/职员"),
-    Career28("5-9", "农民"),
-    Career29("8-8", "工人"),
-    Career30("4-9", "服务业"),
-    Career31("4-9", "经商"),
-    Career32("Y", "家务");
-
-    PprofessionTypeEnums(String id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-
-    public static String getName(String id) {
-        if(StringUtils.isEmpty(id)) return "不便分类的其他从业人员";
-        PprofessionTypeEnums[] values = PprofessionTypeEnums.values();
-        for (PprofessionTypeEnums value : values) {
-            if (value.getId().equals(id)) {
-                return value.getName();
-            }
-        }
-        return "不便分类的其他从业人员";
-    }
-    public static String getId(String name) {
-        if(StringUtils.isEmpty(name)) return "Y";
-        PprofessionTypeEnums[] values = PprofessionTypeEnums.values();
-        for (PprofessionTypeEnums value : values) {
-            if (value.getName().contains(name)) {
-                return value.getId();
-            }
-        }
-        return "Y";//没有匹配到,不便分类的其他从业人员
-    }
-    private String id;
-    private String name;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-}
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/cdfy/CdGwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/cdfy/CdGwInterface.java
index 97cbd26..9675142 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/cdfy/CdGwInterface.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/cdfy/CdGwInterface.java
@@ -11,6 +11,7 @@ import com.lyms.platform.operate.web.facade.ViewFacade;
 import com.lyms.platform.operate.web.result.MatdeliverFollowResult;
 import com.lyms.platform.operate.web.utils.CommonsHelper;
 import com.lyms.platform.operate.web.utils.FunvCommonUtil;
+import com.lyms.platform.operate.web.utils.ResolveUtils;
 import com.lyms.platform.permission.dao.master.CouponMapper;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.Users;
@@ -432,39 +433,42 @@ public class CdGwInterface {
      */
     private void getNation(String nationId, MaternalInfo maternalInfo)
     {
-        Connection conn = null;
-        PreparedStatement ps = null;
-        ResultSet rs = null;
-        try {
-            conn = ConnTools.makeGwConnection();
-            //查询智业民族代码
-            if(nationId != null){
-                String  mzCode = "";
-                String  mzName = "";
-                String mzSql = "select name,code from mz where fyid=\'"+nationId+"\'";
-                ps = conn.prepareStatement(mzSql);
-                rs = ps.executeQuery();
-                while(rs.next()){
-                    mzCode = rs.getString("code");
-                    mzName = rs.getString("name");
-                }
-                maternalInfo.setNationalityCode(mzCode);
-                maternalInfo.setNationalityValue(mzName);
-            }
-            else
-            {
-                maternalInfo.setNationalityCode("01");
-                maternalInfo.setNationalityValue("汉族");
-            }
-        }
-        catch (Exception e)
-        {
-            ExceptionUtils.catchException(e,"get nation error.");
-        }
-        finally
-        {
-            close(conn,ps,rs);
-        }
+        BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(nationId);
+        maternalInfo.setNationalityCode(CdGwNationEnums.getId(basicConfig.getName()));
+        maternalInfo.setNationalityValue(CdGwNationEnums.getName(basicConfig.getId()));
+//        Connection conn = null;
+//        PreparedStatement ps = null;
+//        ResultSet rs = null;
+//        try {
+//            conn = ConnTools.makeGwConnection();
+//            //查询智业民族代码
+//            if(nationId != null){
+//                String  mzCode = "";
+//                String  mzName = "";
+//                String mzSql = "select name,code from mz where fyid=\'"+nationId+"\'";
+//                ps = conn.prepareStatement(mzSql);
+//                rs = ps.executeQuery();
+//                while(rs.next()){
+//                    mzCode = rs.getString("code");
+//                    mzName = rs.getString("name");
+//                }
+//                maternalInfo.setNationalityCode(mzCode);
+//                maternalInfo.setNationalityValue(mzName);
+//            }
+//            else
+//            {
+//                maternalInfo.setNationalityCode("01");
+//                maternalInfo.setNationalityValue("汉族");
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            ExceptionUtils.catchException(e,"get nation error.");
+//        }
+//        finally
+//        {
+//            close(conn,ps,rs);
+//        }
 
     }
 
@@ -618,6 +622,11 @@ public class CdGwInterface {
                     String hjShi = CommonsHelper.getName1(patients.getCityId(), basicConfigService);
                     String hjXian = CommonsHelper.getName1(patients.getAreaId(), basicConfigService);
                     String hjXiang = CommonsHelper.getName1(patients.getStreetId(), basicConfigService);
+                    //丈夫户籍地址
+                    String hhjSheng = CommonsHelper.getName1(patients.getHprovinceRegisterId(), basicConfigService);
+                    String hhjShi = CommonsHelper.getName1(patients.getHcityRegisterId(), basicConfigService);
+                    String hhjXian = CommonsHelper.getName1(patients.getHareaRegisterId(), basicConfigService);
+                    String hhjXiang = CommonsHelper.getName1(patients.getHstreetRegisterId(), basicConfigService);
 
                     //居住地址
                     String jzSheng = CommonsHelper.getName1(patients.getProvinceRegisterId(), basicConfigService);
@@ -628,7 +637,7 @@ public class CdGwInterface {
                     //冠鑫孕产登记（智业WOMAN_PREGNANCY_DIAG）
                     String inSqlDiag = "insert into WOMAN_PREGNANCY_DIAG(LAST_UPDATE_DTIME,ORG_CODE,PATIENT_ID,ORG_FORM_NO," +
                             "NAME,AGE,BIRTH_DATE,ID_TYPE_CODE,ID_NO,HOUSEHOLD_ADDRESS,HOUSEHOLD_PROVINCE,HOUSEHOLD_CITY,HOUSEHOLD_COUNTY, " +
-                            "HOUSEHOLD_TOWN,HOUSEHOLD_VILLAGE,PRESENT_ADDRESS,PRESENT_PROVINCE,PRESENT_CITY,PRESENT_COUNTY,PRESENT_TOWN, " +
+                            "HOUSEHOLD_TOWN,HOUSEHOLD_VILLAGE,PRESENT_ADDRESS,PRESENT_PROVINCE,PRESENT_CITY,PRESENT_COUNTY,PRESENT_TOWN,PRESENT_VILLAGE, " +
                             "ADDRESS_HOUSE_NO,POSTAL_CODE,TEL_NO,COUNTRY_CODE,NATIONALITY_CODE,EDUCATION_CODE,OCCUPATION_CODE,EMPLOYER_NAME," +
                             "WEIGHT,MENSES_LAST_DATE,EXPECTED_TIEM,GRAVIDITY,PARITY,ECTOPIC_PREGNANCY,ACEPHALOCYSTIS_RACEMOSA, " +
                             "SPONTANEOUS_ABORTION,INDUCED_ABORTION,LABOUR_INDUCTION_MEDIUM,PRETERM_BIRTH_NUMBER,BIRTH_DIFFICULTY, " +
@@ -636,7 +645,9 @@ public class CdGwInterface {
                             "HUSBAND_NATION_CODE,HUSBAND_EDUCATION,HUSBAND_OCCUPATION,HUSBAND_ID_TYPE,HUSBAND_ID_NO,HUSBAND_HOUSEHOLD_ADDRESS, " +
                             "HUSBAND_TEL_NO,DIAGNOSIS_DATE,DIAGNOSIS_PREGNANCY_WEEK,DIAGNOSIS_PREGNANCY_DAY,DIAGNOSIS_ITEM,DIAGNOSIS_WAY_CODE, " +
                             "DIAG_RESULT_CODE,DIAGNOSE_FLAG,DIAGNOSIS_GUIDE,DIAGNOSIS_DOCTOR_NAME,DIAGNOSIS_ORG_NAME,CREATE_DATE) " +
-                            "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+                            "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,\n"+
+                                   "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,\n"+
+                                   "?,?,?,?,?,?)";
                     ps = conn.prepareStatement(inSqlDiag);
                     ps.setDate(1, new Date(antExChuModel.getModified().getTime()));
                     ps.setString(2, code);
@@ -655,13 +666,13 @@ public class CdGwInterface {
                     }
                     ps.setString(8,getPcerteType(patients.getPcerteTypeId()));
                     ps.setString(9,patients.getCardNo());
-                    ps.setString(10,patients.getAddress());
+                    ps.setString(10,hjSheng+hjShi+hjXian+hjXiang+patients.getAddress());
                     ps.setString(11,hjSheng);
                     ps.setString(12,hjShi);
                     ps.setString(13,hjXian);
                     ps.setString(14,hjXiang);
                     ps.setString(15,"");//村没有。不能拆分
-                    ps.setString(16,patients.getAddressRegister());
+                    ps.setString(16,hjSheng+hjShi+hjXian+hjXiang+patients.getAddress());
                     ps.setString(17,jzSheng);
                     ps.setString(18,jzShi);
                     ps.setString(19,jzXian);
@@ -671,11 +682,101 @@ public class CdGwInterface {
                     ps.setString(23,"");
                     ps.setString(24,patients.getPhone());
                     ps.setString(25,getPcountry(patients.getPcountryId()));
+                    ps.setString(26,getNation(patients.getPnationId()));
+                    ps.setString(27,"90");
+                    ps.setString(28,getPprofessionTypeName(patients.getPprofessionTypeId()));
+                    ps.setString(29,patients.getPworkUnit());
+                    if(antExChuModel.getWeight() != null){
+                        ps.setDouble(30, Double.parseDouble(antExChuModel.getWeight()));
+                    }else{
+                        ps.setNull(30,Types.DOUBLE);
+                    }
+                    ps.setDate(31,new Date(antExChuModel.getLastMenses().getTime()));
+                    if(patients.getDueDate() != null){
+                        ps.setDate(32, new Date(patients.getDueDate().getTime()));
+                    }else{
+                        ps.setNull(32,Types.DATE);
+                    }
+                    if(antExChuModel.getPregnancyTimes() != null){
+                        ps.setInt(33, antExChuModel.getPregnancyTimes());
+                    }else{
+                        ps.setNull(33,Types.INTEGER);
+                    }
+                    if(antExChuModel.getProdTime() != null){
+                        ps.setInt(34, antExChuModel.getProdTime());
+                    }else{
+                        ps.setNull(34,Types.INTEGER);
+                    }
+                    if(antExChuModel.getGongwaiyun() != null){
+                        ps.setInt(35, antExChuModel.getGongwaiyun());
+                    }else{
+                        ps.setNull(35,Types.INTEGER);
+                    }
+                    ps.setNull(36,Types.INTEGER);
+                    if(antExChuModel.getAbortionZR() != null){
+                        ps.setInt(37, antExChuModel.getAbortionZR());
+                    }else{
+                        ps.setNull(37,Types.INTEGER);
+                    }
+                    if(antExChuModel.getAbortionRG() != null){
+                        ps.setInt(38, antExChuModel.getAbortionRG());
+                    }else{
+                        ps.setNull(38,Types.INTEGER);
+                    }
+                    if(antExChuModel.getYinchan() != null){
+                        ps.setInt(39, antExChuModel.getYinchan());
+                    }else{
+                        ps.setNull(39,Types.INTEGER);
+                    }
+                    ps.setNull(40,Types.INTEGER);
+                    ps.setNull(41,Types.INTEGER);
+                    if(antExChuModel.getPlanedProd() != null){
+                        ps.setInt(42, antExChuModel.getPlanedProd());
+                    }else{
+                        ps.setNull(42,Types.INTEGER);
+                    }
+                    if(antExChuModel.getBirthDefect() != null){
+                        ps.setInt(43, antExChuModel.getBirthDefect());
+                    }else{
+                        ps.setNull(43,Types.INTEGER);
+                    }
+                    if(antExChuModel.getNeoDeath() != null){
+                        ps.setInt(44, antExChuModel.getNeoDeath());
+                    }else{
+                        ps.setNull(44,Types.INTEGER);
+                    }
+                    ps.setString(45,"5");
+                    ps.setString(46,patients.getHusbandName());
+                    ps.setNull(47,Types.INTEGER);
+                    ps.setString(48,getPcountry(patients.getHcountryId()));
+                    ps.setString(49,getNation(patients.getHnationId()));
+                    ps.setString(50,"90");
+                    ps.setString(51,getPprofessionTypeName(patients.getHprofessionTypeId()));
+                    ps.setString(52,getPcerteType(patients.getHcertificateTypeId()));
+                    ps.setString(53,patients.getHcertificateNum());
+                    ps.setString(54,hhjSheng+hhjShi+hhjXian+hhjXiang+patients.getHaddressRegister());
+                    ps.setString(55,patients.getHusbandPhone());
+                    if(antExChuModel.getCheckTime() != null){
+                        ps.setDate(56, new Date(antExChuModel.getCheckTime().getTime()));
+                    }else{
+                        ps.setNull(56,Types.DATE);
+                    }
+                    Integer day = DateUtil.getDays(patients.getLastMenses(), antExChuModel.getCheckTime());
+                    ps.setInt(57,day/7);
+                    ps.setInt(58,day);
+                    ps.setString(59,getSecondaryDiagnosisId(antExChuModel.getSecondaryDiagnosisId()));
+                    ps.setString(60,"9");
+                    ps.setString(61,antExChuModel.getTreatOpinion());
+                    ps.setString(62,"1");
+                    ps.setString(63,antExChuModel.getDirOpinion());
+                    ps.setString(64,getCheckDoctor(antExChuModel.getProdDoctor()));
+                    ps.setString(65,getHospital(antExChuModel.getHospitalId()));
+                    if(antExChuModel.getCheckTime() != null){
+                        ps.setDate(66, new Date(antExChuModel.getCheckTime().getTime()));
+                    }else{
+                        ps.setNull(66,Types.DATE);
+                    }
 
-//                    ps.setString(20,createOrgId);
-//                    ps.setString(21,orgName);
-//                    ps.setString(22,creator);
-//                    ps.setString(23,creatorId);
                     ps.executeUpdate();
 
 
@@ -4244,7 +4345,7 @@ public class CdGwInterface {
             return "156";
         }
         BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id);
-        return PcountryEnums.getId(basicConfig.getName());
+        return CdGwPcountryEnums.getId(basicConfig.getName());
     }
     //职业类别
     private String getPprofessionTypeName(String id) {
@@ -4252,7 +4353,7 @@ public class CdGwInterface {
             return "Y";
         }
         BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id);
-        return PprofessionTypeEnums.getId(basicConfig.getName());
+        return CdGwPprofessionTypeEnums.getId(basicConfig.getName());
     }
     //证件类型
     private String getPcerteType(String id) {
@@ -4260,7 +4361,61 @@ public class CdGwInterface {
             return "01";
         }
         String name = CommonsHelper.getName1(id, basicConfigService);
-        return PcerteTypeIdEnums.getId(name);
+        return CdGwPcerteTypeIdEnums.getId(name);
+    }
+    //民族。返回民族代码
+    private String getNation(String id) {
+        if (StringUtils.isEmpty(id)) {
+            return "01";
+        }
+        String name = CommonsHelper.getName1(id, basicConfigService);
+        return CdGwNationEnums.getId(name);
+    }
+    //诊断项目
+    private String getSecondaryDiagnosisId(String id) {
+        if (StringUtils.isEmpty(id)) {
+            return "";
+        }
+        String secondaryDiagnosisId="";
+        List <String> temp = JsonUtil.toList(id, String.class);
+        if (CollectionUtils.isNotEmpty(temp)) {
+
+            StringBuilder sb = new StringBuilder();
+
+            for (String sId : temp) {
+                sb.append(FunvCommonUtil.getBaseicConfigByid(sId, basicConfigService)).append(",");
+            }
+            if (sb.toString().endsWith(",")) {
+                secondaryDiagnosisId = sb.substring(0, sb.length() - 1);
+            } else {
+                secondaryDiagnosisId = sb.toString();
+            }
+        }
+        return secondaryDiagnosisId;
+    }
+    //医生
+    private String getCheckDoctor(String id) {
+        if (StringUtils.isEmpty(id)) {
+            return "";
+        }
+        String checkDoctor = "";
+        Users users = usersService.getUsers(Integer.parseInt(id));
+        if (users != null && users.getYn() == YnEnums.YES.getId()) {
+            checkDoctor = users.getName();
+        }
+        return checkDoctor;
+    }
+    //医院
+    private String getHospital(String id) {
+        if (StringUtils.isEmpty(id)) {
+            return "";
+        }
+        String hospital = "";
+        Organization organization = organizationService.getOrganization(Integer.parseInt(id));
+        if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
+            hospital = organization.getName();
+        }
+        return hospital;
     }
 
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CardTypeEnums.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CardTypeEnums.java
index 027d520..ec89862 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CardTypeEnums.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CardTypeEnums.java
@@ -4,7 +4,7 @@ import com.lyms.platform.common.utils.StringUtils;
 
 /**
  * 4.11附表
- * 民族
+ * 证件类型
  */
 public enum CardTypeEnums {
     Nation01("01", "身份证/居民身份证"),