jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f2fc70e2da25d26e098f81300fadd64ef165c8db

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

隆化接口

Showing 4 changed files with 47 additions and 16 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java View file @ f2fc70e
... ... @@ -7189,7 +7189,7 @@
7189 7189  
7190 7190  
7191 7191 public static void main(String[] args) {
7192   - savePreeugenicsAddr("C:\\Users\\liquanyu\\Desktop\\doc\\孕前优生上传省平台\\承德区划对照表.xls");
  7192 + savePreeugenicsAddr("C:\\Users\\liquanyu\\Desktop\\doc\\孕前优生上传省平台\\隆化妇幼保健院孕前上传正式\\承德区划对照表.xls");
7193 7193 // dic();
7194 7194 // handle();
7195 7195 // getData();
platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java View file @ f2fc70e
... ... @@ -238,7 +238,8 @@
238 238 }
239 239 httpStr = EntityUtils.toString(entity, "utf-8");
240 240 } catch (Exception e) {
241   - e.printStackTrace();
  241 + ExceptionUtils.catchException(e,e.getMessage());
  242 + return null;
242 243 } finally {
243 244 if (response != null) {
244 245 try {
... ... @@ -251,7 +252,6 @@
251 252 {
252 253 httpPost.releaseConnection();
253 254 }
254   -
255 255 }
256 256 return httpStr;
257 257 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ f2fc70e
... ... @@ -981,10 +981,10 @@
981 981 //上传孕前档案基本信息4.1(新上传和修改)
982 982 String result1="";
983 983 if(StringUtils.isEmpty(preEugenicsBaseModel.getDocumentId())){
984   - result1=HttpClientUtil.doPostSSL(urladd,
  984 + result1=repeatPost(urladd,
985 985 lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,null));
986 986 }else {
987   - result1=HttpClientUtil.doPostSSL(urlupdate,
  987 + result1=repeatPost(urlupdate,
988 988 lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,preEugenicsBaseModel.getDocumentId()));
989 989 }
990 990  
... ... @@ -1030,7 +1030,7 @@
1030 1030 break;
1031 1031 }
1032 1032 }
1033   - String result3 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadGeneralSituation")
  1033 + String result3 = repeatPost((URL + "/m/antenatalUpload/uploadGeneralSituation")
1034 1034 , lhxfyUploadingProvince.uploadingProvinceGeneral((i == 1) ? preEugenicsBaseModel.getHusbandBaseInfo() : preEugenicsBaseModel.getWifeBaseInfo()
1035 1035 , KEY, documentId));
1036 1036 if (StringUtils.isNotEmpty(result3)) {
... ... @@ -1092,7 +1092,7 @@
1092 1092 break;
1093 1093 }
1094 1094 }
1095   - String result4 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadPhysicalExamination")
  1095 + String result4 = repeatPost((URL + "/m/antenatalUpload/uploadPhysicalExamination")
1096 1096 , lhxfyUploadingProvince.uploadingProvincePhysiqueCheck((i == 1) ? preEugenicsBaseModel.getHusbandPhysiqueCheck() : preEugenicsBaseModel.getWifePhysiqueCheck()
1097 1097 , KEY, documentId));
1098 1098 if (StringUtils.isNotEmpty(result4)) {
... ... @@ -1154,7 +1154,7 @@
1154 1154 break;
1155 1155 }
1156 1156 }
1157   - String result5 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest")
  1157 + String result5 = repeatPost((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest")
1158 1158 , lhxfyUploadingProvince.uploadingProvinceClinicalCheck((i == 1) ? preEugenicsBaseModel.getHusbandClinicalCheck() : preEugenicsBaseModel.getWifeClinicalCheck()
1159 1159 , KEY, documentId));
1160 1160 if (StringUtils.isNotEmpty(result5)) {
... ... @@ -1190,7 +1190,7 @@
1190 1190 }
1191 1191 //上传孕前妇科B超检查4.6
1192 1192 if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) {
1193   - String result6 = HttpClientUtil.doPostSSL((URL + "/m/antenatalUpload/uploadGynecologicalBscan")
  1193 + String result6 = repeatPost((URL + "/m/antenatalUpload/uploadGynecologicalBscan")
1194 1194 , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId));
1195 1195 if (StringUtils.isNotEmpty(result6)) {
1196 1196 List<UploadResult> list6 = JsonUtil.jsonToList(result6, UploadResult.class);
... ... @@ -1223,7 +1223,7 @@
1223 1223 baseResponseList.add("孕前妇科B超检查,（女）没有录入数据请完善数据。"+preEugenicsBaseModel.getWifeName());
1224 1224 }
1225 1225 //上传孕前检查结果及评估建议4.7
1226   - String result7=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalAssessment")
  1226 + String result7=repeatPost((URL+"/m/antenatalUpload/uploadAntenatalAssessment")
1227 1227 ,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,KEY,documentId));
1228 1228 if(StringUtils.isNotEmpty(result7)){
1229 1229 List<UploadResult> list7=JsonUtil.jsonToList(result7, UploadResult.class);
... ... @@ -1249,7 +1249,7 @@
1249 1249 baseResponseList.add("上传异常：result7:null;"+preEugenicsBaseModel.getId());
1250 1250 }
1251 1251 //上传孕前早孕随访4.8
1252   - /*String result8=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow")
  1252 + /*String result8=repeatPost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow")
1253 1253 ,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,KEY,documentId));
1254 1254 if(StringUtils.isNotEmpty(result8)){
1255 1255 List<UploadResult> list8=JsonUtil.jsonToList(result8, UploadResult.class);
... ... @@ -1272,7 +1272,7 @@
1272 1272 LogUtil.error("上传异常：result8=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
1273 1273 }*/
1274 1274 //上传孕前妊娠结局4.9
1275   - /*String result9=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome")
  1275 + /*String result9=repeatPost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome")
1276 1276 ,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,KEY,documentId));
1277 1277 if(StringUtils.isNotEmpty(result9)){
1278 1278 List<UploadResult> list9=JsonUtil.jsonToList(result9, UploadResult.class);
... ... @@ -1354,6 +1354,35 @@
1354 1354  
1355 1355 baseResponse.setObject(baseResponseList);
1356 1356 return baseResponse;
  1357 + }
  1358 +
  1359 +
  1360 + /**
  1361 + * 重试三次
  1362 + * @param apiUrl
  1363 + * @param json
  1364 + * @return
  1365 + */
  1366 + private String repeatPost(String apiUrl, Object json)
  1367 + {
  1368 + for (int i = 0; i <= 2; i++)
  1369 + {
  1370 + String result = HttpClientUtil.doPostSSL(apiUrl,json);
  1371 + if (result == null)
  1372 + {
  1373 + try{
  1374 + Thread.sleep(1000);
  1375 + }
  1376 + catch (Exception e){
  1377 + }
  1378 + continue;
  1379 + }
  1380 + else
  1381 + {
  1382 + return result;
  1383 + }
  1384 + }
  1385 + return null;
1357 1386 }
1358 1387  
1359 1388 /**
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java View file @ f2fc70e
... ... @@ -170,7 +170,9 @@
170 170  
171 171 archives.setHusband_village(lhxfyService.getPreeugenicsAddr(baseModel.getHusbandAccountStreet()));// 丈夫户口村级区划
172 172 archives.setZipCode(StringUtils.isNotEmpty(baseModel.getWifeZipCode())?baseModel.getWifeZipCode():"000000");// 妻子邮编
173   - archives.setMarriageTime(DateUtil.getyyyy_MM_dd(baseModel.getMarriageTime()));// 结婚时间
  173 + archives.setMarriageTime(baseModel.getMarriageTime() == null ? DateUtil.getyyyy_MM_dd(baseModel.getFillDate()) : DateUtil.getyyyy_MM_dd(baseModel.getMarriageTime()));// 结婚时间
  174 +
  175 +
174 176 //隶属单位 村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227
175 177 archives.setSubUnitsVillage(baseModel.getSubUnitsVillage());
176 178 archives.setMarriageTypeCode(null);// 婚姻状态01：初婚 02：再婚 03：复婚(系统没有具体选项)
... ... @@ -971,8 +973,8 @@
971 973 physiqueCheck.setLimbSpinal(((List<Object>)baseInfo.get("szjz")).get(1).toString());// 四肢脊柱异常详情
972 974 physiqueCheck.setPhysicalCheckOther(null!=baseInfo.get("othermsg")?baseInfo.get("othermsg").toString():null);// 体格检查其他
973 975 physiqueCheck.setPhysicalCheckDate(baseInfo.get("checkDate").toString());// 体格检查日期
974   - Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("checkDoctor").toString()));
975   - physiqueCheck.setPhysicalCheckDoctor(users.getName());// 医生签名
  976 + Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString()));
  977 + physiqueCheck.setPhysicalCheckDoctor(users1.getName());// 医生签名
976 978 physiqueCheck.setGynaecology("02");// 是否参加妇科检查/男科检查 01：否 0
977 979 physiqueCheck.setExistContent(null);// 不参加妇科/男科检查的原因(系统没有字段)
978 980 physiqueCheck.setPubicHairType(((List<Object>)baseInfo.get("yinmao")).get(0).toString().equals("0")?"01":"02");//阴毛 01：正常 02：异常
... ... @@ -980,7 +982,7 @@
980 982 physiqueCheck.setIsPection("0");// 数据是否同步到婚检1：是 2：否(需求默认0)
981 983 physiqueCheck.setSexCheckOther(baseInfo.get("othermsg1").toString());// 其他
982 984 physiqueCheck.setSexCheckDate(baseInfo.get("fillDate").toString());// 检查日期
983   - Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString()));
  985 +
984 986 physiqueCheck.setSexCheckDoctor(users1.getName());// 医生签名
985 987 return JsonUtil.obj2Str(physiqueCheck);
986 988 }