Commit 6c5b434a4a6a1968fa13e2942822acf0e336825a
1 parent
cdac7a83eb
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 41 additions and 37 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
6c5b434
| ... | ... | @@ -1976,7 +1976,6 @@ |
| 1976 | 1976 | map1.put("params", jsonMapParams.toString()); |
| 1977 | 1977 | data = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=downloadReport&" + "timestamp=" + timestamp1 + "&syscode=" + syscode1 + "&sign=" + sign1, map1); |
| 1978 | 1978 | } |
| 1979 | - System.out.println(data); | |
| 1980 | 1979 | JSONObject respJSON = JSON.parseObject(data); |
| 1981 | 1980 | if ("200".equals(respJSON.get("code").toString())) { |
| 1982 | 1981 | Object rowsJSON =respJSON.get("rows"); |
| 1983 | 1982 | |
| 1984 | 1983 | |
| 1985 | 1984 | |
| 1986 | 1985 | |
| 1987 | 1986 | |
| 1988 | 1987 | |
| 1989 | 1988 | |
| ... | ... | @@ -2181,57 +2180,61 @@ |
| 2181 | 2180 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("获取报告失败"); |
| 2182 | 2181 | } |
| 2183 | 2182 | continue; |
| 2184 | - | |
| 2185 | 2183 | } |
| 2186 | 2184 | } |
| 2187 | 2185 | |
| 2188 | 2186 | return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功!"); |
| 2189 | 2187 | } |
| 2190 | 2188 | |
| 2191 | - private void dohandleResult(Object dataObj) { | |
| 2189 | + private void dohandleResult(final Object dataObj) { | |
| 2192 | 2190 | if (dataObj == null) |
| 2193 | 2191 | { |
| 2194 | 2192 | return; |
| 2195 | 2193 | } |
| 2196 | - HuadaCallbackModel huadaCallbackModel = JSONObject.parseObject(dataObj.toString(), HuadaCallbackModel.class); | |
| 2197 | - System.out.println(huadaCallbackModel.toString()); | |
| 2194 | + new Thread(new Runnable() { | |
| 2195 | + @Override | |
| 2196 | + public void run() { | |
| 2197 | + HuadaCallbackModel huadaCallbackModel = JSONObject.parseObject(dataObj.toString(), HuadaCallbackModel.class); | |
| 2198 | + System.out.println(huadaCallbackModel.toString()); | |
| 2198 | 2199 | |
| 2199 | - String cardId = huadaCallbackModel.getCardId(); | |
| 2200 | - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardId)), Patients.class); | |
| 2201 | - if (patients != null) { | |
| 2202 | - String patientsId = patients.getId(); | |
| 2203 | - huadaCallbackModel.setSampleReportId(huadaCallbackModel.getSampleNum()); | |
| 2204 | - SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId); | |
| 2205 | - List<SieveResultModel> sieveResultModels = mongoTemplate.find(Query.query(Criteria.where("sampleReportId").is(model.getSampleReportId())).with(new Sort(Sort.Direction.DESC, "resultTime")), SieveResultModel.class); | |
| 2206 | - if (CollectionUtils.isNotEmpty(sieveResultModels)) { | |
| 2207 | - SieveResultModel sieveResultModel = sieveResultModels.get(0); | |
| 2208 | - Update update = new Update(); | |
| 2209 | - Map<String, Object> object = BeanUtils.objectToObjectMap(model); | |
| 2210 | - Set<Map.Entry<String, Object>> entries = object.entrySet(); | |
| 2211 | - for (Map.Entry<String, Object> entry : entries) { | |
| 2212 | - Object entryValue = entry.getValue(); | |
| 2213 | - if (entryValue != null) { | |
| 2214 | - if (entryValue instanceof String) { | |
| 2215 | - if (StringUtils.isEmpty(entryValue.toString())) { | |
| 2216 | - continue; | |
| 2200 | + String cardId = huadaCallbackModel.getCardId(); | |
| 2201 | + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardId).and("yn").is(1)), Patients.class); | |
| 2202 | + if (patients != null) { | |
| 2203 | + String patientsId = patients.getId(); | |
| 2204 | + huadaCallbackModel.setSampleReportId(huadaCallbackModel.getSampleNum()); | |
| 2205 | + SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId); | |
| 2206 | + List<SieveResultModel> sieveResultModels = mongoTemplate.find(Query.query(Criteria.where("sampleReportId").is(model.getSampleReportId())).with(new Sort(Sort.Direction.DESC, "resultTime")), SieveResultModel.class); | |
| 2207 | + if (CollectionUtils.isNotEmpty(sieveResultModels)) { | |
| 2208 | + SieveResultModel sieveResultModel = sieveResultModels.get(0); | |
| 2209 | + Update update = new Update(); | |
| 2210 | + Map<String, Object> object = BeanUtils.objectToObjectMap(model); | |
| 2211 | + Set<Map.Entry<String, Object>> entries = object.entrySet(); | |
| 2212 | + for (Map.Entry<String, Object> entry : entries) { | |
| 2213 | + Object entryValue = entry.getValue(); | |
| 2214 | + if (entryValue != null) { | |
| 2215 | + if (entryValue instanceof String) { | |
| 2216 | + if (StringUtils.isEmpty(entryValue.toString())) { | |
| 2217 | + continue; | |
| 2218 | + } | |
| 2219 | + } | |
| 2220 | + update.set(entry.getKey(), entry.getValue()); | |
| 2217 | 2221 | } |
| 2218 | 2222 | } |
| 2219 | - update.set(entry.getKey(), entry.getValue()); | |
| 2223 | + mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(sieveResultModel.getId())), update, SieveResultModel.class); | |
| 2224 | + logger.info(String.format("更新产筛结果: { %s }", update.toString())); | |
| 2225 | + } else { | |
| 2226 | + mongoTemplate.insert(model); | |
| 2227 | + logger.info(String.format("新增产筛结果: { %s }", model.toString())); | |
| 2220 | 2228 | } |
| 2229 | + | |
| 2230 | + // 后续业务操作 | |
| 2231 | + SieveAddRequest sieveAddRequest = new SieveAddRequest(); | |
| 2232 | + sieveAddRequest.setParentId(patientsId); | |
| 2233 | + Integer userId = null; | |
| 2234 | + sieveFacade.addOrUpdateSieveModel(sieveAddRequest, userId, model); | |
| 2221 | 2235 | } |
| 2222 | - mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(sieveResultModel.getId())), update, SieveResultModel.class); | |
| 2223 | - logger.info(String.format("更新产筛结果: { %s }", update.toString())); | |
| 2224 | - } else { | |
| 2225 | - mongoTemplate.insert(model); | |
| 2226 | - logger.info(String.format("新增产筛结果: { %s }", model.toString())); | |
| 2227 | 2236 | } |
| 2228 | - | |
| 2229 | - // 后续业务操作 | |
| 2230 | - SieveAddRequest sieveAddRequest = new SieveAddRequest(); | |
| 2231 | - sieveAddRequest.setParentId(patientsId); | |
| 2232 | - Integer userId = null; | |
| 2233 | - sieveFacade.addOrUpdateSieveModel(sieveAddRequest, userId, model); | |
| 2234 | - } | |
| 2237 | + }).start(); | |
| 2235 | 2238 | } |
| 2236 | 2239 | |
| 2237 | 2240 | /*拼json使用*/ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
6c5b434
| ... | ... | @@ -971,6 +971,7 @@ |
| 971 | 971 | |
| 972 | 972 | sieveResultInfo.put("sampleInfoId", sieveResultModel.getSampleInfoId()); |
| 973 | 973 | sieveResultInfo.put("sampleReportId", sieveResultModel.getSampleReportId()); |
| 974 | + sieveResultInfo.put("hasReport", sieveResultModel.getHasReport()); | |
| 974 | 975 | |
| 975 | 976 | |
| 976 | 977 | String tszhzValue = ""; |