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 96bf70c..be00526 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
@@ -4,6 +4,7 @@ import com.lyms.hospitalapi.lhxfy.model.UploadResult;
 import com.lyms.platform.biz.service.BasicConfigService;
 import com.lyms.platform.biz.service.ResidentsArchiveService;
 import com.lyms.platform.common.enums.YnEnums;
+import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.*;
 import com.lyms.platform.common.utils.HttpClientUtil;
 import com.lyms.platform.operate.web.utils.*;
@@ -14,6 +15,7 @@ import com.lyms.platform.query.BasicConfigQuery;
 import com.lyms.platform.query.ResidentsArchiveQuery;
 import net.sf.json.JSONObject;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Logger;
 import org.apache.xmlbeans.impl.jam.mutable.MPackage;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
@@ -951,7 +953,7 @@ public class LhxfyService {
      */
     private static final String URL = "http://39.101.222.193:8088";//测试
     private static final String KEY = "87efab891326498abdfdfca6f9490ded";//沧州测试key
-    public void uploadingProvince(List<String> ids){
+    public BaseResponse uploadingProvince(List<String> ids){
         Query query = new Query();
         //指定ID上传。
         query.addCriteria(Criteria.where("id").in(ids));
@@ -993,7 +995,7 @@ public class LhxfyService {
                                     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,（男）没有录入数据略过。");
+                                    LogUtil.taskInfo("孕前一般情况4.3,（男）没有录入数据略过。"+preEugenicsBaseModel.getId());
                                     break;
                                 }
                             } else {
@@ -1004,7 +1006,7 @@ public class LhxfyService {
                                     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,（女）没有录入数据略过。");
+                                    LogUtil.taskInfo("孕前一般情况4.3,（女）没有录入数据略过。"+preEugenicsBaseModel.getId());
                                     break;
                                 }
                             }
@@ -1022,21 +1024,21 @@ public class LhxfyService {
                                     Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                                     Update update3 = new Update().set("isUploadingYn.general" + i, 0);//失败。general1：男，general2：女
                                     mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
-                                    LogUtil.error("服务器返回：上传失败，list3。code:"
+                                    LogUtil.error("服务器返回：上传失败，list3:"+preEugenicsBaseModel.getId()+";code:"
                                             + list3.get(0).getCode() + ";msg:" + list3.get(0).getMsg() + ";type:" + list3.get(0).getType(), null);
                                 }
                             } else {
                                 Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                                 Update update3 = new Update().set("isUploadingYn.general" + i, 0);//失败。general1：男，general2：女
                                 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
-                                LogUtil.taskError("上传异常：result3=HttpClientUtil.doWebServicePost", null);
+                                LogUtil.error("上传异常：result3=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), null);
                             }
                         }
                     }else{
                         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);
+                        LogUtil.error("孕前一般情况4.3,男女没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
                     }
                     //上传孕前体格检查4.4
                     if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()||!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) {
@@ -1049,7 +1051,7 @@ public class LhxfyService {
                                     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,（男）没有录入数据略过。");
+                                    LogUtil.taskInfo("孕前体格检查4.4,（男）没有录入数据略过。"+preEugenicsBaseModel.getId());
                                     break;
                                 }
                             } else {
@@ -1060,7 +1062,7 @@ public class LhxfyService {
                                     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,（女）没有录入数据略过。");
+                                    LogUtil.taskInfo("孕前体格检查4.4,（女）没有录入数据略过。"+preEugenicsBaseModel.getId());
                                     break;
                                 }
                             }
