jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a82d69e79d27a7731152675affe9a7f7db5e6ae3

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

update

Showing 2 changed files with 33 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ a82d69e
... ... @@ -955,9 +955,9 @@
955 955 private static final String KEY = "27d7bc6992724608bbfa0775a31c4b38";//沧州测试key
956 956 public BaseResponse uploadingProvince(List<String> ids){
957 957 BaseResponse baseResponse=new BaseResponse();
958   - baseResponse.setErrormsg(ids.get(0).toString());
  958 + List<String> baseResponseList=new ArrayList<>();
959 959 Query query = new Query();
960   - //指定ID上传。
  960 + //批量ID上传。
961 961 query.addCriteria(Criteria.where("id").in(ids));
962 962 List <PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class);
963 963 for (PreEugenicsBaseModel preEugenicsBaseModel : preEugenicsBaseModels) {
... ... @@ -1001,7 +1001,8 @@
1001 1001 Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1002 1002 Update update3 = new Update().set("isUploadingYn.general"+i,0);//男
1003 1003 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
1004   - LogUtil.taskInfo("孕前一般情况4.3,（男）没有录入数据略过。"+preEugenicsBaseModel.getId());
  1004 + LogUtil.taskInfo("孕前一般情况,（男）没有录入数据请补全!"+preEugenicsBaseModel.getId());
  1005 + baseResponseList.add("孕前一般情况,（男）没有录入数据请补全!"+preEugenicsBaseModel.getHusbandName());
1005 1006 break;
1006 1007 }
1007 1008 } else {
... ... @@ -1013,6 +1014,7 @@
1013 1014 Update update3 = new Update().set("isUploadingYn.general"+i,0);//女
1014 1015 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
1015 1016 LogUtil.taskInfo("孕前一般情况4.3,（女）没有录入数据略过。"+preEugenicsBaseModel.getId());
  1017 + baseResponseList.add("孕前一般情况,（女）没有录入数据请补全!"+preEugenicsBaseModel.getWifeName());
1016 1018 break;
1017 1019 }
1018 1020 }
1019 1021  
... ... @@ -1032,12 +1034,15 @@
1032 1034 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
1033 1035 LogUtil.error("服务器返回：上传失败，list3:"+preEugenicsBaseModel.getId()+";code:"
1034 1036 + list3.get(0).getCode() + ";msg:" + list3.get(0).getMsg() + ";type:" + list3.get(0).getType(), null);
  1037 + baseResponseList.add("code:" + list3.get(0).getCode() + ";msg:" + list3.get(0).getMsg()
  1038 + + ";type:" + list3.get(0).getType()+";"+preEugenicsBaseModel.getId());
1035 1039 }
1036 1040 } else {
1037 1041 Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1038 1042 Update update3 = new Update().set("isUploadingYn.general" + i, 0);//失败。general1：男，general2：女
1039 1043 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
1040 1044 LogUtil.error("上传异常：result3=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), null);
  1045 + baseResponseList.add("上传异常：result3:null;"+preEugenicsBaseModel.getId());
1041 1046 }
1042 1047 }
1043 1048 }else{
... ... @@ -1045,6 +1050,7 @@
1045 1050 Update update3 = new Update().set("isUploadingYn.general1", 0).set("isUploadingYn.general2",0);//男和女
1046 1051 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
1047 1052 LogUtil.error("孕前一般情况4.3,男女没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
  1053 + baseResponseList.add("孕前一般情况,男女没有录入数据，请完善数据。"+preEugenicsBaseModel.getWifeName()+";"+preEugenicsBaseModel.getHusbandName());
1048 1054 }
1049 1055 //上传孕前体格检查4.4
1050 1056 if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()||!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) {
... ... @@ -1058,6 +1064,7 @@
1058 1064 Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//男
1059 1065 mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
1060 1066 LogUtil.taskInfo("孕前体格检查4.4,（男）没有录入数据略过。"+preEugenicsBaseModel.getId());
  1067 + baseResponseList.add("孕前体格检查,（男）没有录入数据请完善数据。"+preEugenicsBaseModel.getHusbandName());
1061 1068 break;
1062 1069 }
1063 1070 } else {
... ... @@ -1069,6 +1076,7 @@
1069 1076 Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//女
1070 1077 mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
1071 1078 LogUtil.taskInfo("孕前体格检查4.4,（女）没有录入数据略过。"+preEugenicsBaseModel.getId());
  1079 + baseResponseList.add("孕前体格检查,（女）没有录入数据请完善数据。"+preEugenicsBaseModel.getWifeName());
1072 1080 break;
1073 1081 }
1074 1082 }
1075 1083  
... ... @@ -1088,12 +1096,15 @@
1088 1096 mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
1089 1097 LogUtil.error("服务器返回：上传失败，list4:"+preEugenicsBaseModel.getId()+";code:"
1090 1098 + list4.get(0).getCode() + ";msg:" + list4.get(0).getMsg() + ";type:" + list4.get(0).getType(), null);
  1099 + baseResponseList.add("code:" + list4.get(0).getCode() + ";msg:" + list4.get(0).getMsg()
  1100 + + ";type:" + list4.get(0).getType()+";"+preEugenicsBaseModel.getId());
