From 43acbdc0794130354dbc4f3b8105d2abf0e14ee7 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Tue, 27 Dec 2016 11:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E5=B0=8F=E7=BB=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0pid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/pojo/DischargeAbstractBabyModel.java | 10 ++++++++ .../pojo/DischargeAbstractMotherModel.java | 10 ++++++++ .../web/facade/DischargeAbstractFacade.java | 28 ++++++++++++++++------ .../web/request/DischargeAbstractSaveRequest.java | 21 ++++++++++++++++ .../web/result/DischargeAbstractQueryResult.java | 20 ++++++++++++++++ 5 files changed, 82 insertions(+), 7 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java index 6769eb8..0c95b5f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java @@ -18,6 +18,8 @@ public class DischargeAbstractBabyModel extends BaseModel { private String id; + private String pId; + /** * @auther HuJiaqi * @createTime 2016年12月05日 17时03分 @@ -295,4 +297,12 @@ public class DischargeAbstractBabyModel extends BaseModel { public void setCreateDate(Date createDate) { this.createDate = createDate; } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java index eeda24a..97fc0f4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java @@ -18,6 +18,8 @@ public class DischargeAbstractMotherModel extends BaseModel { private String id; + private String pId; + /** * @auther HuJiaqi * @createTime 2016年12月05日 15时46分 @@ -130,4 +132,12 @@ public class DischargeAbstractMotherModel extends BaseModel { public void setOperatorId(Integer operatorId) { this.operatorId = operatorId; } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index 8888e68..5493759 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -13,6 +13,7 @@ import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest; import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.DischargeAbstractBabyModel; import com.lyms.platform.pojo.DischargeAbstractMotherModel; import com.lyms.platform.pojo.Patients; @@ -71,6 +72,7 @@ public class DischargeAbstractFacade { dischargeAbstractMotherModel.setCreateDate(new Date()); dischargeAbstractMotherModel.setOperatorId(dischargeAbstractSaveRequest.getOperatorId()); dischargeAbstractMotherModel.setAfterMakeBabyDays(DateUtil.getDays(DateUtil.parseYMD(dischargeAbstractSaveRequest.getFmDate()), new Date())); + dischargeAbstractMotherModel.setpId(dischargeAbstractSaveRequest.getpId()); if (StringUtils.isEmpty(dischargeAbstractMotherModel.getId())) { dischargeAbstractMotherModel = dischargeAbstractMotherService.save(dischargeAbstractMotherModel); } else { @@ -87,6 +89,7 @@ public class DischargeAbstractFacade { dischargeAbstractBabyModel.setCreateDate(new Date()); dischargeAbstractBabyModel.setbCGAndHBVVaccinationDate(DateUtil.parseYMD(baby.getbCGAndHBVVaccinationDate())); dischargeAbstractBabyModel.sethBIGInjectDate(DateUtil.parseYMD(baby.gethBIGInjectDate())); + dischargeAbstractBabyModel.setpId(baby.getpId()); if (StringUtils.isEmpty(dischargeAbstractBabyModel.getId())) { dischargeAbstractBabyModelList.add(dischargeAbstractBabyModel); } else { @@ -139,6 +142,7 @@ public class DischargeAbstractFacade { dischargeAbstractQueryResult.setUserName(patients.getUsername()); dischargeAbstractQueryResult.setAge(DateUtil.getAge(patients.getBirth(), new Date())); dischargeAbstractQueryResult.setFmDate(DateUtil.getyyyy_MM_dd(patients.getFmDate())); + dischargeAbstractQueryResult.setMotherPId(patients.getPid()); // 这里之所以转换时以为前端已经写好了，并且这个循环也不是很慢 try { @@ -163,22 +167,32 @@ public class DischargeAbstractFacade { dischargeAbstractQueryResult.setGestationalWeeks(PredictedStatisticsFacade.getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus())); dischargeAbstractQueryResult.setDueDate(patients.getDueDate() == null ? "" : new SimpleDateFormat("yyyy年MM月dd日").format(patients.getDueDate())); - // 查询母亲信息 - DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery(); - dischargeAbstractMotherQuery.setPatientId(patients.getId()); - List dischargeAbstractMotherModelList = dischargeAbstractMotherService.query(dischargeAbstractMotherQuery); - - // 查询活产数 + // 查询活产数和babyPid BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); babyModelQuery.setParentId(patients.getId()); babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); try { - dischargeAbstractQueryResult.setLivingNumber(babyService.queryBabyWithQuery(babyModelQuery).size()); + List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); + if (CollectionUtils.isEmpty(babyModelList)) { + dischargeAbstractQueryResult.setLivingNumber(0); + } else { + dischargeAbstractQueryResult.setLivingNumber(babyModelList.size()); + List babyPidList = new ArrayList<>(); + for (BabyModel babyModel : babyModelList) { + babyPidList.add(babyModel.getPid()); + } + dischargeAbstractQueryResult.setBabyPIdList(babyPidList); + } } catch (Exception e) { // 什么都不干 } + // 查询母亲信息 + DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery(); + dischargeAbstractMotherQuery.setPatientId(patients.getId()); + List dischargeAbstractMotherModelList = dischargeAbstractMotherService.query(dischargeAbstractMotherQuery); + if (dischargeAbstractMotherModelList == null || dischargeAbstractMotherModelList.size() == 0) { dischargeAbstractQueryResult.setStatus("2"); dischargeAbstractQueryResult.setErrormsg("已分娩还没有做出院小结"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java index 9e7dfa3..486af8a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java @@ -55,6 +55,8 @@ public class DischargeAbstractSaveRequest { */ private List babyList; + private String pId; + public static class Baby { /** @@ -64,6 +66,8 @@ public class DischargeAbstractSaveRequest { */ private String id; + private String pId; + /** * @auther HuJiaqi * @createTime 2016年12月05日 17时56分 @@ -176,6 +180,14 @@ public class DischargeAbstractSaveRequest { */ private String orderScreenDescription; + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } + public String getId() { return id; } @@ -307,6 +319,7 @@ public class DischargeAbstractSaveRequest { public String getOrderScreenDescription() { return orderScreenDescription; } + public void setOrderScreenDescription(String orderScreenDescription) { this.orderScreenDescription = orderScreenDescription; } @@ -376,4 +389,12 @@ public class DischargeAbstractSaveRequest { public void setFmDate(String fmDate) { this.fmDate = fmDate; } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java index 440d3eb..496cf16 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java @@ -113,6 +113,26 @@ public class DischargeAbstractQueryResult extends BaseResponse { private Integer dueStatus; + private String motherPId; + + private List babyPIdList; + + public String getMotherPId() { + return motherPId; + } + + public void setMotherPId(String motherPId) { + this.motherPId = motherPId; + } + + public List getBabyPIdList() { + return babyPIdList; + } + + public void setBabyPIdList(List babyPIdList) { + this.babyPIdList = babyPIdList; + } + public Integer getDueStatus() { return dueStatus; } -- 1.8.3.1