diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
index f31ba40..d48e7dc 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
@@ -978,19 +978,27 @@ public class LhxfyService {
                             for (int i = 1; i <= 2; i++) {//男女分别上传
                                 if (i == 1) {
                                     if(null!=preEugenicsBaseModel.getHusbandBaseInfo()) {
+                                        //组装数据时区分男女
                                         preEugenicsBaseModel.setHusbandBaseInfo(new HashMap<String, Object>() {{
                                             put("sex", "01");
                                         }});
                                     }else {
+                                        Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                        Update update3 = new Update().set("isUploadingYn.general"+i,0);//男
+                                        mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
                                         LogUtil.taskInfo("孕前一般情况4.3,（男）没有录入数据略过。");
                                         break;
                                     }
                                 } else {
                                     if(null!=preEugenicsBaseModel.getWifeBaseInfo()) {
+                                        //组装数据时区分男女
                                         preEugenicsBaseModel.setWifeBaseInfo(new HashMap<String, Object>() {{
                                             put("sex", "02");
                                         }});
                                     }else {
+                                        Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                        Update update3 = new Update().set("isUploadingYn.general"+i,0);//女
+                                        mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
                                         LogUtil.taskInfo("孕前一般情况4.3,（女）没有录入数据略过。");
                                         break;
                                     }
@@ -1019,76 +1027,158 @@ public class LhxfyService {
                                 }
                             }
                         }else{
-                            LogUtil.taskInfo("孕前一般情况4.3,没有录入数据略过。");
+                            Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                            Update update3 = new Update().set("isUploadingYn.general1", 0).set("isUploadingYn.general2",0);//男和女
+                            mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
+                            LogUtil.taskError("孕前一般情况4.3,男女没有录入数据略过。",null);
                         }
                         //上传孕前体格检查4.4
-                        String result4=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadPhysicalExamination")
-                                ,lhxfyUploadingProvince.uploadingProvincePhysiqueCheck(preEugenicsBaseModel,KEY,documentId));
-                        if(StringUtils.isNotEmpty(result4)){
-                            List<UploadResult> list4=JsonUtil.jsonToList(result4, UploadResult.class);
-                            if("0000".equals(list4.get(0).getCode())){
-                                Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
-                                Update update4 = new Update().set("isUploadingYn.physiqueCheck", 1);//成功
-                                mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
-                                LogUtil.taskInfo("孕前体格检查上传成功");
-                            }else {
-                                Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
-                                Update update4 = new Update().set("isUploadingYn.physiqueCheck", 0);//失败
-                                mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
-                                LogUtil.error("服务器返回：上传失败，list3。code:"
-                                        +list4.get(0).getCode()+";msg:"+list4.get(0).getMsg()+";type:"+list4.get(0).getType(),null);
+                        if(null!=preEugenicsBaseModel.getHusbandPhysiqueCheck()||null!=preEugenicsBaseModel.getWifePhysiqueCheck()) {
+                            for (int i = 1; i <= 2; i++) {//男女分别上传
+                                if (i == 1) {
+                                    if(null!=preEugenicsBaseModel.getHusbandPhysiqueCheck()) {
+                                        //组装数据时区分男女
+                                        preEugenicsBaseModel.setHusbandPhysiqueCheck(new HashMap<String, Object>() {{
+                                            put("sex", "01");
+                                        }});
+                                    }else {
+                                        Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                        Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//男
+                                        mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
+                                        LogUtil.taskInfo("孕前体格检查4.4,（男）没有录入数据略过。");
+                                        break;
+                                    }
+                                } else {
+                                    if(null!=preEugenicsBaseModel.getWifePhysiqueCheck()) {
+                                        //组装数据时区分男女
+                                        preEugenicsBaseModel.setWifePhysiqueCheck(new HashMap<String, Object>() {{
+                                            put("sex", "02");
+                                        }});
+                                    }else {
+                                        Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                        Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//女
+                                        mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
+                                        LogUtil.taskInfo("孕前体格检查4.4,（女）没有录入数据略过。");
+                                        break;
+                                    }
+                                }
+                                String result4 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadPhysicalExamination")
+                                        , lhxfyUploadingProvince.uploadingProvincePhysiqueCheck((i == 1) ? preEugenicsBaseModel.getHusbandPhysiqueCheck() : preEugenicsBaseModel.getWifePhysiqueCheck(), KEY, documentId));
+                                if (StringUtils.isNotEmpty(result4)) {
+                                    List<UploadResult> list4 = JsonUtil.jsonToList(result4, UploadResult.class);
+                                    if ("0000".equals(list4.get(0).getCode())) {
+                                        Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                        Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 1);//成功
+                                        mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
+                                        LogUtil.taskInfo("孕前体格检查上传成功");
+                                    } else {
+                                        Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                        Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败
+                                        mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
+                                        LogUtil.error("服务器返回：上传失败，list4。code:"
+                                                + list4.get(0).getCode() + ";msg:" + list4.get(0).getMsg() + ";type:" + list4.get(0).getType(), null);
+                                    }
+                                } else {
+                                    Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                    Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败
+                                    mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
+                                    LogUtil.taskError("上传异常：result4=HttpClientUtil.doWebServicePost", null);
+                                }
                             }
                         }else {
                             Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
-                            Update update4 = new Update().set("isUploadingYn.physiqueCheck", 0);//失败
+                            Update update4 = new Update().set("isUploadingYn.physiqueCheck1", 0).set("isUploadingYn.physiqueCheckl2",0);//男和女
                             mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
-                            LogUtil.taskError("上传异常：result4=HttpClientUtil.doWebServicePost",null);
+                            LogUtil.taskError("孕前体格检查4.4,男女没有录入数据略过。",null);
                         }
                         //上传孕前临床检验4.5
