From be2b5c23f63968b4416cf95f29920fd7b72e2d24 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 4 Jul 2020 15:52:00 +0800 Subject: [PATCH] update --- .../operate/web/facade/ApplyOrderFacade.java | 29 ++++++++++++++++------ .../operate/web/facade/StopPregnancyFacade.java | 8 ++++-- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 4f160d0..4d68891 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -421,7 +421,7 @@ public class ApplyOrderFacade { // 调用华大接口 Boolean aBoolean = callHuaDa(sieveApplyOrderModel, hospitalId); String number = sieveApplyOrderModel.getNumber(); - if (aBoolean != null && StringUtils.isNotEmpty(number)) { + if (aBoolean != null && StringUtils.isNotEmpty(number) && aBoolean) { mongoTemplate.updateFirst(Query.query(Criteria.where("number").is(number)), Update.update("huaDaPushResult", aBoolean), SieveApplyOrderModel.class); } @@ -606,6 +606,7 @@ public class ApplyOrderFacade { if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { int size = sieveApplyOrderModels.size(); if (size > 1) { + sieveApplyOrderModel.setLymsSieveId(sieveApplyOrderModels.get(0).getLymsSieveId()); return true; } SieveApplyOrderModel model = sieveApplyOrderModels.get(0); @@ -613,6 +614,7 @@ public class ApplyOrderFacade { String modelIdWeb = sieveApplyOrderModel.getId(); if (StringUtils.isNotEmpty(modelIdWeb)) { if (!modelIdDB.equals(modelIdWeb)) { + sieveApplyOrderModel.setLymsSieveId(model.getLymsSieveId()); return true; } } else { @@ -1857,6 +1859,9 @@ public class ApplyOrderFacade { } String data = null; try { + + + //5.3.查询报告详情 Map signParams = getSignParams(SYSCODE, SECRET); String timestamp1 = signParams.get("timestamp").toString(); @@ -1874,13 +1879,22 @@ public class ApplyOrderFacade { JSONObject jsonObject = JSONObject.parseObject(data); Object rows = jsonObject.get("rows"); HuadaCallbackModel huadaCallbackModel = JSONObject.parseObject(rows.toString(), HuadaCallbackModel.class); - System.out.println(huadaCallbackModel.toString()); + + SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel(); + sieveApplyOrderModel.setNumber(huadaCallbackModel.getSampleNum()); + boolean existTwo = exists(sieveApplyOrderModel); + if (!existTwo) { + map.put("code", "500"); + map.put("msg", "标本号不存在"); + return map; + } + String cardId = huadaCallbackModel.getCardId(); Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardId)), Patients.class); if (patients != null) { String patientsId = patients.getId(); - SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId); + SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId,sieveApplyOrderModel.getLymsSieveId()); List sieveResultModels = mongoTemplate.find(Query.query(Criteria.where("sampleReportId").is(model.getSampleReportId())).with(new Sort(Sort.Direction.DESC, "resultTime")), SieveResultModel.class); if (CollectionUtils.isNotEmpty(sieveResultModels)) { SieveResultModel sieveResultModel = sieveResultModels.get(0); @@ -1931,8 +1945,9 @@ public class ApplyOrderFacade { * @param patientsId * @return */ - private SieveResultModel getSieveResultModel(final HuadaCallbackModel huadaCallbackModel, String patientsId) { + private SieveResultModel getSieveResultModel(final HuadaCallbackModel huadaCallbackModel, String patientsId,String sieveId) { SieveResultModel newModel = new SieveResultModel(); + newModel.setLymsSieveId(sieveId); newModel.setResultTime(new Date()); newModel.setReportType("1"); newModel.setParentId(patientsId); @@ -2208,7 +2223,7 @@ public class ApplyOrderFacade { JSONObject jsonObject = JSONObject.parseObject(data); Object codeObj = jsonObject.get("code"); if (codeObj != null && "200".equals(codeObj.toString()) && data.contains("success")) { - dohandleResult(jsonObject.get("data")); + dohandleResult(jsonObject.get("data"),sieveApplyOrderModel.getLymsSieveId()); break; } } @@ -2229,7 +2244,7 @@ public class ApplyOrderFacade { return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功!"); } - private void dohandleResult(final Object dataObj) { + private void dohandleResult(final Object dataObj,final String sieveId) { if (dataObj == null) { return; } @@ -2244,7 +2259,7 @@ public class ApplyOrderFacade { if (patients != null) { String patientsId = patients.getId(); huadaCallbackModel.setSampleReportId(huadaCallbackModel.getSampleNum()); - SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId); + SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId,sieveId); List sieveResultModels = mongoTemplate.find(Query.query(Criteria.where("sampleReportId").is(model.getSampleReportId())).with(new Sort(Sort.Direction.DESC, "resultTime")), SieveResultModel.class); if (CollectionUtils.isNotEmpty(sieveResultModels)) { SieveResultModel sieveResultModel = sieveResultModels.get(0); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index 7faef83..feea446 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -436,9 +436,13 @@ public class StopPregnancyFacade { usersQuery.setOrgId(dbuser.getOrgId()); usersQuery.setEnable(1); //秦皇岛提出 只查询当前用户所在部门的所有用户 - if (dbuser != null && dbuser.getDeptId() != null) + String hospital = autoMatchFacade.getHospitalId(id); + if ("216".equals(hospital)) { - usersQuery.setDeptId(dbuser.getDeptId()); + if (dbuser != null && dbuser.getDeptId() != null) + { + usersQuery.setDeptId(dbuser.getDeptId()); + } } List users = usersService.queryUsers(usersQuery); -- 1.8.3.1