From 2492592b45701ff1781413799bd37721c3349f4e Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 5 Jan 2017 10:53:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/biz/service/AntExRecordService.java | 2 ++ .../main/java/com/lyms/platform/biz/service/PatientsService.java | 9 +++++++++ .../src/main/java/com/lyms/platform/pojo/AntExRecordModel.java | 9 +++++++++ .../src/main/java/com/lyms/platform/query/AntExRecordQuery.java | 6 ++++++ .../com/lyms/platform/operate/web/facade/AntExRecordFacade.java | 2 +- .../com/lyms/platform/operate/web/result/AntExManagerResult.java | 2 +- 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java index ae9dce2..8d606be 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java @@ -222,6 +222,7 @@ public class AntExRecordService { } else { antExRecordModel.setStatus(1); } + antExRecordModel.setCardNo(patients.getCardNo()); antExRecordModel.setAddressRegister(patients.getAddressRegister()); antExRecordModel.setProvinceRegisterId(patients.getProvinceRegisterId()); antExRecordModel.setCityRegisterId(patients.getCityRegisterId()); @@ -264,6 +265,7 @@ public class AntExRecordService { } else { antExRecordModel.setStatus(1); } + antExRecordModel.setCardNo(patients.getCardNo()); antExRecordModel.setAddressRegister(patients.getAddressRegister()); antExRecordModel.setProvinceRegisterId(patients.getProvinceRegisterId()); antExRecordModel.setCityRegisterId(patients.getCityRegisterId()); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index e354492..90eb858 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -283,6 +283,15 @@ public class PatientsService { antExRecordModel.setDueDate(patients.getDueDate()); antExRecordModel.setName(patients.getUsername()); antExRecordModel.setBrith(patients.getBirth()); + antExRecordModel.setPhone(patients.getPhone()); + antExRecordModel.setAddressRegister(patients.getAddressRegister()); + antExRecordModel.setProvinceRegisterId(patients.getProvinceRegisterId()); + antExRecordModel.setCityRegisterId(patients.getCityRegisterId()); + antExRecordModel.setAreaRegisterId(patients.getAreaRegisterId()); + antExRecordModel.setStreetRegisterId(patients.getStreetRegisterId()); + antExRecordModel.setBuildDoctor(patients.getBookbuildingDoctor()); + antExRecordModel.setCardNo(patients.getCardNo()); + Patients dbPatients = findOnePatientById(patients.getId()); if(dbPatients.getType()==1){ antExRecordModel.setStatus(2); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java index a034372..fa42823 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java @@ -24,6 +24,8 @@ public class AntExRecordModel extends BaseModel { private String fId; //条码号 private String barCode; + private String cardNo; + private String parentId; @@ -70,6 +72,13 @@ public class AntExRecordModel extends BaseModel { private String areaRegisterId; private String streetRegisterId; + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } public String getAddressRegister() { return addressRegister; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index c49cf3e..84dd65f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -220,6 +220,12 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery if (null != parentId) { condition = condition.and("parentId", parentId, MongoOper.IS); } + if (null != cardNo) { + condition = condition.and("cardNo", cardNo, MongoOper.IS); + } + if (null != phone) { + condition = condition.and("phone", phone, MongoOper.IS); + } if (null != id) { condition = condition.and("id", id, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 2d43747..8f3e16a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -81,7 +81,7 @@ public class AntExRecordFacade { antExRecordQuery.setrFactor(antExManagerQueryRequest.getRiskFactorId()); antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel()); antExRecordQuery.setBarCode(antExManagerQueryRequest.getBarCode()); - + antExRecordQuery.setCardNo(antExManagerQueryRequest.getCardNo()); //产检日期 if (org.apache.commons.lang.StringUtils.isNotEmpty(antExManagerQueryRequest.getcTime())) { String nextDateStr = antExManagerQueryRequest.getcTime(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java index 5b5d223..b76b402 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java @@ -106,7 +106,7 @@ public class AntExManagerResult { setCheckTime(DateUtil.getyyyy_MM_dd(e.getCheckTime())); setName(e.getName()); setAge(DateUtil.getAge(e.getBrith()) + ""); - setPhone(e.getPhone()); + setPhone(StringUtils.encryPhone(e.getPhone())); setBarCode(e.getBarCode()); int days = DateUtil.getDays(e.getLastMenses(),e.getCheckTime() ); setcDueWeek(StringUtils.dueWeek(days)); -- 1.8.3.1