jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9f009e2f928b52bc7529cefa5ec504b3a6d15be9

Authored by shiyang
1 parent 85b77fc31f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 11 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ 9f009e2
... ... @@ -968,10 +968,10 @@
968 968 //上传孕前档案基本信息4.1(新上传和修改)
969 969 String result1="";
970 970 if(StringUtils.isEmpty(preEugenicsBaseModel.getDocumentId())){
971   - result1=HttpClientUtil.doWebServicePost(urladd,
  971 + result1=HttpClientUtil.doPostSSL(urladd,
972 972 lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,null));
973 973 }else {
974   - result1=HttpClientUtil.doWebServicePost(urlupdate,
  974 + result1=HttpClientUtil.doPostSSL(urlupdate,
975 975 lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,preEugenicsBaseModel.getDocumentId()));
976 976 }
977 977  
... ... @@ -982,7 +982,7 @@
982 982 String documentId=list1.get(0).getDocumentId();
983 983 Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
984 984 Update update1 = new Update().set("documentId", documentId)//上传成功后返回的id
985   - .set("isUploadingYn.archives", 0);//成功
  985 + .set("isUploadingYn.archives", 1);//成功
986 986 mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class);
987 987 LogUtil.taskInfo("孕前档案基本信息上传成功");
988 988 //上传孕前一般情况4.3
... ... @@ -1011,7 +1011,7 @@
1011 1011 break;
1012 1012 }
1013 1013 }
1014   - String result3 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGeneralSituation")
  1014 + String result3 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadGeneralSituation")
1015 1015 , lhxfyUploadingProvince.uploadingProvinceGeneral((i == 1) ? preEugenicsBaseModel.getHusbandBaseInfo() : preEugenicsBaseModel.getWifeBaseInfo()
1016 1016 , KEY, documentId));
1017 1017 if (StringUtils.isNotEmpty(result3)) {
... ... @@ -1067,7 +1067,7 @@
1067 1067 break;
1068 1068 }
1069 1069 }
1070   - String result4 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadPhysicalExamination")
  1070 + String result4 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadPhysicalExamination")
1071 1071 , lhxfyUploadingProvince.uploadingProvincePhysiqueCheck((i == 1) ? preEugenicsBaseModel.getHusbandPhysiqueCheck() : preEugenicsBaseModel.getWifePhysiqueCheck(), KEY, documentId));
1072 1072 if (StringUtils.isNotEmpty(result4)) {
1073 1073 List<UploadResult> list4 = JsonUtil.jsonToList(result4, UploadResult.class);
... ... @@ -1122,7 +1122,7 @@
1122 1122 break;
1123 1123 }
1124 1124 }
1125   - String result5 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest")
  1125 + String result5 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest")
1126 1126 , lhxfyUploadingProvince.uploadingProvinceClinicalCheck((i == 1) ? preEugenicsBaseModel.getHusbandClinicalCheck() : preEugenicsBaseModel.getWifeClinicalCheck(), KEY, documentId));
1127 1127 if (StringUtils.isNotEmpty(result5)) {
1128 1128 List<UploadResult> list5 = JsonUtil.jsonToList(result5, UploadResult.class);
... ... @@ -1153,7 +1153,7 @@
1153 1153 }
1154 1154 //上传孕前妇科B超检查4.6
1155 1155 if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) {
1156   - String result6 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGynecologicalBscan")
  1156 + String result6 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadGynecologicalBscan")
1157 1157 , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId));
1158 1158 if (StringUtils.isNotEmpty(result6)) {
1159 1159 List<UploadResult> list6 = JsonUtil.jsonToList(result6, UploadResult.class);
... ... @@ -1182,7 +1182,7 @@
1182 1182 LogUtil.error("孕前妇科B超检查4.6,没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
1183 1183 }
1184 1184 //上传孕前检查结果及评估建议4.7
1185   - String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment")
  1185 + String result7=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalAssessment")
1186 1186 ,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,KEY,documentId));
1187 1187 if(StringUtils.isNotEmpty(result7)){
1188 1188 List<UploadResult> list7=JsonUtil.jsonToList(result7, UploadResult.class);
... ... @@ -1205,7 +1205,7 @@
1205 1205 LogUtil.error("上传异常：result7=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
1206 1206 }
1207 1207 //上传孕前早孕随访4.8
1208   - /*String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow")
  1208 + /*String result8=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow")
1209 1209 ,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,KEY,documentId));
1210 1210 if(StringUtils.isNotEmpty(result8)){
1211 1211 List<UploadResult> list8=JsonUtil.jsonToList(result8, UploadResult.class);
... ... @@ -1228,7 +1228,7 @@
1228 1228 LogUtil.error("上传异常：result8=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
1229 1229 }*/
1230 1230 //上传孕前妊娠结局4.9
1231   - /*String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome")
  1231 + /*String result9=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome")
1232 1232 ,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,KEY,documentId));
1233 1233 if(StringUtils.isNotEmpty(result9)){
1234 1234 List<UploadResult> list9=JsonUtil.jsonToList(result9, UploadResult.class);
... ... @@ -1255,7 +1255,7 @@
1255 1255 Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1256 1256 Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败
1257 1257 mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class);
1258   - LogUtil.error("服务器返回：上传失败，list1"+preEugenicsBaseModel.getId()+";code:"
  1258 + LogUtil.error("服务器返回：上传失败，list1:"+preEugenicsBaseModel.getId()+";code:"
1259 1259 +list1.get(0).getCode()+";msg:"+list1.get(0).getMsg()+";type:"+list1.get(0).getType(),null);
1260 1260 }
1261 1261 }else {