jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7d18517dbb492e4c4936a80a9e9ba5416960537f

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

update

Showing 2 changed files with 38 additions and 28 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ 7d18517
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.biz.service.BasicConfigService;
5 5 import com.lyms.platform.biz.service.ResidentsArchiveService;
6 6 import com.lyms.platform.common.enums.YnEnums;
  7 +import com.lyms.platform.common.result.BaseResponse;
7 8 import com.lyms.platform.common.utils.*;
8 9 import com.lyms.platform.common.utils.HttpClientUtil;
9 10 import com.lyms.platform.operate.web.utils.*;
... ... @@ -14,6 +15,7 @@
14 15 import com.lyms.platform.query.ResidentsArchiveQuery;
15 16 import net.sf.json.JSONObject;
16 17 import org.apache.commons.collections.CollectionUtils;
  18 +import org.apache.log4j.Logger;
17 19 import org.apache.xmlbeans.impl.jam.mutable.MPackage;
18 20 import org.dom4j.Document;
19 21 import org.dom4j.DocumentHelper;
... ... @@ -951,7 +953,7 @@
951 953 */
952 954 private static final String URL = "http://39.101.222.193:8088";//测试
953 955 private static final String KEY = "87efab891326498abdfdfca6f9490ded";//沧州测试key
954   - public void uploadingProvince(List<String> ids){
  956 + public BaseResponse uploadingProvince(List<String> ids){
955 957 Query query = new Query();
956 958 //指定ID上传。
957 959 query.addCriteria(Criteria.where("id").in(ids));
... ... @@ -993,7 +995,7 @@
993 995 Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
994 996 Update update3 = new Update().set("isUploadingYn.general"+i,0);//男
995 997 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
996   - LogUtil.taskInfo("孕前一般情况4.3,（男）没有录入数据略过。");
  998 + LogUtil.taskInfo("孕前一般情况4.3,（男）没有录入数据略过。"+preEugenicsBaseModel.getId());
997 999 break;
998 1000 }
999 1001 } else {
... ... @@ -1004,7 +1006,7 @@
1004 1006 Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1005 1007 Update update3 = new Update().set("isUploadingYn.general"+i,0);//女
1006 1008 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
1007   - LogUtil.taskInfo("孕前一般情况4.3,（女）没有录入数据略过。");
  1009 + LogUtil.taskInfo("孕前一般情况4.3,（女）没有录入数据略过。"+preEugenicsBaseModel.getId());
1008 1010 break;
1009 1011 }
1010 1012 }
1011 1013  
1012 1014  
... ... @@ -1022,21 +1024,21 @@
1022 1024 Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1023 1025 Update update3 = new Update().set("isUploadingYn.general" + i, 0);//失败。general1：男，general2：女
1024 1026 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
1025   - LogUtil.error("服务器返回：上传失败，list3。code:"
  1027 + LogUtil.error("服务器返回：上传失败，list3:"+preEugenicsBaseModel.getId()+";code:"
1026 1028 + list3.get(0).getCode() + ";msg:" + list3.get(0).getMsg() + ";type:" + list3.get(0).getType(), null);
1027 1029 }
1028 1030 } else {
1029 1031 Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1030 1032 Update update3 = new Update().set("isUploadingYn.general" + i, 0);//失败。general1：男，general2：女
1031 1033 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
1032   - LogUtil.taskError("上传异常：result3=HttpClientUtil.doWebServicePost", null);
  1034 + LogUtil.error("上传异常：result3=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), null);
1033 1035 }
1034 1036 }
1035 1037 }else{
1036 1038 Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1037 1039 Update update3 = new Update().set("isUploadingYn.general1", 0).set("isUploadingYn.general2",0);//男和女
1038 1040 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class);
1039   - LogUtil.taskError("孕前一般情况4.3,男女没有录入数据略过。",null);
  1041 + LogUtil.error("孕前一般情况4.3,男女没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
1040 1042 }
1041 1043 //上传孕前体格检查4.4
1042 1044 if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()||!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) {
... ... @@ -1049,7 +1051,7 @@
1049 1051 Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1050 1052 Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//男
1051 1053 mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
1052   - LogUtil.taskInfo("孕前体格检查4.4,（男）没有录入数据略过。");
  1054 + LogUtil.taskInfo("孕前体格检查4.4,（男）没有录入数据略过。"+preEugenicsBaseModel.getId());
1053 1055 break;
1054 1056 }
1055 1057 } else {
... ... @@ -1060,7 +1062,7 @@
1060 1062 Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1061 1063 Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//女
1062 1064 mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
1063   - LogUtil.taskInfo("孕前体格检查4.4,（女）没有录入数据略过。");
  1065 + LogUtil.taskInfo("孕前体格检查4.4,（女）没有录入数据略过。"+preEugenicsBaseModel.getId());
1064 1066 break;
1065 1067 }
1066 1068 }
1067 1069  
1068 1070  
... ... @@ -1077,21 +1079,21 @@
1077 1079 Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1078 1080 Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败
1079 1081 mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
1080   - LogUtil.error("服务器返回：上传失败，list4。code:"
  1082 + LogUtil.error("服务器返回：上传失败，list4:"+preEugenicsBaseModel.getId()+";code:"
1081 1083 + list4.get(0).getCode() + ";msg:" + list4.get(0).getMsg() + ";type:" + list4.get(0).getType(), null);
1082 1084 }
1083 1085 } else {
1084 1086 Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1085 1087 Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败
1086 1088 mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
1087   - LogUtil.taskError("上传异常：result4=HttpClientUtil.doWebServicePost", null);
  1089 + LogUtil.error("上传异常：result4=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), null);
1088 1090 }
1089 1091 }
1090 1092 }else {
1091 1093 Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1092 1094 Update update4 = new Update().set("isUploadingYn.physiqueCheck1", 0).set("isUploadingYn.physiqueCheckl2",0);//男和女
1093 1095 mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class);
1094   - LogUtil.taskError("孕前体格检查4.4,男女没有录入数据略过。",null);
  1096 + LogUtil.error("孕前体格检查4.4,男女没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
1095 1097 }
1096 1098 //上传孕前临床检验4.5
1097 1099 if(!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()||!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) {
... ... @@ -1104,7 +1106,7 @@
1104 1106 Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1105 1107 Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//男
1106 1108 mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
1107   - LogUtil.taskInfo("孕前临床检验4.5,（男）没有录入数据略过。");
  1109 + LogUtil.taskInfo("孕前临床检验4.5,（男）没有录入数据略过。"+preEugenicsBaseModel.getId());
1108 1110 break;
1109 1111 }
1110 1112 } else {
... ... @@ -1115,7 +1117,7 @@
1115 1117 Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1116 1118 Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//女
1117 1119 mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
1118   - LogUtil.taskInfo("孕前临床检验4.5,（女）没有录入数据略过。");
  1120 + LogUtil.taskInfo("孕前临床检验4.5,（女）没有录入数据略过。"+preEugenicsBaseModel.getId());
1119 1121 break;
1120 1122 }
1121 1123 }
1122 1124  
1123 1125  
... ... @@ -1132,21 +1134,21 @@
1132 1134 Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1133 1135 Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败
1134 1136 mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
1135   - LogUtil.error("服务器返回：上传失败，list5。code:"
  1137 + LogUtil.error("服务器返回：上传失败，list5:"+preEugenicsBaseModel.getId()+";code:"
1136 1138 + list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg() + ";type:" + list5.get(0).getType(), null);
1137 1139 }
1138 1140 } else {
1139 1141 Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1140 1142 Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败
1141 1143 mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
1142   - LogUtil.taskError("上传异常：result5=HttpClientUtil.doWebServicePost", null);
  1144 + LogUtil.error("上传异常：result5=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), null);
1143 1145 }
1144 1146 }
1145 1147 }else {
1146 1148 Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1147 1149 Update update5 = new Update().set("isUploadingYn.clinicalCheck1", 0).set("isUploadingYn.clinicalCheck2",0);//男和女
1148 1150 mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class);
1149   - LogUtil.taskError("孕前临床检验4.5,男女没有录入数据略过。",null);
  1151 + LogUtil.error("孕前临床检验4.5,男女没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
1150 1152 }
1151 1153 //上传孕前妇科B超检查4.6
1152 1154 if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) {
1153 1155  
1154 1156  
... ... @@ -1163,20 +1165,20 @@
1163 1165 Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1164 1166 Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败
1165 1167 mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class);
1166   - LogUtil.error("服务器返回：上传失败，list6。code:"
  1168 + LogUtil.error("服务器返回：上传失败，list6:"+preEugenicsBaseModel.getId()+";code:"
1167 1169 + list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg() + ";type:" + list6.get(0).getType(), null);
1168 1170 }
1169 1171 } else {
1170 1172 Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1171 1173 Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败
1172 1174 mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class);
1173   - LogUtil.taskError("上传异常：result6=HttpClientUtil.doWebServicePost", null);
  1175 + LogUtil.error("上传异常：result6=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(), null);
1174 1176 }
1175 1177 }else {
1176 1178 Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1177 1179 Update update6 = new Update().set("isUploadingYn.bCheck", 0);//未录入
1178 1180 mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class);
1179   - LogUtil.taskError("孕前妇科B超检查4.6,没有录入数据略过。",null);
  1181 + LogUtil.error("孕前妇科B超检查4.6,没有录入数据略过。"+preEugenicsBaseModel.getId(),null);
