diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java
index 0bc5ddc..41c58ec 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java
@@ -22,6 +22,7 @@ import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.pojo.PreEugenicsBaseModel;
 import com.mchange.v2.lang.ObjectUtils;
 import com.qiniu.util.Json;
+import org.apache.tools.ant.taskdefs.Get;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -66,14 +67,16 @@ public class LhxfyUploadingProvince {
         archives.setWifeAge(baseModel.getWifeAge());//	妻子年龄
         archives.setWifeBirth(DateUtil.getyyyy_MM_dd(baseModel.getWifeBirthday()));//	妻子出生时间
         //民族
-        String wifeNationCode="";
-        List<BasicConfigResult> nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
-        for (BasicConfigResult nationResult : nationResults) {
-            if(baseModel.getWifeNation().equals(nationResult.getId())){
-                wifeNationCode=nationResult.getName();
+        if(StringUtils.isNotEmpty(baseModel.getWifeNation())){
+            String wifeNationCode="";
+            List<BasicConfigResult> nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
+            for (BasicConfigResult nationResult : nationResults) {
+                if(baseModel.getWifeNation().equals(nationResult.getId())){
+                    wifeNationCode=nationResult.getName();
+                }
             }
+            archives.setWifeNationCode(NationEnums.getId(wifeNationCode));//	妻子民族编码（具体
         }
-        archives.setWifeNationCode(NationEnums.getId(wifeNationCode));//	妻子民族编码（具体
         //	妻子文化程度
         String wifeEducational="";
         List<BasicConfigResult> levelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);
@@ -129,14 +132,17 @@ public class LhxfyUploadingProvince {
         archives.setHusband_idCard(baseModel.getHusbandCardNo());//	丈夫身份证号
         archives.setHusbandBirth(DateUtil.getyyyy_MM_dd(baseModel.getHusbandBirthday()));//	丈夫出生时间
         //民族
-        String husbandNation="";
-        List<BasicConfigResult> nationResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
-        for (BasicConfigResult nationResult : nationResults2) {
-            if(StringUtils.isNotEmpty(baseModel.getHusbandNation())&&baseModel.getHusbandNation().equals(nationResult.getId())){
-                husbandNation=nationResult.getName();
+        if(StringUtils.isNotEmpty(baseModel.getHusbandNation())){
+            String husbandNation="";
+            List<BasicConfigResult> nationResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
+            for (BasicConfigResult nationResult : nationResults2) {
+                if(baseModel.getHusbandNation().equals(nationResult.getId())){
+                    husbandNation=nationResult.getName();
+                }
             }
+            archives.setHusbandNationCode(NationEnums.getId(husbandNation));//	丈夫民族编码
         }
-        archives.setHusbandNationCode(NationEnums.getId(husbandNation));//	丈夫民族编码
+
         //	丈夫文化程度
         String husbandEducational="";
         List<BasicConfigResult> levelType2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);
@@ -437,9 +443,9 @@ public class LhxfyUploadingProvince {
                     final List<Object> znjk = (List<Object>) baseInfo.get("znjk");
                     List<Map<String,Object>> listMap=new ArrayList<Map<String,Object>>(){{
                         Map<String,Object> map=new HashMap<String,Object>(){{
-                            put("childrenHealthy", znjk.get(0).toString().equals("true")?"2":"1");//是否健康 1：健康   2：不健康
-                            put("childrenDisease", znjk.get(0).toString().equals("true")?"2":"1");//是否有疾病1：有疾病 2：没有
-                            put("childrenContent", znjk.get(1).toString());
+                            put("childrenHealthy", null!=znjk.get(0)?znjk.get(0).toString().equals("true")?"2":"1":"");//是否健康 1：健康   2：不健康
+                            put("childrenDisease", null!=znjk.get(0)?znjk.get(0).toString().equals("true")?"2":"1":"");//是否有疾病1：有疾病 2：没有
+                            put("childrenContent", null!=znjk.get(1)?znjk.get(1).toString():"");
                             put("index_puc", 1);
                         }};
                         for (int i=0;i<ChildrenNumber;i++){
@@ -905,13 +911,23 @@ public class LhxfyUploadingProvince {
             physiqueCheck.setPenisType(((List<Object>)baseInfo.get("yinjin")).get(0).toString().equals("0")?"01":"02");//阴茎01：正常  02：异常
             physiqueCheck.setSpermaduct(((List<Object>)baseInfo.get("sjg")).get(1).toString());//	输精管异常详情
             physiqueCheck.setSpermaductType(((List<Object>)baseInfo.get("sjg")).get(0).toString().equals("0")?"01":"02");//输精管01：未见异常  02：异常
-            String testesType=((List<Object>)baseInfo.get("gaowan")).get(0).toString();
-            physiqueCheck.setTestesType(testesType.equals("0")?"01":testesType.equals("1")?"02":"03");//睾丸01：扪及  02：左侧未扪及03：右侧未扪及04：双侧未扪及(04系统没有选项)
-            physiqueCheck.setLeftVolume(((List<Object>)baseInfo.get("gaowan")).get(3)!=null?((List<Object>)baseInfo.get("gaowan")).get(3).toString():"");//	睾丸左体积
-            physiqueCheck.setRightVolume(((List<Object>)baseInfo.get("gaowan")).get(4)!=null?((List<Object>)baseInfo.get("gaowan")).get(4).toString():"");//	睾丸右体积
-            physiqueCheck.setVaricoceleDegree(((List<Object>)baseInfo.get("jsjmqz")).get(2)!=null?((List<Object>)baseInfo.get("jsjmqz")).get(2).toString():"");//	精索静脉曲张程度
-            physiqueCheck.setVaricocelePart(((List<Object>)baseInfo.get("jsjmqz")).get(1)!=null?((List<Object>)baseInfo.get("jsjmqz")).get(1).toString():"");//	精索静脉曲张部位
-            physiqueCheck.setVaricoceleType(((List<Object>)baseInfo.get("jsjmqz")).get(0).toString().equals("0")?"01":"02");//	精索静脉曲张 01无 02有
+
+            if(null!=((List<Object>)baseInfo.get("gaowan")).get(0)){
+                String testesType=((List<Object>)baseInfo.get("gaowan")).get(0).toString();
+                physiqueCheck.setTestesType(testesType.equals("0")?"01":testesType.equals("1")?"02":"03");//睾丸01：扪及  02：左侧未扪及03：右侧未扪及04：双侧未扪及(04系统没有选项)
+                physiqueCheck.setLeftVolume(((List<Object>)baseInfo.get("gaowan")).get(3)!=null?((List<Object>)baseInfo.get("gaowan")).get(3).toString():"");//	睾丸左体积
+                physiqueCheck.setRightVolume(((List<Object>)baseInfo.get("gaowan")).get(4)!=null?((List<Object>)baseInfo.get("gaowan")).get(4).toString():"");//睾丸右体积
+            }else {
+                physiqueCheck.setTestesType("01");
+            }
+
+            if(null!=((List<Object>)baseInfo.get("jsjmqz")).get(0)){
+                physiqueCheck.setVaricoceleType(((List<Object>)baseInfo.get("jsjmqz")).get(0).toString().equals("0")?"01":"02");//	精索静脉曲张 01无 02有
+                physiqueCheck.setVaricoceleDegree(((List<Object>)baseInfo.get("jsjmqz")).get(2)!=null?((List<Object>)baseInfo.get("jsjmqz")).get(2).toString():"");//	精索静脉曲张程度
+                physiqueCheck.setVaricocelePart(((List<Object>)baseInfo.get("jsjmqz")).get(1)!=null?((List<Object>)baseInfo.get("jsjmqz")).get(1).toString():"");//	精索静脉曲张部位
+            }else {
+                physiqueCheck.setVaricoceleType("01");
+            }
             physiqueCheck.setRightNodules(null);//	右结节(系统没有字段)
             physiqueCheck.setLeftNodules(null);//	左结节(系统没有字段)
         }else {//女性