Commit c88091e8a5b11297c0b22b66d90fc35f73e84af9
1 parent
0c52039bf4
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 14 additions and 14 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
View file @
c88091e
| ... | ... | @@ -975,7 +975,7 @@ |
| 975 | 975 | LogUtil.taskInfo("孕前档案基本信息上传成功"); |
| 976 | 976 | //上传孕前一般情况4.3 |
| 977 | 977 | String result3=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadGeneralSituation") |
| 978 | - ,lhxfyUploadingProvince.uploadingProvinceGeneral(preEugenicsBaseModel,documentId)); | |
| 978 | + ,lhxfyUploadingProvince.uploadingProvinceGeneral(preEugenicsBaseModel,KEY,documentId)); | |
| 979 | 979 | if(StringUtils.isNotEmpty(result3)){ |
| 980 | 980 | List<UploadResult> list3=JsonUtil.jsonToList(result3, UploadResult.class); |
| 981 | 981 | if("0000".equals(list3.get(0).getCode())){ |
| ... | ... | @@ -998,7 +998,7 @@ |
| 998 | 998 | } |
| 999 | 999 | //上传孕前体格检查4.4 |
| 1000 | 1000 | String result4=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadPhysicalExamination") |
| 1001 | - ,lhxfyUploadingProvince.uploadingProvincePhysiqueCheck(preEugenicsBaseModel,documentId)); | |
| 1001 | + ,lhxfyUploadingProvince.uploadingProvincePhysiqueCheck(preEugenicsBaseModel,KEY,documentId)); | |
| 1002 | 1002 | if(StringUtils.isNotEmpty(result4)){ |
| 1003 | 1003 | List<UploadResult> list4=JsonUtil.jsonToList(result4, UploadResult.class); |
| 1004 | 1004 | if("0000".equals(list4.get(0).getCode())){ |
| ... | ... | @@ -1021,7 +1021,7 @@ |
| 1021 | 1021 | } |
| 1022 | 1022 | //上传孕前临床检验4.5 |
| 1023 | 1023 | String result5=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalClinicalTest") |
| 1024 | - ,lhxfyUploadingProvince.uploadingProvinceClinicalCheck(preEugenicsBaseModel,documentId)); | |
| 1024 | + ,lhxfyUploadingProvince.uploadingProvinceClinicalCheck(preEugenicsBaseModel,KEY,documentId)); | |
| 1025 | 1025 | if(StringUtils.isNotEmpty(result5)){ |
| 1026 | 1026 | List<UploadResult> list5=JsonUtil.jsonToList(result5, UploadResult.class); |
| 1027 | 1027 | if("0000".equals(list5.get(0).getCode())){ |
| ... | ... | @@ -1044,7 +1044,7 @@ |
| 1044 | 1044 | } |
| 1045 | 1045 | //上传孕前妇科B超检查4.6 |
| 1046 | 1046 | String result6=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadGynecologicalBscan") |
| 1047 | - ,lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel,documentId)); | |
| 1047 | + ,lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel,KEY,documentId)); | |
| 1048 | 1048 | if(StringUtils.isNotEmpty(result6)){ |
| 1049 | 1049 | List<UploadResult> list6=JsonUtil.jsonToList(result6, UploadResult.class); |
| 1050 | 1050 | if("0000".equals(list6.get(0).getCode())){ |
| ... | ... | @@ -1067,7 +1067,7 @@ |
| 1067 | 1067 | } |
| 1068 | 1068 | //上传孕前检查结果及评估建议4.7 |
| 1069 | 1069 | /*String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment") |
| 1070 | - ,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,documentId)); | |
| 1070 | + ,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,KEY,documentId)); | |
| 1071 | 1071 | if(StringUtils.isNotEmpty(result7)){ |
| 1072 | 1072 | List<UploadResult> list7=JsonUtil.jsonToList(result7, UploadResult.class); |
| 1073 | 1073 | if("0000".equals(list7.get(0).getCode())){ |
| ... | ... | @@ -1090,7 +1090,7 @@ |
| 1090 | 1090 | }*/ |
| 1091 | 1091 | //上传孕前早孕随访4.8 |
| 1092 | 1092 | /*String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow") |
| 1093 | - ,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,documentId)); | |
| 1093 | + ,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,KEY,documentId)); | |
| 1094 | 1094 | if(StringUtils.isNotEmpty(result8)){ |
| 1095 | 1095 | List<UploadResult> list8=JsonUtil.jsonToList(result8, UploadResult.class); |
| 1096 | 1096 | if("0000".equals(list8.get(0).getCode())){ |
| ... | ... | @@ -1113,7 +1113,7 @@ |
| 1113 | 1113 | }*/ |
| 1114 | 1114 | //上传孕前妊娠结局4.9 |
| 1115 | 1115 | /*String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome") |
| 1116 | - ,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,documentId)); | |
| 1116 | + ,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,KEY,documentId)); | |
| 1117 | 1117 | if(StringUtils.isNotEmpty(result9)){ |
| 1118 | 1118 | List<UploadResult> list9=JsonUtil.jsonToList(result9, UploadResult.class); |
| 1119 | 1119 | if("0000".equals(list9.get(0).getCode())){ |
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java
View file @
c88091e
| ... | ... | @@ -171,7 +171,7 @@ |
| 171 | 171 | return JsonUtil.obj2Str(archives); |
| 172 | 172 | } |
| 173 | 173 | //上传孕前一般情况4.3 |
| 174 | - public String uploadingProvinceGeneral(PreEugenicsBaseModel baseModel,String documentId){ | |
| 174 | + public String uploadingProvinceGeneral(PreEugenicsBaseModel baseModel,String key,String documentId){ | |
| 175 | 175 | Map<String,Object> data=new HashMap<>(); |
| 176 | 176 | String json=""; |
| 177 | 177 | if (StringUtils.isNotEmpty(json)) |
| ... | ... | @@ -182,7 +182,7 @@ |
| 182 | 182 | return JsonUtil.obj2Str(data); |
| 183 | 183 | } |
| 184 | 184 | //上传孕前体格检查4.4 |
| 185 | - public String uploadingProvincePhysiqueCheck(PreEugenicsBaseModel baseModel,String documentId){ | |
| 185 | + public String uploadingProvincePhysiqueCheck(PreEugenicsBaseModel baseModel,String key,String documentId){ | |
| 186 | 186 | Map<String,Object> data=new HashMap<>(); |
| 187 | 187 | String json=""; |
| 188 | 188 | if (StringUtils.isNotEmpty(json)) |
| ... | ... | @@ -193,7 +193,7 @@ |
| 193 | 193 | return JsonUtil.obj2Str(data); |
| 194 | 194 | } |
| 195 | 195 | //上传孕前临床检验4.5 |
| 196 | - public String uploadingProvinceClinicalCheck(PreEugenicsBaseModel baseModel,String documentId){ | |
| 196 | + public String uploadingProvinceClinicalCheck(PreEugenicsBaseModel baseModel,String key,String documentId){ | |
| 197 | 197 | Map<String,Object> data=new HashMap<>(); |
| 198 | 198 | String json=""; |
| 199 | 199 | if (StringUtils.isNotEmpty(json)) |
| ... | ... | @@ -204,7 +204,7 @@ |
| 204 | 204 | return JsonUtil.obj2Str(data); |
| 205 | 205 | } |
| 206 | 206 | //上传孕前妇科B超检查4.6 |
| 207 | - public String uploadingProvinceBCheck(PreEugenicsBaseModel baseModel,String documentId){ | |
| 207 | + public String uploadingProvinceBCheck(PreEugenicsBaseModel baseModel,String key,String documentId){ | |
| 208 | 208 | Map<String,Object> data=new HashMap<>(); |
| 209 | 209 | String json=""; |
| 210 | 210 | if (StringUtils.isNotEmpty(json)) |
| ... | ... | @@ -215,7 +215,7 @@ |
| 215 | 215 | return JsonUtil.obj2Str(data); |
| 216 | 216 | } |
| 217 | 217 | //上传孕前检查结果及评估建议4.7 |
| 218 | - public String uploadingProvinceResultAdvice(PreEugenicsBaseModel baseModel,String documentId){ | |
| 218 | + public String uploadingProvinceResultAdvice(PreEugenicsBaseModel baseModel,String key,String documentId){ | |
| 219 | 219 | Map<String,Object> data=new HashMap<>(); |
| 220 | 220 | String json=""; |
| 221 | 221 | if (StringUtils.isNotEmpty(json)) |
| ... | ... | @@ -226,7 +226,7 @@ |
| 226 | 226 | return JsonUtil.obj2Str(data); |
| 227 | 227 | } |
| 228 | 228 | //上传孕前早孕随访4.8 |
| 229 | - public String uploadingProvincePregnancyFollowTab(PreEugenicsBaseModel baseModel,String documentId){ | |
| 229 | + public String uploadingProvincePregnancyFollowTab(PreEugenicsBaseModel baseModel,String key,String documentId){ | |
| 230 | 230 | Map<String,Object> data=new HashMap<>(); |
| 231 | 231 | String json=""; |
| 232 | 232 | if (StringUtils.isNotEmpty(json)) |
| ... | ... | @@ -237,7 +237,7 @@ |
| 237 | 237 | return JsonUtil.obj2Str(data); |
| 238 | 238 | } |
| 239 | 239 | //上传孕前妊娠结局4.9 |
| 240 | - public String uploadingProvinceGravidityEndingTab(PreEugenicsBaseModel baseModel,String documentId){ | |
| 240 | + public String uploadingProvinceGravidityEndingTab(PreEugenicsBaseModel baseModel,String key,String documentId){ | |
| 241 | 241 | Map<String,Object> data=new HashMap<>(); |
| 242 | 242 | String json=""; |
| 243 | 243 | if (StringUtils.isNotEmpty(json)) |