From f5623e1aa4820b68823d174712239c81ba22b30d Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Wed, 7 Sep 2022 09:42:13 +0800 Subject: [PATCH] update --- .../biz/service/BabyBookbuildingService.java | 2 + .../lyms/platform/pojo/BabyBuildClassifyModel.java | 24 +++++++ .../platform/query/BabyBuildClassifyQuery.java | 84 ++++++---------------- 3 files changed, 49 insertions(+), 61 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java index 83c2b81..7c6ab61 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java @@ -253,6 +253,8 @@ public class BabyBookbuildingService { ClassifyModel.setmName(babyModel.getMname()); ClassifyModel.setmCardNo(babyModel.getMcertNo()); ClassifyModel.setmPhone(babyModel.getMphone()); + ClassifyModel.setVcCardNo(babyModel.getVcCardNo()); + ClassifyModel.setsINCard(babyModel.getsINCard()); babyBuildClassifyService.add(ClassifyModel); } catch (Exception e) { throw new RuntimeException(e); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyBuildClassifyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyBuildClassifyModel.java index 67915ce..b0c40a2 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyBuildClassifyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyBuildClassifyModel.java @@ -62,6 +62,14 @@ public class BabyBuildClassifyModel extends BaseModel { *母亲手机号码 */ private String mPhone; + /** + *建档社保卡 + */ + private String sINCard; + /** + *建档就诊卡 + */ + private String vcCardNo; public String getId() { return id; @@ -182,4 +190,20 @@ public class BabyBuildClassifyModel extends BaseModel { public void setHospitalId(String hospitalId) { this.hospitalId = hospitalId; } + + public String getsINCard() { + return sINCard; + } + + public void setsINCard(String sINCard) { + this.sINCard = sINCard; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyBuildClassifyQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyBuildClassifyQuery.java index b50af0e..5e40e83 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyBuildClassifyQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyBuildClassifyQuery.java @@ -59,10 +59,6 @@ public class BabyBuildClassifyQuery extends BaseQuery implements IConvertToNativ */ private Integer isCheck; /** - * 姓名 - */ - private String name; - /** * 性别 */ private Integer sex; @@ -75,17 +71,10 @@ public class BabyBuildClassifyQuery extends BaseQuery implements IConvertToNativ */ private Date birthEnd; /** - *母亲姓名 + * 查询号（儿童姓名、母亲姓名、母亲身份证号、手机号、社保卡、就诊卡） */ - private String mName; - /** - *母亲证件号 - */ - private String mCardNo; - /** - *母亲手机号码 - */ - private String mPhone; + private String queryNo; + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -105,25 +94,21 @@ public class BabyBuildClassifyQuery extends BaseQuery implements IConvertToNativ if (null != isCheck) { condition = condition.and("isCheck", isCheck, MongoOper.IS); } - if (StringUtils.isNotEmpty( name)) { - condition = condition.and("name", name, MongoOper.IS); - } - if (null != sex) { - condition = condition.and("sex", sex, MongoOper.IS); - } - if (StringUtils.isNotEmpty( mName)) { - condition = condition.and("mName", mName, MongoOper.IS); - } - if (StringUtils.isNotEmpty( mCardNo)) { - condition = condition.and("mCardNo", mCardNo, MongoOper.IS); - } - if (StringUtils.isNotEmpty( mPhone)) { - condition = condition.and("mPhone", mPhone, MongoOper.IS); - } if (null!=monthAge) { condition = condition.and("monthAge", monthAge, MongoOper.IS); } + if (StringUtils.isNotEmpty(queryNo)) { + MongoCondition con1 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE); + MongoCondition con2 = MongoCondition.newInstance("mname", queryNo, MongoOper.LIKE); + MongoCondition con3 = MongoCondition.newInstance("mCardNo", queryNo, MongoOper.LIKE); + MongoCondition con4 = MongoCondition.newInstance("mCardNo", queryNo, MongoOper.LIKE); + MongoCondition con5 = MongoCondition.newInstance("mPhone", queryNo, MongoOper.LIKE); + MongoCondition con6 = MongoCondition.newInstance("sINCard", queryNo, MongoOper.LIKE); + MongoCondition con7 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.LIKE); + condition = condition.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5, con6, con7}); + } + Criteria c = null; if (null != createdStart && createdEnd != null) { @@ -162,6 +147,15 @@ public class BabyBuildClassifyQuery extends BaseQuery implements IConvertToNativ return condition.toMongoQuery(); } + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } + public String getId() { return id; } @@ -219,14 +213,6 @@ public class BabyBuildClassifyQuery extends BaseQuery implements IConvertToNativ this.isCheck = isCheck; } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - public Integer getSex() { return sex; } @@ -235,30 +221,6 @@ public class BabyBuildClassifyQuery extends BaseQuery implements IConvertToNativ this.sex = sex; } - public String getmName() { - return mName; - } - - public void setmName(String mName) { - this.mName = mName; - } - - public String getmCardNo() { - return mCardNo; - } - - public void setmCardNo(String mCardNo) { - this.mCardNo = mCardNo; - } - - public String getmPhone() { - return mPhone; - } - - public void setmPhone(String mPhone) { - this.mPhone = mPhone; - } - public String getHospitalId() { return hospitalId; } -- 1.8.3.1