diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java index bec4311..b4bfcfd 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java @@ -3,6 +3,7 @@ package com.lyms.platform.biz.service; import com.lyms.platform.biz.dal.IAntExRecordDao; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.AntExRecordModel; @@ -157,49 +158,6 @@ public class AntExRecordService { syncSingle(parentId); - /* //先删除掉该人的 - AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery(); - antExRecordQuery1.setParentId(parentId); - antExRecordDao.findAndMove(antExRecordQuery1.convertToQuery()); - - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setParentId(parentId); - //复诊 - List list = antExService.queryAntenatalExamination(antExQuery.convertToQuery()); - for (AntenatalExaminationModel antEx : list) { - AntExRecordModel record = convert(antEx); - if (null != record) { - AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); - antExRecordQuery.setParentId(record.getParentId()); - antExRecordQuery.setcId(record.getCheckDoctor()); - Integer count = count(antExRecordQuery); - if (null == count || 0 == count) { - antExRecordDao.addOneRecord(record); - } - } - } - - //初诊 - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setParentId(parentId); - List antExChuModelList = antExService.queryAntExChu(antExChuQuery.convertToQuery()); - - if (CollectionUtils.isNotEmpty(antExChuModelList)) { - for (AntExChuModel antEx : antExChuModelList) { - AntExRecordModel record = convert(antEx); - if (null != record) { - AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); - antExRecordQuery.setParentId(record.getParentId()); - antExRecordQuery.setcId(record.getCheckDoctor()); - Integer count = count(antExRecordQuery); - if (null == count || 0 == count) { - antExRecordDao.addOneRecord(record); - } - } - } - }*/ } @@ -238,12 +196,21 @@ public class AntExRecordService { } else { antExRecordModel.setStatus(1); } + antExRecordModel.setcDay(DateUtil.daysBetween(patients.getLastMenses(),antEx.getCheckDate())); antExRecordModel.setCardNo(patients.getCardNo()); - antExRecordModel.setAddressRegister(patients.getAddressRegister()); - antExRecordModel.setProvinceRegisterId(patients.getProvinceRegisterId()); - antExRecordModel.setCityRegisterId(patients.getCityRegisterId()); - antExRecordModel.setAreaRegisterId(patients.getAreaRegisterId()); - antExRecordModel.setStreetRegisterId(patients.getStreetRegisterId()); + //户籍地和居住地2个是相反的 + antExRecordModel.setAddressRegister(patients.getAddress()); + antExRecordModel.setProvinceRegisterId(patients.getProvinceId()); + antExRecordModel.setCityRegisterId(patients.getCityId()); + antExRecordModel.setAreaRegisterId(patients.getAreaId()); + antExRecordModel.setStreetRegisterId(patients.getStreetId()); + //户籍地和居住地2个是相反的 + antExRecordModel.setStreetId(patients.getStreetRegisterId()); + antExRecordModel.setAddress(patients.getAddressRegister()); + antExRecordModel.setProvinceId(patients.getProvinceRegisterId()); + antExRecordModel.setCityId(patients.getCityRegisterId()); + antExRecordModel.setAreaId(patients.getAreaRegisterId()); + antExRecordModel.setBuildDoctor(patients.getBookbuildingDoctor()); antExRecordModel.setDueDate(patients.getDueDate()); antExRecordModel.setPhone(patients.getPhone()); @@ -252,9 +219,6 @@ public class AntExRecordService { antExRecordModel.setLastMenses(patients.getLastMenses()); antExRecordModel.setDueDate(patients.getDueDate()); antExRecordModel.setName(patients.getUsername()); - /* antExRecordModel.sethScore(null==patients.getRiskScore()?0:patients.getRiskScore()); - antExRecordModel.sethRisk(patients.getRiskFactorId()); - antExRecordModel.sethLevel(JsonUtil.toList(patients.getRiskLevelId(), List.class));*/ } else { logger.info("antex find patient by id is null. parentId:" + antEx.getParentId()); return null; @@ -274,6 +238,7 @@ public class AntExRecordService { antExRecordModel.setBarCode(antExChuModel.getBarCode()); antExRecordModel.setCheckTime(antExChuModel.getCheckTime()); antExRecordModel.setNextCheckTime(antExChuModel.getNextCheckTime()); + //高危信息 List li = null; try { @@ -295,12 +260,23 @@ public class AntExRecordService { } else { antExRecordModel.setStatus(1); } + antExRecordModel.setcDay(DateUtil.daysBetween(patients.getLastMenses(),antExChuModel.getCheckTime())); + + //户籍地和居住地2个是相反的 + antExRecordModel.setAddressRegister(patients.getAddress()); + antExRecordModel.setProvinceRegisterId(patients.getProvinceId()); + antExRecordModel.setCityRegisterId(patients.getCityId()); + antExRecordModel.setAreaRegisterId(patients.getAreaId()); + antExRecordModel.setStreetRegisterId(patients.getStreetId()); + //户籍地和居住地2个是相反的 + antExRecordModel.setStreetId(patients.getStreetRegisterId()); + antExRecordModel.setAddress(patients.getAddressRegister()); + antExRecordModel.setProvinceId(patients.getProvinceRegisterId()); + antExRecordModel.setCityId(patients.getCityRegisterId()); + antExRecordModel.setAreaId(patients.getAreaRegisterId()); + antExRecordModel.setCardNo(patients.getCardNo()); - antExRecordModel.setAddressRegister(patients.getAddressRegister()); - antExRecordModel.setProvinceRegisterId(patients.getProvinceRegisterId()); - antExRecordModel.setCityRegisterId(patients.getCityRegisterId()); - antExRecordModel.setAreaRegisterId(patients.getAreaRegisterId()); - antExRecordModel.setStreetRegisterId(patients.getStreetRegisterId()); + antExRecordModel.setBuildDoctor(patients.getBookbuildingDoctor()); antExRecordModel.setDueDate(patients.getDueDate()); antExRecordModel.setPhone(patients.getPhone()); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java index fa42823..db640a9 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java @@ -26,6 +26,8 @@ public class AntExRecordModel extends BaseModel { private String barCode; private String cardNo; + //产检后的天数 + private Integer cDay; private String parentId; @@ -65,12 +67,67 @@ public class AntExRecordModel extends BaseModel { private Date created; //下次产检时间 private Date nextCheckTime; - + //户籍地 private String addressRegister; private String provinceRegisterId; private String cityRegisterId; private String areaRegisterId; private String streetRegisterId; + //居住地 + private String address; + private String provinceId; + private String cityId; + private String areaId; + private String streetId; + + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + + public Integer getcDay() { + return cDay; + } + + public void setcDay(Integer cDay) { + this.cDay = cDay; + } public String getCardNo() { return cardNo; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index 35332c5..59428a9 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -37,6 +37,64 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery private Date birthEnd; private Date birthStart; + //户籍地 + private String provinceRegisterId; + private String cityRegisterId; + private String areaRegisterId; + + //居住地 + private String provinceId; + private String cityId; + private String areaId; + + public String getProvinceRegisterId() { + return provinceRegisterId; + } + + public void setProvinceRegisterId(String provinceRegisterId) { + this.provinceRegisterId = provinceRegisterId; + } + + public String getCityRegisterId() { + return cityRegisterId; + } + + public void setCityRegisterId(String cityRegisterId) { + this.cityRegisterId = cityRegisterId; + } + + public String getAreaRegisterId() { + return areaRegisterId; + } + + public void setAreaRegisterId(String areaRegisterId) { + this.areaRegisterId = areaRegisterId; + } + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + public Date getBirthEnd() { return birthEnd; } @@ -295,6 +353,27 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("fId", fId, MongoOper.IS); } + //居住地 + if (StringUtils.isNotEmpty(areaId)) { + condition = condition.and("areaId", areaId, MongoOper.IS); + } + if(StringUtils.isNotEmpty(cityId)){ + condition = condition.and("cityId", cityId, MongoOper.IS); + } + if(StringUtils.isNotEmpty(provinceId)){ + condition = condition.and("provinceId", provinceId, MongoOper.IS); + } + //户籍地 + if(StringUtils.isNotEmpty(provinceRegisterId)){ + condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS); + } + if(StringUtils.isNotEmpty(cityRegisterId)){ + condition = condition.and("cityRegisterId", cityRegisterId, MongoOper.IS); + } + if(StringUtils.isNotEmpty(areaRegisterId)){ + condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS); + } + if (null != hospitalId) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index ae18835..02f313f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -82,6 +82,14 @@ public class AntExRecordFacade { antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel()); antExRecordQuery.setBarCode(antExManagerQueryRequest.getBarCode()); antExRecordQuery.setCardNo(antExManagerQueryRequest.getCardNo()); + antExRecordQuery.setProvinceRegisterId(antExManagerQueryRequest.getProvinceRegisterId()); + antExRecordQuery.setCityRegisterId(antExManagerQueryRequest.getCityRegisterId()); + antExRecordQuery.setAreaRegisterId(antExManagerQueryRequest.getAreaRegisterId()); + antExRecordQuery.setProvinceId(antExManagerQueryRequest.getProvinceId()); + antExRecordQuery.setCityId(antExManagerQueryRequest.getCityId()); + antExRecordQuery.setAreaId(antExManagerQueryRequest.getAreaId()); + + //产检日期 Date currentDate = DateUtil.formatDate(new Date());