1180 1182 }
1181 1183 //上传孕前检查结果及评估建议4.7
1182 1184 String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment")
1183 1185  
... ... @@ -1192,14 +1194,14 @@
1192 1194 Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1193 1195 Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败
1194 1196 mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class);
1195   - LogUtil.error("服务器返回：上传失败，list7。code:"
  1197 + LogUtil.error("服务器返回：上传失败，list7"+preEugenicsBaseModel.getId()+";code:"
1196 1198 +list7.get(0).getCode()+";msg:"+list7.get(0).getMsg()+";type:"+list7.get(0).getType(),null);
1197 1199 }
1198 1200 }else {
1199 1201 Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1200 1202 Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败
1201 1203 mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class);
1202   - LogUtil.taskError("上传异常：result7=HttpClientUtil.doWebServicePost",null);
  1204 + LogUtil.error("上传异常：result7=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
1203 1205 }
1204 1206 //上传孕前早孕随访4.8
1205 1207 /*String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow")
1206 1208  
... ... @@ -1215,14 +1217,14 @@
1215 1217 Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1216 1218 Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败
1217 1219 mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class);
1218   - LogUtil.error("服务器返回：上传失败，list8。code:"
  1220 + LogUtil.error("服务器返回：上传失败，list8"+preEugenicsBaseModel.getId()+";code:"
1219 1221 +list8.get(0).getCode()+";msg:"+list8.get(0).getMsg()+";type:"+list8.get(0).getType(),null);
1220 1222 }
1221 1223 }else {
1222 1224 Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1223 1225 Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败
1224 1226 mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class);
1225   - LogUtil.taskError("上传异常：result8=HttpClientUtil.doWebServicePost",null);
  1227 + LogUtil.error("上传异常：result8=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
1226 1228 }*/
1227 1229 //上传孕前妊娠结局4.9
1228 1230 /*String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome")
1229 1231  
1230 1232  
1231 1233  
... ... @@ -1238,28 +1240,28 @@
1238 1240 Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1239 1241 Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败
1240 1242 mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class);
1241   - LogUtil.error("服务器返回：上传失败，list8。code:"
  1243 + LogUtil.error("服务器返回：上传失败，list8"+preEugenicsBaseModel.getId()+";code:"
1242 1244 +list9.get(0).getCode()+";msg:"+list9.get(0).getMsg()+";type:"+list9.get(0).getType(),null);
1243 1245 }
1244 1246 }else {
1245 1247 Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1246 1248 Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败
1247 1249 mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class);
1248   - LogUtil.taskError("上传异常：result9=HttpClientUtil.doWebServicePost",null);
  1250 + LogUtil.error("上传异常：result9=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
1249 1251 }*/
1250 1252  
1251 1253 }else {
1252 1254 Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1253 1255 Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败
1254 1256 mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class);
1255   - LogUtil.taskError("服务器返回：上传失败，list1。code:"
  1257 + LogUtil.error("服务器返回：上传失败，list1"+preEugenicsBaseModel.getId()+";code:"
1256 1258 +list1.get(0).getCode()+";msg:"+list1.get(0).getMsg()+";type:"+list1.get(0).getType(),null);
1257 1259 }
1258 1260 }else {
1259 1261 Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1260 1262 Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败
1261 1263 mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class);
1262   - LogUtil.taskError("上传异常：result1=HttpClientUtil.doWebServicePost",null);
  1264 + LogUtil.error("上传异常：result1=HttpClientUtil.doWebServicePost:"+preEugenicsBaseModel.getId(),null);
1263 1265 }
1264 1266 //整个上传结果更新到结果字段
1265 1267 PreEugenicsBaseModel model= mongoTemplate.findById(preEugenicsBaseModel.getId(), PreEugenicsBaseModel.class);
... ... @@ -1292,6 +1294,9 @@
1292 1294 mongoTemplate.updateFirst(baseQuery, update, PreEugenicsBaseModel.class);
1293 1295 }
1294 1296 }
  1297 + BaseResponse baseResponse=new BaseResponse();
  1298 +// baseResponse.setObject(Logger.getLogger("task"));
  1299 + return baseResponse;
1295 1300 }
1296 1301  
1297 1302 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ 7d18517
... ... @@ -369,7 +369,12 @@
369 369 }
370 370 Integer isUploadingProvince = param.getIsUploadingProvince();
371 371 if (isUploadingProvince != null) {
372   - query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince));
  372 + if(isUploadingProvince==1){//已上传
  373 + query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince));
  374 + }else {//未上传
  375 + query.addCriteria(Criteria.where("isUploadingProvince").is(isUploadingProvince).orOperator(Criteria.where("isUploadingProvince").exists(false)));
  376 + }
  377 +
373 378 }
374 379  
375 380 query = getQueryByAddress(param, searchType, query);