From 71fb60b9a19f461a620fdd893c117f622c69eb25 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 25 May 2018 16:58:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E8=AF=A6=E6=83=85=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=BB=93=E6=9E=9C=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java | 2 ++ .../main/java/com/lyms/platform/operate/web/facade/SieveFacade.java | 1 + .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 6 ++++-- 3 files changed, 7 insertions(+), 2 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 bc2d8f0..0637426 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 @@ -401,6 +401,8 @@ public class ApplyOrderFacade { sieveService.updateOneChanQianDiaSieve(sieveModel); operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "增加产前筛查"); } + }else{ + System.out.println("已经有产筛申请单了"); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } 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 e0db3de..88851a7 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 @@ -390,6 +390,7 @@ public class SieveFacade { sieveQuery.setNeed(needPage); String hospitalId = autoMatchFacade.getHospitalId(userId); sieveQuery.setHospitalId(hospitalId); + // System.out.println("产筛列表："+sieveQuery.convertToQuery().convertToMongoQuery()); //查询产筛list List list = sieveService.queryList1(sieveQuery, "order"); List data = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index af47a45..375f189 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1259,7 +1259,8 @@ public class ViewFacade { getRisk(data.getHighrisk(), data.getOtherHighRisk(), map); //完善筛查结果 getscreenResult(data.getScreenResult(), map); - + //结果补充 + map.put("resultSupple", data.getResultSupple()); //产检基本信息 map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckTime())); String cDueWeek = ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckTime()); @@ -1964,7 +1965,8 @@ public class ViewFacade { //完善筛查结果 getscreenResult(data.getScreenResult(), map); - + //结果补充 + map.put("resultSupple", data.getResultSupple()); //产检基本信息 map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate())); map.put("currentDueDate", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate())); -- 1.8.3.1