From f8ab6c6140f25c375089d768c8181e79b7ac7005 Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 1 Apr 2021 16:41:29 +0800 Subject: [PATCH] update --- .../operate/web/facade/AntExRecordFacade.java | 1 + .../operate/web/facade/MatDeliverFacade.java | 35 ++++++++++++++++++++-- .../operate/web/facade/TrackDownFacade.java | 19 ++++++++++++ .../web/request/AntExManagerQueryRequest.java | 11 +++++++ .../web/request/ChildbirthManagerRequest.java | 31 +++++++++++++++++++ .../operate/web/request/TrackDownQueryRequest.java | 30 +++++++++++++++++++ 6 files changed, 125 insertions(+), 2 deletions(-) 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 45c8d63..57fa674 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 @@ -335,6 +335,7 @@ public class AntExRecordFacade { } AntExRecordQuery antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion, isPage); + antExRecordQuery.setType(antExManagerQueryRequest.getType());//查询初诊数据 if (CollectionUtils.isNotEmpty(patientses)) { List parentIds = new LinkedList<>(); for (Patients pa : patientses) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 33e3e11..02a393f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -30,6 +30,7 @@ import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections.Transformer; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -2624,6 +2625,25 @@ public class MatDeliverFacade { matDeliverQuery.setParentIdList(parentIdList); } + //初诊医院查询 + if (childbirthManagerRequest.getCzHospitalId() != null) { + AntExChuQuery antExChuQuery1 = new AntExChuQuery(); + antExChuQuery1.setHospitalId(childbirthManagerRequest.getCzHospitalId()); + antExChuQuery1.setCheckTimeStart(DateUtil.getDayStartTime(DateUtil.parseYMD(childbirthManagerRequest.getCzDateStart()))); + antExChuQuery1.setCheckTimeEnd(DateUtil.getDayEndTime(DateUtil.parseYMD(childbirthManagerRequest.getCzDateEnd()))); + antExChuQuery1.setYn(YnEnums.YES.getId()); + List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); + List ids = (List ) CollectionUtils.collect(data1, new Transformer() { + @Override + public Object transform(Object o) { + AntExChuModel antExChuModel = (AntExChuModel) o; + return antExChuModel.getParentId(); + } + }); + matDeliverQuery.setParentIdList(ids); + } + + /**********增加产后观察，观察状态条件查询**********/ if (StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())) { PostpartumRecordsQuery prQuery = new PostpartumRecordsQuery(); @@ -2667,8 +2687,19 @@ public class MatDeliverFacade { maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); // 这里就设置分页内容 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); - } else {//否则按常规查询 - maternalDeliverModelList = matDeliverService.query(matDeliverQuery); + } else { + //秦皇岛要是有初诊医院查询，支持分页正确加的，以前逻辑不知道所以保留了 + if(StringUtils.isNotEmpty(childbirthManagerRequest.getCzHospitalId())){ + matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); + matDeliverQuery.setPage(childbirthManagerRequest.getPage()); + matDeliverQuery.setNeed("need"); + maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); + // 这里就设置分页内容 + childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); + + }else {//否则按常规查询 + maternalDeliverModelList = matDeliverService.query(matDeliverQuery); + } } Map patientsMap = new HashedMap(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index c6f540d..bfd2730 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -26,6 +26,7 @@ import com.mongodb.BasicDBObject; import com.mongodb.DBObject; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.Transformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -834,6 +835,24 @@ public class TrackDownFacade { pageResult.setGrid(new ArrayList<>()); return RespBuilder.buildSuccess(pageResult); } + //初诊医院查询 + if (downQueryRequest.getCzHospitalId() != null) { + AntExChuQuery antExChuQuery1 = new AntExChuQuery(); + antExChuQuery1.setHospitalId(downQueryRequest.getCzHospitalId()); + antExChuQuery1.setCheckTimeStart(DateUtil.getDayStartTime(DateUtil.parseYMD(downQueryRequest.getCzDateStart()))); + antExChuQuery1.setCheckTimeEnd(DateUtil.getDayEndTime(DateUtil.parseYMD(downQueryRequest.getCzDateEnd()))); + antExChuQuery1.setYn(YnEnums.YES.getId()); + List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); + List ids = (List ) CollectionUtils.collect(data1, new Transformer() { + @Override + public Object transform(Object o) { + AntExChuModel antExChuModel = (AntExChuModel) o; + return antExChuModel.getParentId(); + } + }); + downRecordQuery.setParentIds(ids); + } + List downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery); List data = new ArrayList<>(); TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index 242fd52..37bc5f7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -15,6 +15,9 @@ import java.util.Date; */ @Form public class AntExManagerQueryRequest extends BasePageQueryRequest { + + //类型 1 复诊 2 初诊 + private Integer type; /*滦平 start 20201105 */ //产检医生 private String checkDoctor; @@ -129,6 +132,14 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { return deuStatus; } + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public void setDeuStatus(Integer deuStatus) { this.deuStatus = deuStatus; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index db8f85c..be15fec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -120,6 +120,13 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { */ private String hospitalId; + //初诊医院 + private String czHospitalId; + //初诊时间 + private String czDateStart; + private String czDateEnd; + + /** * @auther HuJiaqi * @createTime 2016年12月21日 10时56分 @@ -382,6 +389,30 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { this.startAge = startAge; } + public String getCzHospitalId() { + return czHospitalId; + } + + public void setCzHospitalId(String czHospitalId) { + this.czHospitalId = czHospitalId; + } + + public String getCzDateStart() { + return czDateStart; + } + + public void setCzDateStart(String czDateStart) { + this.czDateStart = czDateStart; + } + + public String getCzDateEnd() { + return czDateEnd; + } + + public void setCzDateEnd(String czDateEnd) { + this.czDateEnd = czDateEnd; + } + public String getEndAge() { return endAge; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java index b3d3a09..06e09f8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java @@ -15,6 +15,12 @@ import java.util.Date; * @since BME V100R001C40B104 */ public class TrackDownQueryRequest extends BasePageQueryRequest { + //初诊医院 + private String czHospitalId; + //初诊时间 + private String czDateStart; + private String czDateEnd; + private String provinceId; private String cityId; private String areaId; @@ -144,6 +150,30 @@ public class TrackDownQueryRequest extends BasePageQueryRequest { this.beOverdueDaysStart = beOverdueDaysStart; } + public String getCzHospitalId() { + return czHospitalId; + } + + public void setCzHospitalId(String czHospitalId) { + this.czHospitalId = czHospitalId; + } + + public String getCzDateStart() { + return czDateStart; + } + + public void setCzDateStart(String czDateStart) { + this.czDateStart = czDateStart; + } + + public String getCzDateEnd() { + return czDateEnd; + } + + public void setCzDateEnd(String czDateEnd) { + this.czDateEnd = czDateEnd; + } + public Integer getBeOverdueDaysEnd() { return beOverdueDaysEnd; } -- 1.8.3.1