jiangjiazhi / regional-platform

Commit f8ab6c6140f25c375089d768c8181e79b7ac7005

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

update

Showing 6 changed files with 125 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java

...	...	@@ -335,6 +335,7 @@
335	335	}
336	336
337	337	AntExRecordQuery antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion, isPage);
	338	+ antExRecordQuery.setType(antExManagerQueryRequest.getType());//查询初诊数据
338	339	if (CollectionUtils.isNotEmpty(patientses)) {
339	340	List<String> parentIds = new LinkedList<>();
340	341	for (Patients pa : patientses) {

...	...	@@ -30,6 +30,7 @@
30	30	import com.lyms.platform.query.*;
31	31	import org.apache.commons.collections.CollectionUtils;
32	32	import org.apache.commons.collections.MapUtils;
	33	+import org.apache.commons.collections.Transformer;
33	34	import org.apache.commons.collections.map.HashedMap;
34	35	import org.apache.commons.lang.StringUtils;
35	36	import org.apache.commons.lang.math.NumberUtils;
...	...	@@ -2624,6 +2625,25 @@
2624	2625	matDeliverQuery.setParentIdList(parentIdList);
2625	2626	}
2626	2627
	2628	+ //初诊医院查询
	2629	+ if (childbirthManagerRequest.getCzHospitalId() != null) {
	2630	+ AntExChuQuery antExChuQuery1 = new AntExChuQuery();
	2631	+ antExChuQuery1.setHospitalId(childbirthManagerRequest.getCzHospitalId());
	2632	+ antExChuQuery1.setCheckTimeStart(DateUtil.getDayStartTime(DateUtil.parseYMD(childbirthManagerRequest.getCzDateStart())));
	2633	+ antExChuQuery1.setCheckTimeEnd(DateUtil.getDayEndTime(DateUtil.parseYMD(childbirthManagerRequest.getCzDateEnd())));
	2634	+ antExChuQuery1.setYn(YnEnums.YES.getId());
	2635	+ List <AntExChuModel> data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1);
	2636	+ List <String> ids = (List <String>) CollectionUtils.collect(data1, new Transformer() {
	2637	+ @Override
	2638	+ public Object transform(Object o) {
	2639	+ AntExChuModel antExChuModel = (AntExChuModel) o;
	2640	+ return antExChuModel.getParentId();
	2641	+ }
	2642	+ });
	2643	+ matDeliverQuery.setParentIdList(ids);
	2644	+ }
	2645	+
	2646	+
2627	2647	/********增加产后观察，观察状态条件查询********/
2628	2648	if (StringUtils.isNotEmpty(childbirthManagerRequest.getGcStatus())) {
2629	2649	PostpartumRecordsQuery prQuery = new PostpartumRecordsQuery();
...	...	@@ -2667,8 +2687,19 @@
2667	2687	maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
2668	2688	// 这里就设置分页内容
2669	2689	childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
2670		- } else {//否则按常规查询
2671		- maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
	2690	+ } else {
	2691	+ //秦皇岛要是有初诊医院查询，支持分页正确加的，以前逻辑不知道所以保留了
	2692	+ if(StringUtils.isNotEmpty(childbirthManagerRequest.getCzHospitalId())){
	2693	+ matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
	2694	+ matDeliverQuery.setPage(childbirthManagerRequest.getPage());
	2695	+ matDeliverQuery.setNeed("need");
	2696	+ maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
	2697	+ // 这里就设置分页内容
	2698	+ childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
	2699	+
	2700	+ }else {//否则按常规查询
	2701	+ maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
	2702	+ }
2672	2703	}
2673	2704
2674	2705	Map <String, Patients> patientsMap = new HashedMap();

...	...	@@ -26,6 +26,7 @@
26	26	import com.mongodb.DBObject;
27	27	import net.sf.json.JSONObject;
28	28	import org.apache.commons.collections.CollectionUtils;
	29	+import org.apache.commons.collections.Transformer;