@@ -1077,21 +1079,21 @@ public class LhxfyService {
                                     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:"
+                                    LogUtil.error("服务器返回：上传失败，list4:"+preEugenicsBaseModel.getId()+";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);
+                                LogUtil.error("上传异常：result4=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), null);
                             }
                         }
                     }else {
                         Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                         Update update4 = new Update().set("isUploadingYn.physiqueCheck1", 0).set("isUploadingYn.physiqueCheckl2",0);//男和女
                         mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
-                        LogUtil.taskError("孕前体格检查4.4,男女没有录入数据略过。",null);
+                        LogUtil.error("孕前体格检查4.4,男女没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
                     }
                     //上传孕前临床检验4.5
                     if(!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()||!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) {
@@ -1104,7 +1106,7 @@ public class LhxfyService {
                                     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,（男）没有录入数据略过。");
+                                    LogUtil.taskInfo("孕前临床检验4.5,（男）没有录入数据略过。"+preEugenicsBaseModel.getId());
                                     break;
                                 }
                             } else {
@@ -1115,7 +1117,7 @@ public class LhxfyService {
                                     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,（女）没有录入数据略过。");
+                                    LogUtil.taskInfo("孕前临床检验4.5,（女）没有录入数据略过。"+preEugenicsBaseModel.getId());
                                     break;
                                 }
                             }
@@ -1132,21 +1134,21 @@ public class LhxfyService {
                                     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:"
+                                    LogUtil.error("服务器返回：上传失败，list5:"+preEugenicsBaseModel.getId()+";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);
+                                LogUtil.error("上传异常：result5=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), null);
                             }
                         }
                     }else {
                         Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                         Update update5 = new Update().set("isUploadingYn.clinicalCheck1", 0).set("isUploadingYn.clinicalCheck2",0);//男和女
                         mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
-                        LogUtil.taskError("孕前临床检验4.5,男女没有录入数据略过。",null);
+                        LogUtil.error("孕前临床检验4.5,男女没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
                     }
                     //上传孕前妇科B超检查4.6
                     if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) {
@@ -1163,20 +1165,20 @@ public class LhxfyService {
                                 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:"
+                                LogUtil.error("服务器返回：上传失败，list6:"+preEugenicsBaseModel.getId()+";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.taskError("上传异常：result6=HttpClientUtil.doWebServicePost", null);
+                            LogUtil.error("上传异常：result6=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), 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.taskError("孕前妇科B超检查4.6,没有录入数据略过。",null);
+                        LogUtil.error("孕前妇科B超检查4.6,没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
                     }
                     //上传孕前检查结果及评估建议4.7
                     String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment")
@@ -1192,14 +1194,14 @@ public class LhxfyService {
                             Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                             Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败
                             mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class);
-                            LogUtil.error("服务器返回：上传失败，list7。code:"
+                            LogUtil.error("服务器返回：上传失败，list7"+preEugenicsBaseModel.getId()+";code:"
                                     +list7.get(0).getCode()+";msg:"+list7.get(0).getMsg()+";type:"+list7.get(0).getType(),null);
                         }
                     }else {
                         Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                         Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败
                         mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class);
-                        LogUtil.taskError("上传异常：result7=HttpClientUtil.doWebServicePost",null);
+                        LogUtil.error("上传异常：result7=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
                     }
                     //上传孕前早孕随访4.8
                     /*String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow")
@@ -1215,14 +1217,14 @@ public class LhxfyService {
                             Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                             Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败
                             mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class);
-                            LogUtil.error("服务器返回：上传失败，list8。code:"
+                            LogUtil.error("服务器返回：上传失败，list8"+preEugenicsBaseModel.getId()+";code:"
                                     +list8.get(0).getCode()+";msg:"+list8.get(0).getMsg()+";type:"+list8.get(0).getType(),null);
                         }
                     }else {
                         Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                         Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败
                         mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class);
-                        LogUtil.taskError("上传异常：result8=HttpClientUtil.doWebServicePost",null);
+                        LogUtil.error("上传异常：result8=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
                     }*/
                     //上传孕前妊娠结局4.9
                     /*String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome")
@@ -1238,28 +1240,28 @@ public class LhxfyService {
                             Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                             Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败
                             mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class);
-                            LogUtil.error("服务器返回：上传失败，list8。code:"
+                            LogUtil.error("服务器返回：上传失败，list8"+preEugenicsBaseModel.getId()+";code:"
                                     +list9.get(0).getCode()+";msg:"+list9.get(0).getMsg()+";type:"+list9.get(0).getType(),null);
                         }
                     }else {
                         Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                         Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败
                         mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class);
-                        LogUtil.taskError("上传异常：result9=HttpClientUtil.doWebServicePost",null);
+                        LogUtil.error("上传异常：result9=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
                     }*/
 
                 }else {
                     Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                     Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败
                     mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class);
-                    LogUtil.taskError("服务器返回：上传失败，list1。code:"
+                    LogUtil.error("服务器返回：上传失败，list1"+preEugenicsBaseModel.getId()+";code:"
                             +list1.get(0).getCode()+";msg:"+list1.get(0).getMsg()+";type:"+list1.get(0).getType(),null);
                 }
             }else {
                 Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
                 Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败
                 mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class);
-                LogUtil.taskError("上传异常：result1=HttpClientUtil.doWebServicePost",null);
+                LogUtil.error("上传异常：result1=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
             }
             //整个上传结果更新到结果字段
             PreEugenicsBaseModel model= mongoTemplate.findById(preEugenicsBaseModel.getId(), PreEugenicsBaseModel.class);
@@ -1292,6 +1294,9 @@ public class LhxfyService {
                 mongoTemplate.updateFirst(baseQuery, update, PreEugenicsBaseModel.class);
             }
         }
+        BaseResponse baseResponse=new BaseResponse();
+//        baseResponse.setObject(Logger.getLogger("task"));
+        return baseResponse;
     }
 
     /**
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
index 9396df9..dabfea4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
@@ -369,7 +369,12 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen
         }
         Integer isUploadingProvince = param.getIsUploadingProvince();
         if (isUploadingProvince != null) {
-            query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince));
+            if(isUploadingProvince==1){//已上传
+                query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince));
+            }else {//未上传
+                query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince).orOperator(Criteria.where("isUploadingProvince").exists(false)));
+            }
+
         }
 
         query = getQueryByAddress(param, searchType, query);