From 9f009e2f928b52bc7529cefa5ec504b3a6d15be9 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 9 Dec 2021 16:10:45 +0800 Subject: [PATCH] update --- .../com/lyms/hospitalapi/lhxfy/LhxfyService.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 3287c48..4ae24b7 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 @@ -968,10 +968,10 @@ public class LhxfyService { //上传孕前档案基本信息4.1(新上传和修改) String result1=""; if(StringUtils.isEmpty(preEugenicsBaseModel.getDocumentId())){ - result1=HttpClientUtil.doWebServicePost(urladd, + result1=HttpClientUtil.doPostSSL(urladd, lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,null)); }else { - result1=HttpClientUtil.doWebServicePost(urlupdate, + result1=HttpClientUtil.doPostSSL(urlupdate, lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,preEugenicsBaseModel.getDocumentId())); } @@ -982,7 +982,7 @@ public class LhxfyService { String documentId=list1.get(0).getDocumentId(); Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update1 = new Update().set("documentId", documentId)//上传成功后返回的id - .set("isUploadingYn.archives", 0);//成功 + .set("isUploadingYn.archives", 1);//成功 mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); LogUtil.taskInfo("孕前档案基本信息上传成功"); //上传孕前一般情况4.3 @@ -1011,7 +1011,7 @@ public class LhxfyService { break; } } - String result3 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGeneralSituation") + String result3 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadGeneralSituation") , lhxfyUploadingProvince.uploadingProvinceGeneral((i == 1) ? preEugenicsBaseModel.getHusbandBaseInfo() : preEugenicsBaseModel.getWifeBaseInfo() , KEY, documentId)); if (StringUtils.isNotEmpty(result3)) { @@ -1067,7 +1067,7 @@ public class LhxfyService { break; } } - String result4 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadPhysicalExamination") + String result4 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadPhysicalExamination") , lhxfyUploadingProvince.uploadingProvincePhysiqueCheck((i == 1) ? preEugenicsBaseModel.getHusbandPhysiqueCheck() : preEugenicsBaseModel.getWifePhysiqueCheck(), KEY, documentId)); if (StringUtils.isNotEmpty(result4)) { List list4 = JsonUtil.jsonToList(result4, UploadResult.class); @@ -1122,7 +1122,7 @@ public class LhxfyService { break; } } - String result5 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest") + String result5 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest") , lhxfyUploadingProvince.uploadingProvinceClinicalCheck((i == 1) ? preEugenicsBaseModel.getHusbandClinicalCheck() : preEugenicsBaseModel.getWifeClinicalCheck(), KEY, documentId)); if (StringUtils.isNotEmpty(result5)) { List list5 = JsonUtil.jsonToList(result5, UploadResult.class); @@ -1153,7 +1153,7 @@ public class LhxfyService { } //上传孕前妇科B超检查4.6 if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) { - String result6 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGynecologicalBscan") + String result6 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadGynecologicalBscan") , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId)); if (StringUtils.isNotEmpty(result6)) { List list6 = JsonUtil.jsonToList(result6, UploadResult.class); @@ -1182,7 +1182,7 @@ public class LhxfyService { LogUtil.error("孕前妇科B超检查4.6,没有录入数据略过。"+preEugenicsBaseModel.getId(),null); } //上传孕前检查结果及评估建议4.7 - String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment") + String result7=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalAssessment") ,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,KEY,documentId)); if(StringUtils.isNotEmpty(result7)){ List list7=JsonUtil.jsonToList(result7, UploadResult.class); @@ -1205,7 +1205,7 @@ public class LhxfyService { LogUtil.error("上传异常：result7=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null); } //上传孕前早孕随访4.8 - /*String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow") + /*String result8=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow") ,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,KEY,documentId)); if(StringUtils.isNotEmpty(result8)){ List list8=JsonUtil.jsonToList(result8, UploadResult.class); @@ -1228,7 +1228,7 @@ public class LhxfyService { LogUtil.error("上传异常：result8=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null); }*/ //上传孕前妊娠结局4.9 - /*String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome") + /*String result9=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome") ,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,KEY,documentId)); if(StringUtils.isNotEmpty(result9)){ List list9=JsonUtil.jsonToList(result9, UploadResult.class); @@ -1255,7 +1255,7 @@ public class LhxfyService { 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.error("服务器返回：上传失败，list1"+preEugenicsBaseModel.getId()+";code:" + LogUtil.error("服务器返回：上传失败，list1:"+preEugenicsBaseModel.getId()+";code:" +list1.get(0).getCode()+";msg:"+list1.get(0).getMsg()+";type:"+list1.get(0).getType(),null); } }else { -- 1.8.3.1