jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 35 additions and 7 deletions

...	...	@@ -44,11 +44,34 @@
44	44	// 直接定期体检only=1。首次体检后台默认1 ，定期体检默认0
45	45	private String only;
46	46
	47	+ //身高评价上(范围值)
	48	+ private String heightAssess;
	49	+ //体重评价
	50	+ private String weightAssess;
	51	+
	52	+
47	53	private String sort;
48	54
	55	+
49	56	//电话
50	57	private String phon;
51	58
	59	+ public String getHeightAssess() {
	60	+ return heightAssess;
	61	+ }
	62	+
	63	+ public void setHeightAssess(String heightAssess) {
	64	+ this.heightAssess = heightAssess;
	65	+ }
	66	+
	67	+ public String getWeightAssess() {
	68	+ return weightAssess;
	69	+ }
	70	+
	71	+ public void setWeightAssess(String weightAssess) {
	72	+ this.weightAssess = weightAssess;
	73	+ }
	74	+
52	75	public String getPhon() {
53	76	return phon;
54	77	}
...	...	@@ -197,6 +220,12 @@
197	220	}
198	221	if (StringUtils.isNotEmpty(bjId)) {
199	222	condition = condition.and("bjId", bjId, MongoOper.IS);
	223	+ }
	224	+ if (StringUtils.isNotEmpty(heightAssess)) {
	225	+ condition = condition.and("heightAssess", heightAssess, MongoOper.IS);
	226	+ }
	227	+ if (StringUtils.isNotEmpty(weightAssess)) {
	228	+ condition = condition.and("weightAssess", weightAssess, MongoOper.IS);
200	229	}
201	230	//检查医生
202	231	if (StringUtils.isNotEmpty(checkDoctor)) {

...	...	@@ -498,15 +498,15 @@
498	498	if (model.getPthreeDs() < value) {
499	499	res = "P97 >";
500	500	} else if (model.getPthreeDs() >= value && value > model.getPtwoDs()) {
501		- res = "P90~97";
	501	+ res = "P90-P97";
502	502	} else if (model.getPtwoDs() >= value && value > model.getPoneDs()) {
503		- res = "P75~90";
	503	+ res = "P75-P90";
504	504	} else if (model.getPoneDs() >= value && value >= model.getRoneDs()) {
505		- res = "P25~75";
	505	+ res = "P25-P75";
506	506	} else if (model.getRoneDs() > value && value >= model.getRtwoDs()) {
507		- res = "P10~25";
	507	+ res = "P10-P25";
508	508	} else if (model.getRtwoDs() > value && value >= model.getRthreeDs()) {
509		- res = "P3~10";
	509	+ res = "P3-P10";
510	510	} else if (model.getRthreeDs() > value) {
511	511	res = "P3 <";
512	512	}

...	...	@@ -61,8 +61,7 @@
61	61	private String bjId;
62	62	private Map bjIdMap;//不传
63	63
64		- // 既往史 "yeaOrNo", "yes" "no" ,
65		- // 内容 content ：xtxxz:true 先天性心脏病，dx:true 癫痫，gr:true 高热，xc:true 哮喘，qt:true 其它 qtc: 其它内容
	64	+ // 既往史 "yeaOrNo", "yes" "no" , xtxxz:true 先天性心脏病，dx:true 癫痫，gr:true 高热，xc:true 哮喘，qt:true 其它 qtc: 其它内容
66	65	private Map pastHistory;
67	66	//传染病史
68	67	private Map infectDiseases;