jiangjiazhi / regional-platform

Authored by liquanyu almost 4 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 40 additions and 3 deletions

...	...	@@ -10,7 +10,6 @@
10	10	import com.lyms.platform.operate.web.request.*;
11	11	import com.lyms.platform.operate.web.service.impl.PreEugebicsServiceImpl;
12	12	import com.lyms.platform.pojo.BasicConfig;
13		-import com.lyms.platform.pojo.CervicalCancerModel;
14	13	import com.lyms.platform.pojo.PreEugenicsBaseModel;
15	14	import org.springframework.beans.factory.annotation.Autowired;
16	15	import org.springframework.stereotype.Controller;
...	...	@@ -23,8 +22,6 @@
23	22	import com.lyms.platform.common.result.BaseResponse;
24	23	import com.lyms.platform.operate.web.service.IPreEugenicsService;
25	24
26		-import java.util.Date;
27		-import java.util.List;
28	25
29	26	/**
30	27	* @author: shuai-Bo

...	...	@@ -38,6 +38,37 @@
38	38	*/
39	39	private Integer checkPackage;
40	40
	41	+ //tbs分类
	42	+ private String tbs;
	43	+ //最后诊断
	44	+ private String zhzdSelect;
	45	+ //组织病理学诊断
	46	+ private String zzblxSelect;
	47	+
	48	+ public String getTbs() {
	49	+ return tbs;
	50	+ }
	51	+
	52	+ public void setTbs(String tbs) {
	53	+ this.tbs = tbs;
	54	+ }
	55	+
	56	+ public String getZhzdSelect() {
	57	+ return zhzdSelect;
	58	+ }
	59	+
	60	+ public void setZhzdSelect(String zhzdSelect) {
	61	+ this.zhzdSelect = zhzdSelect;
	62	+ }
	63	+
	64	+ public String getZzblxSelect() {
	65	+ return zzblxSelect;
	66	+ }
	67	+
	68	+ public void setZzblxSelect(String zzblxSelect) {
	69	+ this.zzblxSelect = zzblxSelect;
	70	+ }
	71	+
41	72	public Integer getCheckPackage() {
42	73	return checkPackage;
43	74	}

...	...	@@ -206,6 +206,15 @@
206	206	}
207	207	/20201021 wtt 陵城需求 end /
208	208
	209	+ if (StringUtils.isNotEmpty(param.getTbs())) {
	210	+ query.addCriteria(Criteria.where("tbs").is(checkPackage));
	211	+ }
	212	+ if (StringUtils.isNotEmpty(param.getZhzdSelect())) {
	213	+ query.addCriteria(Criteria.where("zhzdSelect."+param.getZhzdSelect()).is(true));
	214	+ }
	215	+ if (StringUtils.isNotEmpty(param.getZzblxSelect())) {
	216	+ query.addCriteria(Criteria.where("zzblxSelect"+param.getZzblxSelect()).is(true));
	217	+ }
209	218	query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
210	219	String provinceId = param.getProvinceId();
211	220	if (StringUtils.isNotEmpty(provinceId)) {