1091 1101 }
1092 1102 } else {
1093 1103 Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1094 1104 Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败
1095 1105 mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
1096 1106 LogUtil.error("上传异常：result4=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), null);
  1107 + baseResponseList.add("上传异常：result4:null;"+preEugenicsBaseModel.getId());
1097 1108 }
1098 1109 }
1099 1110 }else {
... ... @@ -1101,6 +1112,7 @@
1101 1112 Update update4 = new Update().set("isUploadingYn.physiqueCheck1", 0).set("isUploadingYn.physiqueCheckl2",0);//男和女
1102 1113 mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
1103 1114 LogUtil.error("孕前体格检查4.4,男女没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
  1115 + baseResponseList.add("孕前体格检查,男女没有录入数据，请完善数据。"+preEugenicsBaseModel.getWifeName()+";"+preEugenicsBaseModel.getHusbandName());
1104 1116 }
1105 1117 //上传孕前临床检验4.5
1106 1118 if(!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()||!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) {
... ... @@ -1114,6 +1126,7 @@
1114 1126 Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//男
1115 1127 mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
1116 1128 LogUtil.taskInfo("孕前临床检验4.5,（男）没有录入数据略过。"+preEugenicsBaseModel.getId());
  1129 + baseResponseList.add("孕前临床检验,（男）没有录入数据请完善数据。"+preEugenicsBaseModel.getHusbandName());
1117 1130 break;
1118 1131 }
1119 1132 } else {
... ... @@ -1125,6 +1138,7 @@
1125 1138 Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//女
1126 1139 mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
1127 1140 LogUtil.taskInfo("孕前临床检验4.5,（女）没有录入数据略过。"+preEugenicsBaseModel.getId());
  1141 + baseResponseList.add("孕前临床检验,（女）没有录入数据请完善数据。"+preEugenicsBaseModel.getWifeName());
1128 1142 break;
1129 1143 }
1130 1144 }
1131 1145  
... ... @@ -1144,12 +1158,15 @@
1144 1158 mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
1145 1159 LogUtil.error("服务器返回：上传失败，list5:"+preEugenicsBaseModel.getId()+";code:"
1146 1160 + list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg() + ";type:" + list5.get(0).getType(), null);
  1161 + baseResponseList.add(";code:"+ list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg()
  1162 + + ";type:" + list5.get(0).getType()+";"+preEugenicsBaseModel.getId());
1147 1163 }
1148 1164 } else {
1149 1165 Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1150 1166 Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败
1151 1167 mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
1152 1168 LogUtil.error("上传异常：result5=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), null);
  1169 + baseResponseList.add("上传异常：result5:null;"+preEugenicsBaseModel.getId());
1153 1170 }
1154 1171 }
1155 1172 }else {
... ... @@ -1157,6 +1174,7 @@
1157 1174 Update update5 = new Update().set("isUploadingYn.clinicalCheck1", 0).set("isUploadingYn.clinicalCheck2",0);//男和女
1158 1175 mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
1159 1176 LogUtil.error("孕前临床检验4.5,男女没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
  1177 + baseResponseList.add("孕前临床检验,男女没有录入数据，请完善数据。"+preEugenicsBaseModel.getWifeName()+";"+preEugenicsBaseModel.getHusbandName());
1160 1178 }
1161 1179 //上传孕前妇科B超检查4.6
1162 1180 if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) {
1163 1181  
1164 1182  
... ... @@ -1175,18 +1193,22 @@
1175 1193 mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class);
1176 1194 LogUtil.error("服务器返回：上传失败，list6:"+preEugenicsBaseModel.getId()+";code:"
1177 1195 + list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg() + ";type:" + list6.get(0).getType(), null);
  1196 + baseResponseList.add(";code:"+ list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg()
  1197 + + ";type:" + list6.get(0).getType()+";"+preEugenicsBaseModel.getId());
