From f6490ed7a21ccd6f8d97aae749dc44d0458b8c4d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 8 Jan 2020 17:48:32 +0800 Subject: [PATCH] update --- .../com/lyms/platform/pojo/BabyDeathModel.java | 13 ++++++++++++ .../lyms/platform/pojo/DefectiveChildModel.java | 18 ++++++++++++++++ .../operate/web/request/BabyDeathListRequest.java | 13 ++++++++++++ .../operate/web/request/CommonParamRequest.java | 2 +- .../web/result/DefectiveChildModelResult.java | 10 +++++++++ .../web/service/impl/BabyDeathServerImpl.java | 10 +++++++++ .../service/impl/DefectiveChildServiceImpl.java | 24 ++++++++++++++++++---- 7 files changed, 85 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyDeathModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyDeathModel.java index 3d21bf2..6908589 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyDeathModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyDeathModel.java @@ -29,6 +29,11 @@ public class BabyDeathModel extends BaseModel { private String phone; + /** + * 母亲身份证号码 + */ + private String cardNo; + /** * 机构地址 @@ -110,6 +115,14 @@ public class BabyDeathModel extends BaseModel { private Date modifed; + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + public String getPhone() { return phone; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DefectiveChildModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DefectiveChildModel.java index 1d8c806..a00d14c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DefectiveChildModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DefectiveChildModel.java @@ -87,6 +87,24 @@ public class DefectiveChildModel extends BaseModel { */ private Map formData; + private String cardNo; + private Date mommyBirth; + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public Date getMommyBirth() { + return mommyBirth; + } + + public void setMommyBirth(Date mommyBirth) { + this.mommyBirth = mommyBirth; + } public String getOrgProvince() { return orgProvince; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyDeathListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyDeathListRequest.java index ed46a6d..8e6a5c3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyDeathListRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyDeathListRequest.java @@ -19,6 +19,11 @@ public class BabyDeathListRequest extends BaseQuery { */ private String phone; + /** + * 身份证号 + */ + private String cardNo; + /** * 创建时间 @@ -37,6 +42,14 @@ public class BabyDeathListRequest extends BaseQuery { private String liveStreet; + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + public String getNumber() { return number; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonParamRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonParamRequest.java index a083abe..eb19890 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonParamRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonParamRequest.java @@ -17,7 +17,7 @@ public class CommonParamRequest implements Serializable { private String cardNo; /** - * 就诊卡号.. + * 住院号.. */ private String otherNo; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DefectiveChildModelResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DefectiveChildModelResult.java index 1a8f189..b86c34a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DefectiveChildModelResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DefectiveChildModelResult.java @@ -31,6 +31,16 @@ public class DefectiveChildModelResult extends DefectiveChildModel { */ private String babyBirthStr; + private String mommyBirthStr; + + public String getMommyBirthStr() { + return mommyBirthStr; + } + + public void setMommyBirthStr(String mommyBirthStr) { + this.mommyBirthStr = mommyBirthStr; + } + public String getOrgAddressStr() { return orgAddressStr; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyDeathServerImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyDeathServerImpl.java index d57d435..197fbfe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyDeathServerImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyDeathServerImpl.java @@ -107,6 +107,11 @@ public class BabyDeathServerImpl implements IBabyDeathServer { query.addCriteria(Criteria.where("phone").is(phone)); } + String cardNo = param.getCardNo(); + if (StringUtils.isNotEmpty(phone)) { + query.addCriteria(Criteria.where("cardNo").is(cardNo)); + } + // 填写单位 query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); // 填写时间 @@ -237,6 +242,11 @@ public class BabyDeathServerImpl implements IBabyDeathServer { if (StringUtils.isNotEmpty(code)) { query.addCriteria(Criteria.where("code").is(code)); } + + String cardNo = param.getCardNo(); + if (StringUtils.isNotEmpty(cardNo)) { + query.addCriteria(Criteria.where("cardNo").is(cardNo)); + } BabyDeathModel model = mongoTemplate.findOne(query.with(new Sort(Sort.Direction.DESC, "created")), BabyDeathModel.class); BabyDeathModelResult result = new BabyDeathModelResult(); if (model != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java index 82ae05d..b2993fd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java @@ -263,6 +263,11 @@ public class DefectiveChildServiceImpl implements DefectiveChildService { result.setBabyBirthStr(DateUtil.getyyyy_MM_dd(babyBirth)); } + Date mommyBirth = result.getMommyBirth(); + if (mommyBirth != null) { + result.setMommyBirthStr(DateUtil.getyyyy_MM_dd(mommyBirth)); + } + return result; } @@ -275,11 +280,22 @@ public class DefectiveChildServiceImpl implements DefectiveChildService { @Override public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); - String inHospitalNo = param.getCardNo(); + String queryNo = ""; + if (StringUtils.isNotEmpty(param.getCardNo())) + { + queryNo = param.getCardNo(); + } + + if (StringUtils.isNotEmpty(param.getCode())) + { + queryNo = param.getCode(); + } DefectiveChildModelResult result = null; - if (StringUtils.isNotEmpty(inHospitalNo)) { - List defectiveChildModels = mongoTemplate.find(Query.query(Criteria.where("inHospitalNo").is(inHospitalNo). - and("hospitalId").is(hospitalId)), DefectiveChildModel.class); + if (StringUtils.isNotEmpty(queryNo)) { + Query query = new Query(); + query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); + query.addCriteria(new Criteria().orOperator(Criteria.where("inHospitalNo").is(queryNo), Criteria.where("cardNo").is(queryNo))); + List defectiveChildModels = mongoTemplate.find(query, DefectiveChildModel.class); if (CollectionUtils.isNotEmpty(defectiveChildModels)) { result = getResultByModel(defectiveChildModels.get(0)); -- 1.8.3.1