From 44af4a51bc9c45ae09e1ad7549efe6f4eb3048a7 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 2 Sep 2016 09:51:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/ApplyOrderFacade.java | 39 +++++++++++++--------- .../platform/operate/web/facade/SieveFacade.java | 7 +++- 2 files changed, 29 insertions(+), 17 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 c8f3dc5..85b3c28 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 @@ -412,40 +412,40 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setPage(applyOrderQueryRequest.getPage()); referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit()); referralApplyOrderQuery.setNeed("1"); - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getReviced())){ - String[] str= applyOrderQueryRequest.getReviced().split(" - "); - if(str.length>1){ + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getReviced())) { + String[] str = applyOrderQueryRequest.getReviced().split(" - "); + if (str.length > 1) { referralApplyOrderQuery.setRevicedStart(DateUtil.parseYMD(str[0])); } - if(str.length==2){ - referralApplyOrderQuery.setRevicedEnd(new Date(DateUtil.parseYMD(str[1]).getTime()+86398000)); + if (str.length == 2) { + referralApplyOrderQuery.setRevicedEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000)); } } - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferred())){ - String[] str= applyOrderQueryRequest.getTransferred().split(" - "); - if(str.length>1){ + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferred())) { + String[] str = applyOrderQueryRequest.getTransferred().split(" - "); + if (str.length > 1) { referralApplyOrderQuery.setTransferredStart(DateUtil.parseYMD(str[0])); } - if(str.length==2){ + if (str.length == 2) { referralApplyOrderQuery.setTransferredEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000)); } } - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getBirth())){ - String[] str= applyOrderQueryRequest.getBirth().split(" - "); - if(str.length>1){ + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getBirth())) { + String[] str = applyOrderQueryRequest.getBirth().split(" - "); + if (str.length > 1) { referralApplyOrderQuery.setBirthStart(DateUtil.parseYMD(str[0])); } - if(str.length==2){ + if (str.length == 2) { referralApplyOrderQuery.setBirthEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000)); } } - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())){ + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())) { referralApplyOrderQuery.setBirthEnd(DateUtil.addMonth(new Date(), -NumberUtils.toInt(applyOrderQueryRequest.getYlStart()))); } - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) { + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) { referralApplyOrderQuery.setBirthStart(DateUtil.addMonth(new Date(), -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd()))); } @@ -461,7 +461,7 @@ public class ApplyOrderFacade { // List diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid()); - List diagnoseList = applyOrderModel.getrRisk(); + List diagnoseList = applyOrderModel.getrRisk(); if (NumberUtils.isNumber(zhuanchu)) { Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); if (null != zhuanc) { @@ -640,6 +640,13 @@ public class ApplyOrderFacade { applyOrderResult.setrRisk(stringBuilder.toString()); applyOrderResult.setScore(orderModel.getScore()); applyOrderResult.setrLevel(highScoreResult.getLevelStr()); + Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); + if (null != patients) { + if (1 == patients.getDueStatus()) + applyOrderResult.setcDueWeek("终止妊娠"); + else if (patients.getType() == 3) + applyOrderResult.setcDueWeek("已分娩"); + } data.add(applyOrderResult); } } 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 80ed8a5..f2ec86a 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 @@ -220,7 +220,12 @@ public class SieveFacade { sieveListResult.convertToResult(sieveModel); Patients patients= patientsService.findOnePatientById(sieveModel.getParentId()); if(null!=patients){ - sieveListResult.setIsGravida(patients.getFmDate()!=null?"0":"1"); + sieveListResult.setIsGravida(patients.getFmDate() != null ? "0" : "1"); + if(1==patients.getDueStatus()) + sieveListResult.setcDueWeek("终止妊娠"); + else if(patients.getType()==3){ + sieveListResult.setcDueWeek("已分娩"); + } } data.add(sieveListResult); } -- 1.8.3.1