From 47278d3e0f28b58bb7af359210cdb3e3c55538e2 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 24 Jun 2021 16:08:00 +0800 Subject: [PATCH] update --- .../com/lyms/platform/pojo/PreEugenicsBaseModel.java | 5 +++++ .../com/lyms/platform/query/PremaritalCheckupQuery.java | 14 +++++++++++++- .../operate/web/facade/PremaritalCheckupFacade.java | 16 ++++++++++++++-- .../operate/web/request/PreEugenicsBaseListRequest.java | 10 ++++++++++ .../operate/web/result/PreEugenicsBaseListResult.java | 1 + .../operate/web/service/impl/PreEugebicsServiceImpl.java | 6 +++++- 6 files changed, 48 insertions(+), 4 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java index 9aa842f..f6455da 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java @@ -375,6 +375,11 @@ public class PreEugenicsBaseModel extends BaseModel { //孕次 private Integer yunSize; + //是否抽血 1不抽血 + private Integer checkBlood; + + + public static long getSerialVersionUID() { return serialVersionUID; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java index 096f4bc..2e059b0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java @@ -65,7 +65,8 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ private Long numCode; //1 未同步 2已经同步 private Integer isSync; - + //配偶证件号 + private String spouseCertificateNum; @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -93,6 +94,9 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ if(CollectionUtils.isNotEmpty(parentIds)){ condition = condition.and("parentId", parentIds, MongoOper.IN); } + if(StringUtils.isNotEmpty(spouseCertificateNum)){ + condition = condition.and("spouseCertificateNum", spouseCertificateNum, MongoOper.IN); + } if (created!=null) { condition = condition.and("created", created, MongoOper.IS); } @@ -154,6 +158,14 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ return condition.toMongoQuery(); } + public String getSpouseCertificateNum() { + return spouseCertificateNum; + } + + public void setSpouseCertificateNum(String spouseCertificateNum) { + this.spouseCertificateNum = spouseCertificateNum; + } + public Integer getIsSync() { return isSync; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 7c202b6..a521596 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -191,7 +191,7 @@ public class PremaritalCheckupFacade { String spouseCode = ""; //当婚检ID为空,用证件号或者就诊卡去查询居民建档的信息 - if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) || (result != null && StringUtils.isNotEmpty(result.getSpouseCertificateNum()))) { + if (result != null && StringUtils.isNotEmpty(result.getSpouseCertificateNum())) { ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); archiveQuery.setYn(YnEnums.YES.getId()); archiveQuery.setHospitalId(requestParam.getHospitalId()); @@ -208,8 +208,20 @@ public class PremaritalCheckupFacade { } } + else + { + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); + query.setYn(YnEnums.YES.getId()); + query.setSpouseCertificateNum(archiveModel.getCertificateNum()); + List checkupList = premaritalCheckupService.queryPremaritalCheckup(query); + if (CollectionUtils.isNotEmpty(checkupList)) { + PremaritalCheckup model = checkupList.get(0); + checkupResult.setSpouseName(model.getSpouseName()); + checkupResult.setSpouseCertificateTypeId(model.getCertificateTypeId()); + checkupResult.setSpouseCertificateNum(model.getCertificateNum()); + } + } archiveMap.put("spouseCode", spouseCode); - } resultMap.put("archiveResult", archiveMap); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java index ca4d056..5f6a840 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java @@ -65,6 +65,16 @@ public class PreEugenicsBaseListRequest extends BaseQuery { //0 或者空孕检 1婚孕检 private Integer hyj; + //是否抽血 1不抽血 + private Integer checkBlood; + + public Integer getCheckBlood() { + return checkBlood; + } + + public void setCheckBlood(Integer checkBlood) { + this.checkBlood = checkBlood; + } public Integer getHyj() { return hyj; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java index 0d4431c..c84759f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java @@ -87,6 +87,7 @@ public class PreEugenicsBaseListResult extends PreEugenicsBaseModel { private String doctorStr; + public String getHusbandAccountAddressStr() { return husbandAccountAddressStr; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 016d9b6..3b4b604 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -288,6 +288,11 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen query.addCriteria(Criteria.where("createUser").is(createUser)); } + Integer checkBlood = param.getCheckBlood(); + if (checkBlood != null) { + query.addCriteria(Criteria.where("checkBlood").is(checkBlood)); + } + Integer sendCountry = param.getSendCountry(); if (sendCountry != null) { query.addCriteria(Criteria.where("sendCountry").is(sendCountry)); @@ -476,7 +481,6 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen setDoctorName(result.getHusbandPhysiqueCheck()); setDoctorName(result.getHusbandClinicalCheck()); setDoctorName(result.getHusbandOtherCheck()); - setDoctorName(result.getResultAdvice()); return result; -- 1.8.3.1