diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index 7f002ab..e6fdff5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -34,6 +34,8 @@ public class PremaritalCheckup extends BaseModel { private String certificateTypeId; //就诊卡号 private String vcCardNo; + //性别类型 + private Integer sexType; /****************** 配偶信息 ********************/ //配偶姓名 @@ -338,6 +340,14 @@ public class PremaritalCheckup extends BaseModel { //婚检医生 private String hunJianDoctor; + public Integer getSexType() { + return sexType; + } + + public void setSexType(Integer sexType) { + this.sexType = sexType; + } + public String getBingGan() { return bingGan; } 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 79f2fae..16613f4 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 @@ -45,6 +45,9 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ private String hunJianDoctor; //医学意见 private Integer yiXueYiJian; + //性别类型 + private Integer sexType; + @Override public MongoQuery convertToQuery() { @@ -70,6 +73,9 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ if (yn!=null) { condition = condition.and("yn", yn, MongoOper.IS); } + if (sexType!=null) { + condition = condition.and("sexType", sexType, MongoOper.IS); + } if (publishId!=null) { condition = condition.and("publishId", publishId, MongoOper.IS); } @@ -105,6 +111,14 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ return condition.toMongoQuery(); } + public Integer getSexType() { + return sexType; + } + + public void setSexType(Integer sexType) { + this.sexType = sexType; + } + public String getId() { return id; } 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 1d50711..0502bbb 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 @@ -11,6 +11,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest; import com.lyms.platform.operate.web.request.PremaritalCheckupQueryRequest; import com.lyms.platform.operate.web.result.PremaritalCheckupHistoryResult; @@ -188,6 +189,7 @@ public class PremaritalCheckupFacade { query.setYiXueYiJian(request.getYiXueYiJian()); query.setPremaritalUpTimeStart(request.getPremaritalUpTimeStart()); query.setPremaritalUpTimeEnd(request.getPremaritalUpTimeEnd()); + query.setSexType(request.getSexType()); if (CollectionUtils.isNotEmpty(parentIds)){ for (String parentId : parentIds){ @@ -265,6 +267,11 @@ public class PremaritalCheckupFacade { String id = null; PremaritalCheckup checkup = new PremaritalCheckup(); + if (model.getSex() != null && model.getSex()== SystemConfig.WOMAN_ID){ + checkup.setSexType(1); + }else { + checkup.setSexType(2); + } /* 配偶信息 */ if (addRequest.getDeliverStatus()!=null && addRequest.getDeliverStatus()==1){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java index 38f8385..c8644bf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java @@ -26,6 +26,16 @@ public class PremaritalCheckupQueryRequest extends BasePageQueryRequest{ private Integer yiXueYiJian; //医院ID private String hospitalId; + //性别类型 + private Integer sexType; + + public Integer getSexType() { + return sexType; + } + + public void setSexType(Integer sexType) { + this.sexType = sexType; + } public String getHospitalId() { return hospitalId;