jiangjiazhi / regional-platform

Commit 8ba9986e99128809464266f62b6a951a3c65d101

Authored by shiyang about 4 years ago

Exists in master and in 6 other branches

update

Showing 4 changed files with 58 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.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/request/ChildbirthManagerRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java

...	...	@@ -356,6 +356,20 @@
356	356	this.deliverDoctor = deliverDoctor;
357	357	}
358	358
	359	+ /**抛宫产次数类型
	360	+ * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产
	361	+ */
	362	+ private Integer cesareanTimeType;
	363	+
	364	+ public Integer getCesareanTimeType() {
	365	+ return cesareanTimeType;
	366	+ }
	367	+
	368	+ public void setCesareanTimeType(Integer cesareanTimeType) {
	369	+ this.cesareanTimeType = cesareanTimeType;
	370	+ }
	371	+ /****************************************************/
	372	+
359	373	@Override
360	374	public MongoQuery convertToQuery() {
361	375	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -464,6 +478,11 @@
464	478	if (null != deliveryMode) {
465	479	condition = condition.and("deliveryMode", deliveryMode, MongoOper.IS);
466	480	}
	481	+ //抛宫产次数类型
	482	+ if(null!=cesareanTimeType){
	483	+ condition=condition.and("cesareanTimeType",cesareanTimeType,MongoOper.IS);
	484	+ }
	485	+
467	486	if (null != hospitalId) {
468	487	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
469	488	}

...	...	@@ -2741,6 +2741,10 @@
2741	2741	matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
2742	2742	matDeliverQuery.setPage(childbirthManagerRequest.getPage());
2743	2743	matDeliverQuery.setNeed("need");
	2744	+ //抛宫产次数类型
	2745	+ if(null!=childbirthManagerRequest.getCesareanTimeType()){
	2746	+ matDeliverQuery.setCesareanTimeType(childbirthManagerRequest.getCesareanTimeType());
	2747	+ }
2744	2748
2745	2749	maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
2746	2750	// 这里就设置分页内容

...	...	@@ -538,6 +538,21 @@
538	538	this.areaQueryMap = areaQueryMap;
539	539	}
540	540
	541	+ /**抛宫产次数类型
	542	+ * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产
	543	+ */
	544	+ private Integer cesareanTimeType;
	545	+
	546	+ public Integer getCesareanTimeType() {
	547	+ return cesareanTimeType;
	548	+ }
	549	+
	550	+ public void setCesareanTimeType(Integer cesareanTimeType) {
	551	+ this.cesareanTimeType = cesareanTimeType;
	552	+ }
	553	+
	554	+ /****************************************************/
	555	+
541	556	public ChildbirthManagerRequest() {
542	557	Map<String, String> initQueryMap = new LinkedHashMap<>();
543	558	initQueryMap.put("dueDate", "分娩日期");
...	...	@@ -546,6 +561,7 @@
546	561	initQueryMap.put("cardNo", "证件号");
547	562	initQueryMap.put("dueWeek", "分娩孕周");
548	563	initQueryMap.put("deliveryMode", "分娩方式");
	564	+ initQueryMap.put("cesareanTimeType","抛宫产次数类型");
549	565	initQueryMap.put("maternalInfo", "产妇情况");
550	566	initQueryMap.put("tireNumber", "胎数");
551	567	initQueryMap.put("livingNumber", "活产数");
...	...	@@ -623,6 +639,7 @@
623	639	initQueryMapCd.put("ygbmky", "乙肝检测结果");
624	640	initQueryMapCd.put("dueWeek", "分娩孕周");
625	641	initQueryMapCd.put("deliveryMode", "分娩方式");
	642	+ initQueryMapCd.put("cesareanTimeType","抛宫产次数类型");
626	643	initQueryMapCd.put("maternalInfo", "产妇情况");
627	644	initQueryMapCd.put("tireNumber", "胎数");
628	645	initQueryMapCd.put("livingNumber", "活产数");
...	...	@@ -662,6 +679,7 @@
662	679	initQueryMapHs.put("fetalPresentation", "先露");
663	680	initQueryMapHs.put("perinealCondition", "会阴情况");
664	681	initQueryMapHs.put("deliveryMode", "分娩方式");
	682	+ initQueryMapHs.put("cesareanTimeType","抛宫产次数类型");
665	683	initQueryMapHs.put("breath", "呼吸");
666	684	initQueryMapHs.put("needleNum", "缝线针数");
667	685	initQueryMapHs.put("pulse", "脉搏");
...	...	@@ -710,6 +728,7 @@
710	728	normalQueryMap.put("dueWeek", "分娩孕周");
711	729	normalQueryMap.put("handDueWeek", "手动分娩孕周");
712	730	normalQueryMap.put("deliveryMode", "分娩方式");
	731	+ normalQueryMap.put("cesareanTimeType","抛宫产次数类型");
713	732	normalQueryMap.put("maternalInfo", "产妇情况");
714	733	normalQueryMap.put("tireNumber", "胎数");
715	734	normalQueryMap.put("livingNumber", "活产数");
...	...	@@ -732,6 +751,7 @@
732	751	areaQueryMap.put("cardNo", "证件号");
733	752	areaQueryMap.put("dueWeek", "分娩孕周");
734	753	areaQueryMap.put("deliveryMode", "分娩方式");
	754	+ areaQueryMap.put("cesareanTimeType","抛宫产次数类型");
735	755	areaQueryMap.put("maternalInfo", "产妇情况");
736	756	areaQueryMap.put("tireNumber", "胎数");
737	757	areaQueryMap.put("livingNumber", "活产数");

...	...	@@ -435,6 +435,21 @@
435	435	* @discription 分娩机构
436	436	*/
437	437	private String fmHospital;
	438	+
	439	+ /**抛宫产次数类型
	440	+ * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产
	441	+ */
	442	+ private Integer cesareanTimeType;
	443	+
	444	+ public Integer getCesareanTimeType() {
	445	+ return cesareanTimeType;
	446	+ }
	447	+
	448	+ public void setCesareanTimeType(Integer cesareanTimeType) {
	449	+ this.cesareanTimeType = cesareanTimeType;
	450	+ }
	451	+
	452	+ /****************************************************/
438	453	// 院内信息结束
439	454
440	455	private String fmTime;