-                        String result5=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalClinicalTest")
-                                ,lhxfyUploadingProvince.uploadingProvinceClinicalCheck(preEugenicsBaseModel,KEY,documentId));
-                        if(StringUtils.isNotEmpty(result5)){
-                            List<UploadResult> list5=JsonUtil.jsonToList(result5, UploadResult.class);
-                            if("0000".equals(list5.get(0).getCode())){
-                                Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
-                                Update update5 = new Update().set("isUploadingYn.clinicalCheck", 1);//成功
-                                mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
-                                LogUtil.taskInfo("孕前临床检验上传成功");
-                            }else {
-                                Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
-                                Update update5 = new Update().set("isUploadingYn.clinicalCheck", 0);//失败
-                                mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
-                                LogUtil.error("服务器返回：上传失败，list5。code:"
-                                        +list5.get(0).getCode()+";msg:"+list5.get(0).getMsg()+";type:"+list5.get(0).getType(),null);
+                        if(null!=preEugenicsBaseModel.getHusbandClinicalCheck()||null!=preEugenicsBaseModel.getWifeClinicalCheck()) {
+                            for (int i = 1; i <= 2; i++) {//男女分别上传
+                                if (i == 1) {
+                                    if (null != preEugenicsBaseModel.getHusbandClinicalCheck()) {
+                                        //组装数据时区分男女
+                                        preEugenicsBaseModel.setHusbandClinicalCheck(new HashMap<String, Object>() {{
+                                            put("sex", "01");
+                                        }});
+                                    } else {
+                                        Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                        Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//男
+                                        mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
+                                        LogUtil.taskInfo("孕前临床检验4.5,（男）没有录入数据略过。");
+                                        break;
+                                    }
+                                } else {
+                                    if (null != preEugenicsBaseModel.getWifeClinicalCheck()) {
+                                        //组装数据时区分男女
+                                        preEugenicsBaseModel.setWifeClinicalCheck(new HashMap<String, Object>() {{
+                                            put("sex", "02");
+                                        }});
+                                    } else {
+                                        Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                        Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//女
+                                        mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
+                                        LogUtil.taskInfo("孕前临床检验4.5,（女）没有录入数据略过。");
+                                        break;
+                                    }
+                                }
+                                String result5 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest")
+                                        , lhxfyUploadingProvince.uploadingProvinceClinicalCheck((i == 1) ? preEugenicsBaseModel.getHusbandClinicalCheck() : preEugenicsBaseModel.getWifeClinicalCheck(), KEY, documentId));
+                                if (StringUtils.isNotEmpty(result5)) {
+                                    List<UploadResult> list5 = JsonUtil.jsonToList(result5, UploadResult.class);
+                                    if ("0000".equals(list5.get(0).getCode())) {
+                                        Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                        Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 1);//成功
+                                        mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
+                                        LogUtil.taskInfo("孕前临床检验上传成功");
+                                    } else {
+                                        Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                        Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败
+                                        mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
+                                        LogUtil.error("服务器返回：上传失败，list5。code:"
+                                                + list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg() + ";type:" + list5.get(0).getType(), null);
+                                    }
+                                } else {
+                                    Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                    Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败
+                                    mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
+                                    LogUtil.taskError("上传异常：result5=HttpClientUtil.doWebServicePost", null);
+                                }
                             }
                         }else {
                             Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
-                            Update update5 = new Update().set("isUploadingYn.clinicalCheck", 0);//失败
+                            Update update5 = new Update().set("isUploadingYn.clinicalCheck1", 0).set("isUploadingYn.clinicalCheck2",0);//男和女
                             mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
-                            LogUtil.taskError("上传异常：result5=HttpClientUtil.doWebServicePost",null);
+                            LogUtil.taskError("孕前临床检验4.5,男女没有录入数据略过。",null);
                         }
                         //上传孕前妇科B超检查4.6
