From f2fc70e2da25d26e098f81300fadd64ef165c8db Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 14 Dec 2021 23:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/BasicConfigServiceTest.java | 2 +- .../lyms/platform/common/utils/HttpClientUtil.java | 4 +- .../com/lyms/hospitalapi/lhxfy/LhxfyService.java | 47 +++++++++++++++++----- .../hospitalapi/lhxfy/LhxfyUploadingProvince.java | 10 +++-- 4 files changed, 47 insertions(+), 16 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index 156b54d..f72f175 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -7189,7 +7189,7 @@ public class BasicConfigServiceTest { public static void main(String[] args) { - savePreeugenicsAddr("C:\\Users\\liquanyu\\Desktop\\doc\\孕前优生上传省平台\\承德区划对照表.xls"); + savePreeugenicsAddr("C:\\Users\\liquanyu\\Desktop\\doc\\孕前优生上传省平台\\隆化妇幼保健院孕前上传正式\\承德区划对照表.xls"); // dic(); // handle(); // getData(); diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java index 2bbb0e0..29159f0 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java @@ -238,7 +238,8 @@ public class HttpClientUtil { } httpStr = EntityUtils.toString(entity, "utf-8"); } catch (Exception e) { - e.printStackTrace(); + ExceptionUtils.catchException(e,e.getMessage()); + return null; } finally { if (response != null) { try { @@ -251,7 +252,6 @@ public class HttpClientUtil { { httpPost.releaseConnection(); } - } return httpStr; } 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 400d59a..6b78ed5 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 @@ -981,10 +981,10 @@ public class LhxfyService { //上传孕前档案基本信息4.1(新上传和修改) String result1=""; if(StringUtils.isEmpty(preEugenicsBaseModel.getDocumentId())){ - result1=HttpClientUtil.doPostSSL(urladd, + result1=repeatPost(urladd, lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,null)); }else { - result1=HttpClientUtil.doPostSSL(urlupdate, + result1=repeatPost(urlupdate, lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,preEugenicsBaseModel.getDocumentId())); } @@ -1030,7 +1030,7 @@ public class LhxfyService { break; } } - String result3 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadGeneralSituation") + String result3 = repeatPost((URL + "/m/antenatalUpload/uploadGeneralSituation") , lhxfyUploadingProvince.uploadingProvinceGeneral((i == 1) ? preEugenicsBaseModel.getHusbandBaseInfo() : preEugenicsBaseModel.getWifeBaseInfo() , KEY, documentId)); if (StringUtils.isNotEmpty(result3)) { @@ -1092,7 +1092,7 @@ public class LhxfyService { break; } } - String result4 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadPhysicalExamination") + String result4 = repeatPost((URL + "/m/antenatalUpload/uploadPhysicalExamination") , lhxfyUploadingProvince.uploadingProvincePhysiqueCheck((i == 1) ? preEugenicsBaseModel.getHusbandPhysiqueCheck() : preEugenicsBaseModel.getWifePhysiqueCheck() , KEY, documentId)); if (StringUtils.isNotEmpty(result4)) { @@ -1154,7 +1154,7 @@ public class LhxfyService { break; } } - String result5 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest") + String result5 = repeatPost((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest") , lhxfyUploadingProvince.uploadingProvinceClinicalCheck((i == 1) ? preEugenicsBaseModel.getHusbandClinicalCheck() : preEugenicsBaseModel.getWifeClinicalCheck() , KEY, documentId)); if (StringUtils.isNotEmpty(result5)) { @@ -1190,7 +1190,7 @@ public class LhxfyService { } //上传孕前妇科B超检查4.6 if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) { - String result6 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadGynecologicalBscan") + String result6 = repeatPost((URL + "/m/antenatalUpload/uploadGynecologicalBscan") , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId)); if (StringUtils.isNotEmpty(result6)) { List list6 = JsonUtil.jsonToList(result6, UploadResult.class); @@ -1223,7 +1223,7 @@ public class LhxfyService { baseResponseList.add("孕前妇科B超检查,（女）没有录入数据请完善数据。"+preEugenicsBaseModel.getWifeName()); } //上传孕前检查结果及评估建议4.7 - String result7=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalAssessment") + String result7=repeatPost((URL+"/m/antenatalUpload/uploadAntenatalAssessment") ,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,KEY,documentId)); if(StringUtils.isNotEmpty(result7)){ List list7=JsonUtil.jsonToList(result7, UploadResult.class); @@ -1249,7 +1249,7 @@ public class LhxfyService { baseResponseList.add("上传异常：result7:null;"+preEugenicsBaseModel.getId()); } //上传孕前早孕随访4.8 - /*String result8=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow") + /*String result8=repeatPost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow") ,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,KEY,documentId)); if(StringUtils.isNotEmpty(result8)){ List list8=JsonUtil.jsonToList(result8, UploadResult.class); @@ -1272,7 +1272,7 @@ public class LhxfyService { LogUtil.error("上传异常：result8=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null); }*/ //上传孕前妊娠结局4.9 - /*String result9=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome") + /*String result9=repeatPost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome") ,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,KEY,documentId)); if(StringUtils.isNotEmpty(result9)){ List list9=JsonUtil.jsonToList(result9, UploadResult.class); @@ -1356,6 +1356,35 @@ public class LhxfyService { return baseResponse; } + + /** + * 重试三次 + * @param apiUrl + * @param json + * @return + */ + private String repeatPost(String apiUrl, Object json) + { + for (int i = 0; i <= 2; i++) + { + String result = HttpClientUtil.doPostSSL(apiUrl,json); + if (result == null) + { + try{ + Thread.sleep(1000); + } + catch (Exception e){ + } + continue; + } + else + { + return result; + } + } + return null; + } + /** * * @param streetId 街道地址id 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 695994d..0bc5ddc 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 @@ -170,7 +170,9 @@ public class LhxfyUploadingProvince { archives.setHusband_village(lhxfyService.getPreeugenicsAddr(baseModel.getHusbandAccountStreet()));// 丈夫户口村级区划 archives.setZipCode(StringUtils.isNotEmpty(baseModel.getWifeZipCode())?baseModel.getWifeZipCode():"000000");// 妻子邮编 - archives.setMarriageTime(DateUtil.getyyyy_MM_dd(baseModel.getMarriageTime()));// 结婚时间 + archives.setMarriageTime(baseModel.getMarriageTime() == null ? DateUtil.getyyyy_MM_dd(baseModel.getFillDate()) : DateUtil.getyyyy_MM_dd(baseModel.getMarriageTime()));// 结婚时间 + + //隶属单位 村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227 archives.setSubUnitsVillage(baseModel.getSubUnitsVillage()); archives.setMarriageTypeCode(null);// 婚姻状态01：初婚 02：再婚 03：复婚(系统没有具体选项) @@ -971,8 +973,8 @@ public class LhxfyUploadingProvince { physiqueCheck.setLimbSpinal(((List)baseInfo.get("szjz")).get(1).toString());// 四肢脊柱异常详情 physiqueCheck.setPhysicalCheckOther(null!=baseInfo.get("othermsg")?baseInfo.get("othermsg").toString():null);// 体格检查其他 physiqueCheck.setPhysicalCheckDate(baseInfo.get("checkDate").toString());// 体格检查日期 - Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("checkDoctor").toString())); - physiqueCheck.setPhysicalCheckDoctor(users.getName());// 医生签名 + Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); + physiqueCheck.setPhysicalCheckDoctor(users1.getName());// 医生签名 physiqueCheck.setGynaecology("02");// 是否参加妇科检查/男科检查 01：否 0 physiqueCheck.setExistContent(null);// 不参加妇科/男科检查的原因(系统没有字段) physiqueCheck.setPubicHairType(((List)baseInfo.get("yinmao")).get(0).toString().equals("0")?"01":"02");//阴毛 01：正常 02：异常 @@ -980,7 +982,7 @@ public class LhxfyUploadingProvince { physiqueCheck.setIsPection("0");// 数据是否同步到婚检1：是 2：否(需求默认0) physiqueCheck.setSexCheckOther(baseInfo.get("othermsg1").toString());// 其他 physiqueCheck.setSexCheckDate(baseInfo.get("fillDate").toString());// 检查日期 - Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); + physiqueCheck.setSexCheckDoctor(users1.getName());// 医生签名 return JsonUtil.obj2Str(physiqueCheck); } -- 1.8.3.1