diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index ba7ab66..415587e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -153,7 +153,7 @@ public class Patients extends BaseModel { private String cityPostRestId; private String areaPostRestId; private String streetPostRestId; - + private List childExtAddrs; /** * 孕妇居住地 @@ -284,6 +284,14 @@ public class Patients extends BaseModel { //面部信息 private String face; + public List getChildExtAddrs() { + return childExtAddrs; + } + + public void setChildExtAddrs(List childExtAddrs) { + this.childExtAddrs = childExtAddrs; + } + public String getShortCode() { return shortCode; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index f0ff34f..4e06028 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1165,6 +1165,7 @@ public class BookbuildingFacade { */ public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) { Patients patient = new Patients(); + patient.setChildExtAddrs(yunRequest.getChildExtAddrs()); patient.setSendCareMan(yunRequest.getSendCareMan()); patient.setReqHusband(yunRequest.getReqHusband()); patient.setFuckLastMens(DateUtil.parseYMD(yunRequest.getFuckLastMens())); @@ -1359,6 +1360,7 @@ public class BookbuildingFacade { public PregnantInfoResult getResult(Patients p) { PregnantInfoResult result = new PregnantInfoResult(); + result.setChildExtAddrs(p.getChildExtAddrs()); result.setReqHusband(p.getReqHusband()); result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther()); result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getFuckLastMens())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index f80d785..92439a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -193,7 +193,7 @@ public class ViewFacade { map.put("register", CommonsHelper.getResidence(data.getProvinceRegisterId(), data.getCityRegisterId(), data.getAreaRegisterId(), data.getStreetRegisterId(), data.getAddressRegister(), basicConfigService)); map.put("postRest", CommonsHelper.getResidence(data.getProvincePostRestId(), data.getCityPostRestId(), - data.getAreaPostRestId(), data.getStreetPostRestId(), data.getAddressPostRest(), basicConfigService)); + data.getAreaPostRestId(), data.getStreetPostRestId(), data.getChildExtAddrs(),data.getAddressPostRest(), basicConfigService)); /* 丈夫信息 */ map.put("husbandName", data.getHusbandName()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 8ab1413..7563624 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -240,6 +240,7 @@ public class YunBookbuildingAddRequest { private String childbirthCityId; private String childbirthAreaId; private String childbirthStreetId; + private List childExtAddrs; /***********孕妇联系方式***********/ @@ -349,6 +350,14 @@ public class YunBookbuildingAddRequest { @NotEmpty(message = "填写日期") private String fillDate; + public List getChildExtAddrs() { + return childExtAddrs; + } + + public void setChildExtAddrs(List childExtAddrs) { + this.childExtAddrs = childExtAddrs; + } + public String getHusbandBirth() { return husbandBirth; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index bfe53d2..8773eea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -211,6 +211,7 @@ public class PregnantInfoResult { private String childbirthCityId; private String childbirthAreaId; private String childbirthStreetId; + private List childExtAddrs; /***********孕妇联系方式***********/ @@ -288,6 +289,14 @@ public class PregnantInfoResult { //分娩状态 0未终止妊娠 1终止妊娠 private Integer dueStatus; + public List getChildExtAddrs() { + return childExtAddrs; + } + + public void setChildExtAddrs(List childExtAddrs) { + this.childExtAddrs = childExtAddrs; + } + public String getHusbandBirth() { return husbandBirth; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index 7f42745..5d0f844 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -173,16 +173,20 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit @Override public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit) { String hospitalId = autoMatchFacade.getHospitalId(userId); - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); + Criteria criteria = Criteria.where("hospitalId").is(hospitalId); if(startDate != null && endDate != null) { criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1)); } if(StringUtils.isNotBlank(doctor)) { criteria.and("doctor").is(doctor); } + criteria.andOperator(new Criteria().orOperator(Criteria.where("yn").is(1),Criteria.where("dataStatus").is(1).andOperator(Criteria.where("yn").is(0)))); if(StringUtils.isNotBlank(key)) { Criteria c = new Criteria(); - c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0); + // c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0); + c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)); + c.andOperator(new Criteria().orOperator(Criteria.where("yn").is(1),Criteria.where("dataStatus").is(1).andOperator(Criteria.where("yn").is(0)))); + List babyModels = mongoUtil.findField(BabyModel.class, c, "id"); List babyIds = CollectionUtils.getId(babyModels, "id", String.class); criteria.and("babyId").in(babyIds); 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 dd6e05b..6fd0ac5 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 @@ -14,6 +14,7 @@ import com.lyms.platform.pojo.Patients; import org.apache.commons.lang.StringUtils; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -76,6 +77,35 @@ public final class CommonsHelper { } return sb.toString(); } + public static String getResidence(String provinceId, + String cityId, + String areaId, + String streetId, + List childExtAddrs, + String address, BasicConfigService basicConfigService) { + StringBuilder sb = new StringBuilder(); + if (StringUtils.isNotEmpty(provinceId)) { + sb.append(getName1(provinceId,basicConfigService)); + } + if (StringUtils.isNotEmpty(cityId)) { + sb.append(getName1(cityId,basicConfigService)); + } + if (StringUtils.isNotEmpty(areaId)) { + sb.append(getName1(areaId,basicConfigService)); + } + if (StringUtils.isNotEmpty(streetId)){ + sb.append(getName1(streetId,basicConfigService)); + } + if(CollectionUtils.isNotEmpty(childExtAddrs)){ + for(String ch:childExtAddrs){ + sb.append(getName1(ch,basicConfigService)); + } + } + if (StringUtils.isNotEmpty(address)) { + sb.append(address); + } + return sb.toString(); + } public static String getName1(String id, BasicConfigService basicConfigService) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java index 47e348b..b5b421e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java @@ -172,6 +172,7 @@ public class MongoUtil { } Query query = new BasicQuery(dbObject, fieldObject); query.addCriteria(criteria); + System.out.println(query.toString()); List list = mongoTemplate.find(query, clazz); return list; }