-                        String result6=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadGynecologicalBscan")
-                                ,lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel,KEY,documentId));
-                        if(StringUtils.isNotEmpty(result6)){
-                            List<UploadResult> list6=JsonUtil.jsonToList(result6, UploadResult.class);
-                            if("0000".equals(list6.get(0).getCode())){
-                                Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
-                                Update update6 = new Update().set("isUploadingYn.bCheck", 1);//成功
-                                mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class);
-                                LogUtil.taskInfo("孕前妇科B超检查上传成功");
-                            }else {
+                        if(null!=preEugenicsBaseModel.getWifeBCheck()) {
+                            String result6 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGynecologicalBscan")
+                                    , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId));
+                            if (StringUtils.isNotEmpty(result6)) {
+                                List<UploadResult> list6 = JsonUtil.jsonToList(result6, UploadResult.class);
+                                if ("0000".equals(list6.get(0).getCode())) {
+                                    Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                    Update update6 = new Update().set("isUploadingYn.bCheck", 1);//成功
+                                    mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class);
+                                    LogUtil.taskInfo("孕前妇科B超检查上传成功");
+                                } else {
+                                    Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
+                                    Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败
+                                    mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class);
+                                    LogUtil.error("服务器返回：上传失败，list6。code:"
+                                            + list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg() + ";type:" + list6.get(0).getType(), null);
+                                }
+                            } else {
                                 Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                                 Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败
                                 mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class);
-                                LogUtil.error("服务器返回：上传失败，list6。code:"
-                                        +list6.get(0).getCode()+";msg:"+list6.get(0).getMsg()+";type:"+list6.get(0).getType(),null);
+                                LogUtil.taskError("上传异常：result6=HttpClientUtil.doWebServicePost", null);
                             }
                         }else {
                             Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
-                            Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败
+                            Update update6 = new Update().set("isUploadingYn.bCheck", 0);//未录入
                             mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class);
-                            LogUtil.taskError("上传异常：result6=HttpClientUtil.doWebServicePost",null);
+                            LogUtil.taskError("孕前妇科B超检查4.6,没有录入数据略过。",null);
                         }
                         //上传孕前检查结果及评估建议4.7
                         /*String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment")
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 1db688a..bd2713b 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
@@ -360,7 +360,7 @@ public class LhxfyUploadingProvince {
         return JsonUtil.obj2Str(general);
     }
     //上传孕前体格检查4.4
-    public String uploadingProvincePhysiqueCheck(PreEugenicsBaseModel baseModel,String key,String documentId){
+    public String uploadingProvincePhysiqueCheck(Map<String,Object> baseInfo,String key,String documentId){
         Map<String,Object> data=new HashMap<>();
         String json="";
         if (StringUtils.isNotEmpty(json))
@@ -371,7 +371,7 @@ public class LhxfyUploadingProvince {
         return JsonUtil.obj2Str(data);
     }
     //上传孕前临床检验4.5
-    public String uploadingProvinceClinicalCheck(PreEugenicsBaseModel baseModel,String key,String documentId){
+    public String uploadingProvinceClinicalCheck(Map<String,Object> baseInfo,String key,String documentId){
         Map<String,Object> data=new HashMap<>();
         String json="";
         if (StringUtils.isNotEmpty(json))
@@ -382,7 +382,7 @@ public class LhxfyUploadingProvince {
         return JsonUtil.obj2Str(data);
     }
     //上传孕前妇科B超检查4.6
-    public String uploadingProvinceBCheck(PreEugenicsBaseModel baseModel,String key,String documentId){
+    public String uploadingProvinceBCheck(Map<String,Object> baseInfo,String key,String documentId){
         Map<String,Object> data=new HashMap<>();
         String json="";
         if (StringUtils.isNotEmpty(json))