1178 1198 }
1179 1199 } else {
1180 1200 Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1181 1201 Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败
1182 1202 mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class);
1183 1203 LogUtil.error("上传异常：result6=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), null);
  1204 + baseResponseList.add("上传异常：result6:null;"+preEugenicsBaseModel.getId());
1184 1205 }
1185 1206 }else {
1186 1207 Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1187 1208 Update update6 = new Update().set("isUploadingYn.bCheck", 0);//未录入
1188 1209 mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class);
1189 1210 LogUtil.error("孕前妇科B超检查4.6,没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
  1211 + baseResponseList.add("孕前妇科B超检查,（女）没有录入数据请完善数据。"+preEugenicsBaseModel.getWifeName());
1190 1212 }
1191 1213 //上传孕前检查结果及评估建议4.7
1192 1214 String result7=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalAssessment")
1193 1215  
... ... @@ -1204,12 +1226,15 @@
1204 1226 mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class);
1205 1227 LogUtil.error("服务器返回：上传失败，list7:"+preEugenicsBaseModel.getId()+";code:"
1206 1228 +list7.get(0).getCode()+";msg:"+list7.get(0).getMsg()+";type:"+list7.get(0).getType(),null);
  1229 + baseResponseList.add(";code:"+ list7.get(0).getCode() + ";msg:" + list7.get(0).getMsg()
  1230 + + ";type:" + list7.get(0).getType()+";"+preEugenicsBaseModel.getId());
1207 1231 }
1208 1232 }else {
1209 1233 Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1210 1234 Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败
1211 1235 mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class);
1212 1236 LogUtil.error("上传异常：result7=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
  1237 + baseResponseList.add("上传异常：result7:null;"+preEugenicsBaseModel.getId());
1213 1238 }
1214 1239 //上传孕前早孕随访4.8
1215 1240 /*String result8=HttpClientUtil.doPostSSL((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow")
1216 1241  
... ... @@ -1264,12 +1289,15 @@
1264 1289 mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class);
1265 1290 LogUtil.error("服务器返回：上传失败，list1:"+preEugenicsBaseModel.getId()+";code:"
1266 1291 +list1.get(0).getCode()+";msg:"+list1.get(0).getMsg()+";type:"+list1.get(0).getType(),null);
  1292 + baseResponseList.add(";code:"+ list1.get(0).getCode() + ";msg:" + list1.get(0).getMsg()
  1293 + + ";type:" + list1.get(0).getType()+";"+preEugenicsBaseModel.getId());
1267 1294 }
1268 1295 }else {
1269 1296 Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1270 1297 Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败
1271 1298 mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class);
1272 1299 LogUtil.error("上传异常：result1=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
  1300 + baseResponseList.add("上传异常：result1:null;"+preEugenicsBaseModel.getId());
1273 1301 }
1274 1302 //整个上传结果更新到结果字段
1275 1303 PreEugenicsBaseModel model= mongoTemplate.findById(preEugenicsBaseModel.getId(), PreEugenicsBaseModel.class);
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java View file @ a82d69e
... ... @@ -118,7 +118,7 @@
118 118 //妻子现住址村级区划（只传街道id）
119 119 archives.setWife_current_village(lhxfyService.getPreeugenicsAddr(baseModel.getWifeCurrentStreet()));
120 120 //妻子户口村级区划（只传街道id）
121   - archives.setWife_regist_village(lhxfyService.getPreeugenicsAddr(baseModel.getWifeCurrentStreet()));
  121 + archives.setWife_regist_village(lhxfyService.getPreeugenicsAddr(baseModel.getWifeAccountStreet()));
122 122 archives.setHusbandName(baseModel.getHusbandName());// 丈夫姓名
123 123 archives.setHusbandTelephone(baseModel.getHusbandPhone());// 丈夫联系电话
124 124 archives.setHusbandAge(baseModel.getHusbandAge());// 丈夫年龄
... ... @@ -181,7 +181,7 @@
181 181 archives.setHusbandResidentialCategory("01");//丈夫居住类 01 本地 02 非本地居住一年以 03 非本地居住一年以上（系统没有字段必填默认01）
182 182 archives.setWifeWorkUnit(null);// 妻子工作单位(系统没有具体选项)
183 183 archives.setWifeResidentialCategory("01");//妻子居住类 01 本地 02 非本地居住一年以 03 非本地居住一年以上（系统没有字段必填默认01）
184   - archives.setHusbandAddressVillage(lhxfyService.getPreeugenicsAddr(baseModel.getHusbandAccountStreet()));// 丈夫现住址村级区划（只传街道id）
  184 + archives.setHusbandAddressVillage(lhxfyService.getPreeugenicsAddr(baseModel.getWifeCurrentStreet()));// 丈夫现住址村级区划（只传街道id，需求传入妻子的现住址）
185 185 switch (baseModel.getHasSignBook()){
186 186 case "1":
187 187 baseModel.setHasSignBook("02");