Commit 53e1c4cd964bc039a0eac92be4f758ef735420bd
1 parent
6ff48a490f
Exists in
master
and in
6 other branches
上传孕前4.4/4.5/4.6判断空
Showing 2 changed files with 142 additions and 52 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
View file @
53e1c4c
| ... | ... | @@ -978,19 +978,27 @@ |
| 978 | 978 | for (int i = 1; i <= 2; i++) {//男女分别上传 |
| 979 | 979 | if (i == 1) { |
| 980 | 980 | if(null!=preEugenicsBaseModel.getHusbandBaseInfo()) { |
| 981 | + //组装数据时区分男女 | |
| 981 | 982 | preEugenicsBaseModel.setHusbandBaseInfo(new HashMap<String, Object>() {{ |
| 982 | 983 | put("sex", "01"); |
| 983 | 984 | }}); |
| 984 | 985 | }else { |
| 986 | + Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 987 | + Update update3 = new Update().set("isUploadingYn.general"+i,0);//男 | |
| 988 | + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
| 985 | 989 | LogUtil.taskInfo("孕前一般情况4.3,（男）没有录入数据略过。"); |
| 986 | 990 | break; |
| 987 | 991 | } |
| 988 | 992 | } else { |
| 989 | 993 | if(null!=preEugenicsBaseModel.getWifeBaseInfo()) { |
| 994 | + //组装数据时区分男女 | |
| 990 | 995 | preEugenicsBaseModel.setWifeBaseInfo(new HashMap<String, Object>() {{ |
| 991 | 996 | put("sex", "02"); |
| 992 | 997 | }}); |
| 993 | 998 | }else { |
| 999 | + Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1000 | + Update update3 = new Update().set("isUploadingYn.general"+i,0);//女 | |
| 1001 | + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
| 994 | 1002 | LogUtil.taskInfo("孕前一般情况4.3,（女）没有录入数据略过。"); |
| 995 | 1003 | break; |
| 996 | 1004 | } |
| 997 | 1005 | |
| 998 | 1006 | |
| 999 | 1007 | |
| 1000 | 1008 | |
| 1001 | 1009 | |
| 1002 | 1010 | |
| 1003 | 1011 | |
| 1004 | 1012 | |
| 1005 | 1013 | |
| 1006 | 1014 | |
| 1007 | 1015 | |
| ... | ... | @@ -1019,76 +1027,158 @@ |
| 1019 | 1027 | } |
| 1020 | 1028 | } |
| 1021 | 1029 | }else{ |
| 1022 | - LogUtil.taskInfo("孕前一般情况4.3,没有录入数据略过。"); | |
| 1030 | + Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1031 | + Update update3 = new Update().set("isUploadingYn.general1", 0).set("isUploadingYn.general2",0);//男和女 | |
| 1032 | + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
| 1033 | + LogUtil.taskError("孕前一般情况4.3,男女没有录入数据略过。",null); | |
| 1023 | 1034 | } |
| 1024 | 1035 | //上传孕前体格检查4.4 |
| 1025 | - String result4=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadPhysicalExamination") | |
| 1026 | - ,lhxfyUploadingProvince.uploadingProvincePhysiqueCheck(preEugenicsBaseModel,KEY,documentId)); | |
| 1027 | - if(StringUtils.isNotEmpty(result4)){ | |
| 1028 | - List<UploadResult> list4=JsonUtil.jsonToList(result4, UploadResult.class); | |
| 1029 | - if("0000".equals(list4.get(0).getCode())){ | |
| 1030 | - Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1031 | - Update update4 = new Update().set("isUploadingYn.physiqueCheck", 1);//成功 | |
| 1032 | - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
| 1033 | - LogUtil.taskInfo("孕前体格检查上传成功"); | |
| 1034 | - }else { | |
| 1035 | - Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1036 | - Update update4 = new Update().set("isUploadingYn.physiqueCheck", 0);//失败 | |
| 1037 | - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
| 1038 | - LogUtil.error("服务器返回：上传失败，list3。code:" | |
| 1039 | - +list4.get(0).getCode()+";msg:"+list4.get(0).getMsg()+";type:"+list4.get(0).getType(),null); | |
| 1036 | + if(null!=preEugenicsBaseModel.getHusbandPhysiqueCheck()||null!=preEugenicsBaseModel.getWifePhysiqueCheck()) { | |
| 1037 | + for (int i = 1; i <= 2; i++) {//男女分别上传 | |
| 1038 | + if (i == 1) { | |
| 1039 | + if(null!=preEugenicsBaseModel.getHusbandPhysiqueCheck()) { | |
| 1040 | + //组装数据时区分男女 | |
| 1041 | + preEugenicsBaseModel.setHusbandPhysiqueCheck(new HashMap<String, Object>() {{ | |
| 1042 | + put("sex", "01"); | |
| 1043 | + }}); | |
| 1044 | + }else { | |
| 1045 | + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1046 | + Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//男 | |
| 1047 | + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
| 1048 | + LogUtil.taskInfo("孕前体格检查4.4,（男）没有录入数据略过。"); | |
| 1049 | + break; | |
| 1050 | + } | |
| 1051 | + } else { | |
| 1052 | + if(null!=preEugenicsBaseModel.getWifePhysiqueCheck()) { | |
| 1053 | + //组装数据时区分男女 | |
| 1054 | + preEugenicsBaseModel.setWifePhysiqueCheck(new HashMap<String, Object>() {{ | |
| 1055 | + put("sex", "02"); | |
| 1056 | + }}); | |
| 1057 | + }else { | |
| 1058 | + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1059 | + Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//女 | |
| 1060 | + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
| 1061 | + LogUtil.taskInfo("孕前体格检查4.4,（女）没有录入数据略过。"); | |
| 1062 | + break; | |
| 1063 | + } | |
| 1064 | + } | |
| 1065 | + String result4 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadPhysicalExamination") | |
| 1066 | + , lhxfyUploadingProvince.uploadingProvincePhysiqueCheck((i == 1) ? preEugenicsBaseModel.getHusbandPhysiqueCheck() : preEugenicsBaseModel.getWifePhysiqueCheck(), KEY, documentId)); | |
| 1067 | + if (StringUtils.isNotEmpty(result4)) { | |
| 1068 | + List<UploadResult> list4 = JsonUtil.jsonToList(result4, UploadResult.class); | |
| 1069 | + if ("0000".equals(list4.get(0).getCode())) { | |
| 1070 | + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1071 | + Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 1);//成功 | |
| 1072 | + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
| 1073 | + LogUtil.taskInfo("孕前体格检查上传成功"); | |
| 1074 | + } else { | |
| 1075 | + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1076 | + Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败 | |
| 1077 | + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
| 1078 | + LogUtil.error("服务器返回：上传失败，list4。code:" | |
| 1079 | + + list4.get(0).getCode() + ";msg:" + list4.get(0).getMsg() + ";type:" + list4.get(0).getType(), null); | |
| 1080 | + } | |
| 1081 | + } else { | |
| 1082 | + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1083 | + Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败 | |
| 1084 | + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
| 1085 | + LogUtil.taskError("上传异常：result4=HttpClientUtil.doWebServicePost", null); | |
| 1086 | + } | |
| 1040 | 1087 | } |
| 1041 | 1088 | }else { |
| 1042 | 1089 | Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
| 1043 | - Update update4 = new Update().set("isUploadingYn.physiqueCheck", 0);//失败 | |
| 1090 | + Update update4 = new Update().set("isUploadingYn.physiqueCheck1", 0).set("isUploadingYn.physiqueCheckl2",0);//男和女 | |
| 1044 | 1091 | mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); |
| 1045 | - LogUtil.taskError("上传异常：result4=HttpClientUtil.doWebServicePost",null); | |
| 1092 | + LogUtil.taskError("孕前体格检查4.4,男女没有录入数据略过。",null); | |
| 1046 | 1093 | } |
| 1047 | 1094 | //上传孕前临床检验4.5 |
| 1048 | - String result5=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalClinicalTest") | |
| 1049 | - ,lhxfyUploadingProvince.uploadingProvinceClinicalCheck(preEugenicsBaseModel,KEY,documentId)); | |
| 1050 | - if(StringUtils.isNotEmpty(result5)){ | |
| 1051 | - List<UploadResult> list5=JsonUtil.jsonToList(result5, UploadResult.class); | |
| 1052 | - if("0000".equals(list5.get(0).getCode())){ | |
| 1053 | - Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1054 | - Update update5 = new Update().set("isUploadingYn.clinicalCheck", 1);//成功 | |
| 1055 | - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
| 1056 | - LogUtil.taskInfo("孕前临床检验上传成功"); | |
| 1057 | - }else { | |
| 1058 | - Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1059 | - Update update5 = new Update().set("isUploadingYn.clinicalCheck", 0);//失败 | |
| 1060 | - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
| 1061 | - LogUtil.error("服务器返回：上传失败，list5。code:" | |
| 1062 | - +list5.get(0).getCode()+";msg:"+list5.get(0).getMsg()+";type:"+list5.get(0).getType(),null); | |
| 1095 | + if(null!=preEugenicsBaseModel.getHusbandClinicalCheck()||null!=preEugenicsBaseModel.getWifeClinicalCheck()) { | |
| 1096 | + for (int i = 1; i <= 2; i++) {//男女分别上传 | |
| 1097 | + if (i == 1) { | |
| 1098 | + if (null != preEugenicsBaseModel.getHusbandClinicalCheck()) { | |
| 1099 | + //组装数据时区分男女 | |
| 1100 | + preEugenicsBaseModel.setHusbandClinicalCheck(new HashMap<String, Object>() {{ | |
| 1101 | + put("sex", "01"); | |
| 1102 | + }}); | |
| 1103 | + } else { | |
| 1104 | + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1105 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//男 | |
| 1106 | + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
| 1107 | + LogUtil.taskInfo("孕前临床检验4.5,（男）没有录入数据略过。"); | |
| 1108 | + break; | |
| 1109 | + } | |
| 1110 | + } else { | |
| 1111 | + if (null != preEugenicsBaseModel.getWifeClinicalCheck()) { | |
| 1112 | + //组装数据时区分男女 | |
| 1113 | + preEugenicsBaseModel.setWifeClinicalCheck(new HashMap<String, Object>() {{ | |
| 1114 | + put("sex", "02"); | |
| 1115 | + }}); | |
| 1116 | + } else { | |
| 1117 | + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1118 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//女 | |
| 1119 | + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
| 1120 | + LogUtil.taskInfo("孕前临床检验4.5,（女）没有录入数据略过。"); | |
| 1121 | + break; | |
| 1122 | + } | |
| 1123 | + } | |
| 1124 | + String result5 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest") | |
| 1125 | + , lhxfyUploadingProvince.uploadingProvinceClinicalCheck((i == 1) ? preEugenicsBaseModel.getHusbandClinicalCheck() : preEugenicsBaseModel.getWifeClinicalCheck(), KEY, documentId)); | |
| 1126 | + if (StringUtils.isNotEmpty(result5)) { | |
| 1127 | + List<UploadResult> list5 = JsonUtil.jsonToList(result5, UploadResult.class); | |
| 1128 | + if ("0000".equals(list5.get(0).getCode())) { | |
| 1129 | + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1130 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 1);//成功 | |
| 1131 | + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
| 1132 | + LogUtil.taskInfo("孕前临床检验上传成功"); | |
| 1133 | + } else { | |
| 1134 | + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1135 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败 | |
| 1136 | + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
| 1137 | + LogUtil.error("服务器返回：上传失败，list5。code:" | |
| 1138 | + + list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg() + ";type:" + list5.get(0).getType(), null); | |
| 1139 | + } | |
| 1140 | + } else { | |
| 1141 | + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1142 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败 | |
| 1143 | + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
| 1144 | + LogUtil.taskError("上传异常：result5=HttpClientUtil.doWebServicePost", null); | |
| 1145 | + } | |
| 1063 | 1146 | } |
| 1064 | 1147 | }else { |
| 1065 | 1148 | Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
| 1066 | - Update update5 = new Update().set("isUploadingYn.clinicalCheck", 0);//失败 | |
| 1149 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck1", 0).set("isUploadingYn.clinicalCheck2",0);//男和女 | |
| 1067 | 1150 | mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); |
| 1068 | - LogUtil.taskError("上传异常：result5=HttpClientUtil.doWebServicePost",null); | |
| 1151 | + LogUtil.taskError("孕前临床检验4.5,男女没有录入数据略过。",null); | |
| 1069 | 1152 | } |
| 1070 | 1153 | //上传孕前妇科B超检查4.6 |
| 1071 | - String result6=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadGynecologicalBscan") | |
| 1072 | - ,lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel,KEY,documentId)); | |
| 1073 | - if(StringUtils.isNotEmpty(result6)){ | |
| 1074 | - List<UploadResult> list6=JsonUtil.jsonToList(result6, UploadResult.class); | |
| 1075 | - if("0000".equals(list6.get(0).getCode())){ | |
| 1154 | + if(null!=preEugenicsBaseModel.getWifeBCheck()) { | |
| 1155 | + String result6 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGynecologicalBscan") | |
| 1156 | + , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId)); | |
| 1157 | + if (StringUtils.isNotEmpty(result6)) { | |
| 1158 | + List<UploadResult> list6 = JsonUtil.jsonToList(result6, UploadResult.class); | |
| 1159 | + if ("0000".equals(list6.get(0).getCode())) { | |
| 1160 | + Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1161 | + Update update6 = new Update().set("isUploadingYn.bCheck", 1);//成功 | |
| 1162 | + mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); | |
| 1163 | + LogUtil.taskInfo("孕前妇科B超检查上传成功"); | |
| 1164 | + } else { | |
| 1165 | + Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1166 | + Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败 | |
| 1167 | + mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); | |
| 1168 | + LogUtil.error("服务器返回：上传失败，list6。code:" | |
| 1169 | + + list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg() + ";type:" + list6.get(0).getType(), null); | |
| 1170 | + } | |
| 1171 | + } else { | |
| 1076 | 1172 | Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
| 1077 | - Update update6 = new Update().set("isUploadingYn.bCheck", 1);//成功 | |
| 1078 | - mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); | |
| 1079 | - LogUtil.taskInfo("孕前妇科B超检查上传成功"); | |
| 1080 | - }else { | |
| 1081 | - Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
| 1082 | 1173 | Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败 |
| 1083 | 1174 | mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); |
| 1084 | - LogUtil.error("服务器返回：上传失败，list6。code:" | |
| 1085 | - +list6.get(0).getCode()+";msg:"+list6.get(0).getMsg()+";type:"+list6.get(0).getType(),null); | |
| 1175 | + LogUtil.taskError("上传异常：result6=HttpClientUtil.doWebServicePost", null); | |
| 1086 | 1176 | } |
| 1087 | 1177 | }else { |
| 1088 | 1178 | Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
| 1089 | - Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败 | |
| 1179 | + Update update6 = new Update().set("isUploadingYn.bCheck", 0);//未录入 | |
| 1090 | 1180 | mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); |
| 1091 | - LogUtil.taskError("上传异常：result6=HttpClientUtil.doWebServicePost",null); | |
| 1181 | + LogUtil.taskError("孕前妇科B超检查4.6,没有录入数据略过。",null); | |
| 1092 | 1182 | } |
| 1093 | 1183 | //上传孕前检查结果及评估建议4.7 |
| 1094 | 1184 | /*String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment") |
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java
View file @
53e1c4c
| ... | ... | @@ -360,7 +360,7 @@ |
| 360 | 360 | return JsonUtil.obj2Str(general); |
| 361 | 361 | } |
| 362 | 362 | //上传孕前体格检查4.4 |
| 363 | - public String uploadingProvincePhysiqueCheck(PreEugenicsBaseModel baseModel,String key,String documentId){ | |
| 363 | + public String uploadingProvincePhysiqueCheck(Map<String,Object> baseInfo,String key,String documentId){ | |
| 364 | 364 | Map<String,Object> data=new HashMap<>(); |
| 365 | 365 | String json=""; |
| 366 | 366 | if (StringUtils.isNotEmpty(json)) |
| ... | ... | @@ -371,7 +371,7 @@ |
| 371 | 371 | return JsonUtil.obj2Str(data); |
| 372 | 372 | } |
| 373 | 373 | //上传孕前临床检验4.5 |
| 374 | - public String uploadingProvinceClinicalCheck(PreEugenicsBaseModel baseModel,String key,String documentId){ | |
| 374 | + public String uploadingProvinceClinicalCheck(Map<String,Object> baseInfo,String key,String documentId){ | |
| 375 | 375 | Map<String,Object> data=new HashMap<>(); |
| 376 | 376 | String json=""; |
| 377 | 377 | if (StringUtils.isNotEmpty(json)) |
| ... | ... | @@ -382,7 +382,7 @@ |
| 382 | 382 | return JsonUtil.obj2Str(data); |
| 383 | 383 | } |
| 384 | 384 | //上传孕前妇科B超检查4.6 |
| 385 | - public String uploadingProvinceBCheck(PreEugenicsBaseModel baseModel,String key,String documentId){ | |
| 385 | + public String uploadingProvinceBCheck(Map<String,Object> baseInfo,String key,String documentId){ | |
| 386 | 386 | Map<String,Object> data=new HashMap<>(); |
| 387 | 387 | String json=""; |
| 388 | 388 | if (StringUtils.isNotEmpty(json)) |