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 d86c78a..83c831c 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 @@ -29,6 +29,11 @@ public class PreEugenicsBaseModel extends BaseModel { /** + * 条形码 + */ + private String code; + + /** * 版本号 */ private Integer version = 1; 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 6592da1..a083abe 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,10 +17,23 @@ public class CommonParamRequest implements Serializable { private String cardNo; /** - * 编号/就诊卡号.. + * 就诊卡号.. */ private String otherNo; + /** + * 编号/ + */ + private String code; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + public String getCardNo() { return cardNo; } 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 eb4c223..e359511 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 @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.pojo.PreEugenicsBaseModel; + public class PreEugenicsBaseListResult extends PreEugenicsBaseModel { /** @@ -24,6 +25,149 @@ public class PreEugenicsBaseListResult extends PreEugenicsBaseModel { */ private String wifeCurrentAddressStr; + + /** + * 丈夫文化程度id + */ + private String husbandEducationalStr; + + /** + * 丈夫证件类型 + */ + private String husbandCardTypeStr; + + + /** + * 丈夫职业 : 1农民 2工人 3服务业 4经商 5家务 6教师/公务员/职员 7其他 + */ + private String husbandCareerStr; + + + /** + * 丈夫民族id + */ + private String husbandNationStr; + + + /** + * 丈夫户口性质: + * 1农业户口 (含界定为农村居民者) 2.非农业 + */ + private String husbandAccountNatureStr; + + + + /** + * 妻子民族id + */ + private String wifeNationStr; + + + + /** + * 妻子文化程度id + */ + private String wifeEducationalStr; + + /** + * 妻子身份证号码类型 + */ + private String wifeCardTypeStr; + + /** + * 妻子职业 : 1农民 2工人 3服务业 4经商 5家务 6教师/公务员/职员 7其他 + */ + private String wifeCareerStr; + + + + /** + * 妻子户口性质: + * 1农业户口 (含界定为农村居民者) 2.非农业 + */ + private String wifeAccountNatureStr; + + + public String getHusbandEducationalStr() { + return husbandEducationalStr; + } + + public void setHusbandEducationalStr(String husbandEducationalStr) { + this.husbandEducationalStr = husbandEducationalStr; + } + + public String getHusbandCardTypeStr() { + return husbandCardTypeStr; + } + + public void setHusbandCardTypeStr(String husbandCardTypeStr) { + this.husbandCardTypeStr = husbandCardTypeStr; + } + + public String getHusbandCareerStr() { + return husbandCareerStr; + } + + public void setHusbandCareerStr(String husbandCareerStr) { + this.husbandCareerStr = husbandCareerStr; + } + + public String getHusbandNationStr() { + return husbandNationStr; + } + + public void setHusbandNationStr(String husbandNationStr) { + this.husbandNationStr = husbandNationStr; + } + + public String getHusbandAccountNatureStr() { + return husbandAccountNatureStr; + } + + public void setHusbandAccountNatureStr(String husbandAccountNatureStr) { + this.husbandAccountNatureStr = husbandAccountNatureStr; + } + + public String getWifeNationStr() { + return wifeNationStr; + } + + public void setWifeNationStr(String wifeNationStr) { + this.wifeNationStr = wifeNationStr; + } + + public String getWifeEducationalStr() { + return wifeEducationalStr; + } + + public void setWifeEducationalStr(String wifeEducationalStr) { + this.wifeEducationalStr = wifeEducationalStr; + } + + public String getWifeCardTypeStr() { + return wifeCardTypeStr; + } + + public void setWifeCardTypeStr(String wifeCardTypeStr) { + this.wifeCardTypeStr = wifeCardTypeStr; + } + + public String getWifeCareerStr() { + return wifeCareerStr; + } + + public void setWifeCareerStr(String wifeCareerStr) { + this.wifeCareerStr = wifeCareerStr; + } + + public String getWifeAccountNatureStr() { + return wifeAccountNatureStr; + } + + public void setWifeAccountNatureStr(String wifeAccountNatureStr) { + this.wifeAccountNatureStr = wifeAccountNatureStr; + } + 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 150df7a..59a447d 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 @@ -63,6 +63,11 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if (StringUtils.isNotEmpty(otherNo)) { query.addCriteria(new Criteria().orOperator(Criteria.where("husbandNo").is(otherNo), Criteria.where("wifeNo").is(otherNo))); } + String code = param.getCode(); + if (StringUtils.isNotEmpty(otherNo)) { + query.addCriteria(Criteria.where("code").is(code)); + } + PreEugenicsBaseModel one = mongoTemplate.findOne(query, PreEugenicsBaseModel.class); if (one == null) { if (StringUtils.isNotEmpty(cardNo)) { @@ -340,6 +345,18 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen model.getWifeCurrentArea(), model.getWifeCurrentStreet(), model.getWifeCurrentAddress(), basicConfigService)); + + result.setHusbandEducationalStr(CommonsHelper.getName1(model.getHusbandEducational(),basicConfigService)); + result.setHusbandCardTypeStr(CommonsHelper.getName1(model.getHusbandCardType(), basicConfigService)); + result.setHusbandCareerStr(CommonsHelper.getName1(model.getHusbandCareer(), basicConfigService)); + result.setHusbandNationStr(CommonsHelper.getName1(model.getHusbandNation(), basicConfigService)); + result.setHusbandAccountNatureStr(CommonsHelper.getName1(model.getHusbandAccountNature(), basicConfigService)); + result.setWifeNationStr(CommonsHelper.getName1(model.getWifeNation(), basicConfigService)); + result.setWifeEducationalStr(CommonsHelper.getName1(model.getWifeEducational(), basicConfigService)); + result.setWifeCardTypeStr(CommonsHelper.getName1(model.getWifeCardType(), basicConfigService)); + result.setWifeCareerStr(CommonsHelper.getName1(model.getWifeCareer(), basicConfigService)); + result.setWifeAccountNatureStr(CommonsHelper.getName1(model.getWifeAccountNature(), basicConfigService)); + return result; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java index 6fd0ac5..b71a945 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java @@ -109,6 +109,10 @@ public final class CommonsHelper { public static String getName1(String id, BasicConfigService basicConfigService) { + if (StringUtils.isEmpty(id)) + { + return ""; + } BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id); if (basicConfig != null) { return basicConfig.getName();