From 44b30435fa07b38141c81c6f84fd11912a6553af Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 19 Jun 2020 14:29:23 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/operate/web/facade/SieveFacade.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 403c037..b5a8e3c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -636,7 +636,7 @@ public class SieveFacade { } } sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx()); - sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify()); +// sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify()); sieveQuery.setPage(cqSieveQueryRequest.getPage()); sieveQuery.setLimit(cqSieveQueryRequest.getLimit()); @@ -963,6 +963,7 @@ public class SieveFacade { sieveApplyOrderQuery1.setHospitalId(pat.getHospitalId()); map.put("patientInfo", patientBaseResult); + map.put("cardNo", pat.getCardNo()); } if (type == 4) { @@ -2704,9 +2705,9 @@ public class SieveFacade { } } //1.1 修改产筛申请内容,先暂时修改B超孕天 - //sieveApplyOrderModel1.setMannualEntry(importResult.getB超孕天() != null ? Integer.parseInt(importResult.getB超孕天()) : 0); - //applyOrderService.updateSieve(sieveApplyOrderModel1); - //1.2 添加产筛申请结果 + sieveApplyOrderModel1.setStatus(2); + applyOrderService.updateSieve(sieveApplyOrderModel1); + SieveAddRequest sieveAddRequest = new SieveAddRequest(); sieveAddRequest.setPublishName(String.valueOf(id));//录入人员 sieveAddRequest.setResultTime(importResult.get风险评估时间()); //结果录入时间 -- 1.8.3.1