29	30	import org.slf4j.Logger;
30	31	import org.slf4j.LoggerFactory;
31	32	import org.springframework.beans.factory.annotation.Autowired;
...	...	@@ -834,6 +835,24 @@
834	835	pageResult.setGrid(new ArrayList<>());
835	836	return RespBuilder.buildSuccess(pageResult);
836	837	}
	838	+ //初诊医院查询
	839	+ if (downQueryRequest.getCzHospitalId() != null) {
	840	+ AntExChuQuery antExChuQuery1 = new AntExChuQuery();
	841	+ antExChuQuery1.setHospitalId(downQueryRequest.getCzHospitalId());
	842	+ antExChuQuery1.setCheckTimeStart(DateUtil.getDayStartTime(DateUtil.parseYMD(downQueryRequest.getCzDateStart())));
	843	+ antExChuQuery1.setCheckTimeEnd(DateUtil.getDayEndTime(DateUtil.parseYMD(downQueryRequest.getCzDateEnd())));
	844	+ antExChuQuery1.setYn(YnEnums.YES.getId());
	845	+ List <AntExChuModel> data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1);
	846	+ List <String> ids = (List <String>) CollectionUtils.collect(data1, new Transformer() {
	847	+ @Override
	848	+ public Object transform(Object o) {
	849	+ AntExChuModel antExChuModel = (AntExChuModel) o;
	850	+ return antExChuModel.getParentId();
	851	+ }
	852	+ });
	853	+ downRecordQuery.setParentIds(ids);
	854	+ }
	855	+
837	856	List<TrackDownRecord> downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery);
838	857	List<Map> data = new ArrayList<>();
839	858	TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType());

...	...	@@ -15,6 +15,9 @@
15	15	*/
16	16	@Form
17	17	public class AntExManagerQueryRequest extends BasePageQueryRequest {
	18	+
	19	+ //类型 1 复诊 2 初诊
	20	+ private Integer type;
18	21	/滦平 start 20201105 /
19	22	//产检医生
20	23	private String checkDoctor;
...	...	@@ -127,6 +130,14 @@
127	130
128	131	public Integer getDeuStatus() {
129	132	return deuStatus;
	133	+ }
	134	+
	135	+ public Integer getType() {
	136	+ return type;
	137	+ }
	138	+
	139	+ public void setType(Integer type) {
	140	+ this.type = type;
130	141	}
131	142
132	143	public void setDeuStatus(Integer deuStatus) {

...	...	@@ -120,6 +120,13 @@
120	120	*/
121	121	private String hospitalId;
122	122
	123	+ //初诊医院
	124	+ private String czHospitalId;
	125	+ //初诊时间
	126	+ private String czDateStart;
	127	+ private String czDateEnd;
	128	+
	129	+
123	130	/**
124	131	* @auther HuJiaqi
125	132	* @createTime 2016年12月21日 10时56分
...	...	@@ -380,6 +387,30 @@
380	387
381	388	public void setStartAge(String startAge) {
382	389	this.startAge = startAge;
	390	+ }
	391	+
	392	+ public String getCzHospitalId() {
	393	+ return czHospitalId;
	394	+ }
	395	+
	396	+ public void setCzHospitalId(String czHospitalId) {
	397	+ this.czHospitalId = czHospitalId;
	398	+ }
	399	+
	400	+ public String getCzDateStart() {
	401	+ return czDateStart;
	402	+ }
	403	+
	404	+ public void setCzDateStart(String czDateStart) {
	405	+ this.czDateStart = czDateStart;
	406	+ }
	407	+
	408	+ public String getCzDateEnd() {
	409	+ return czDateEnd;
	410	+ }
	411	+
	412	+ public void setCzDateEnd(String czDateEnd) {
	413	+ this.czDateEnd = czDateEnd;
383	414	}
384	415
385	416	public String getEndAge() {

...	...	@@ -15,6 +15,12 @@
15	15	* @since BME V100R001C40B104
16	16	*/
17	17	public class TrackDownQueryRequest extends BasePageQueryRequest {
	18	+ //初诊医院
	19	+ private String czHospitalId;
	20	+ //初诊时间
	21	+ private String czDateStart;
	22	+ private String czDateEnd;
	23	+
18	24	private String provinceId;
19	25	private String cityId;
20	26	private String areaId;
...	...	@@ -142,6 +148,30 @@
142	148
143	149	public void setBeOverdueDaysStart(Integer beOverdueDaysStart) {
144	150	this.beOverdueDaysStart = beOverdueDaysStart;
	151	+ }
	152	+
	153	+ public String getCzHospitalId() {
	154	+ return czHospitalId;
	155	+ }
	156	+
	157	+ public void setCzHospitalId(String czHospitalId) {
	158	+ this.czHospitalId = czHospitalId;
	159	+ }
	160	+
	161	+ public String getCzDateStart() {
	162	+ return czDateStart;
	163	+ }
	164	+
	165	+ public void setCzDateStart(String czDateStart) {
	166	+ this.czDateStart = czDateStart;
	167	+ }
	168	+
	169	+ public String getCzDateEnd() {
	170	+ return czDateEnd;
	171	+ }
	172	+
	173	+ public void setCzDateEnd(String czDateEnd) {
	174	+ this.czDateEnd = czDateEnd;
145	175	}
146	176
147	177	public Integer getBeOverdueDaysEnd() {