jiangjiazhi / regional-platform

Commit 282b2ca24596bd69ae92a32ade5a0054468d2e83

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 51 additions and 45 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/LhBabyPregnancyFollowTabModel.java
platform-dal/src/main/java/com/lyms/platform/query/LhBabyPregnancyFollowTabQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyGravidityEndingTabFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyPregnancyFollowTabFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyPregnancyFollowTabResult.java

...	...	@@ -88,7 +88,7 @@
88	88	//停经后是否用过药物（YnEnums2）
89	89	private String takingDrugsYn;
90	90	//停经后是否用过药物-注明药物名称
91		- private String DrugsName;
	91	+ private String drugsName;
92	92
93	93	/**
94	94	* 确诊早孕机构
95	95
...	...	@@ -103,13 +103,13 @@
103	103	private String diagnosisGroupOther;
104	104
105	105	//尿妊娠实验结果（LhPissGravidityEnum）
106		- private String PissGravidity;
	106	+ private String pissGravidity;
107	107	//B超检查结果（LhBChaoEnum）
108	108	private String bChao;
109	109	//B超检查结果-不确定及其他
110	110	private String bChaoOther;
111	111	//对孕前优生健康检查的评价（LhCheckCommentEnum）
112		- private String CheckComment;
	112	+ private String checkComment;
113	113
114	114	//填表日期
115	115	private Date writeDate;
116	116
...	...	@@ -381,11 +381,11 @@
381	381	}
382	382
383	383	public String getDrugsName() {
384		- return DrugsName;
	384	+ return drugsName;
385	385	}
386	386
387	387	public void setDrugsName(String drugsName) {
388		- DrugsName = drugsName;
	388	+ this.drugsName = drugsName;
389	389	}
390	390
391	391	public String getDiagnosisGroup() {
...	...	@@ -420,14 +420,6 @@
420	420	this.diagnosisGroupOther = diagnosisGroupOther;
421	421	}
422	422
423		- public String getPissGravidity() {
424		- return PissGravidity;
425		- }
426		-
427		- public void setPissGravidity(String pissGravidity) {
428		- PissGravidity = pissGravidity;
429		- }
430		-
431	423	public String getbChao() {
432	424	return bChao;
433	425	}
434	426
435	427
...	...	@@ -444,12 +436,20 @@
444	436	this.bChaoOther = bChaoOther;
445	437	}
446	438
	439	+ public String getPissGravidity() {
	440	+ return pissGravidity;
	441	+ }
	442	+
	443	+ public void setPissGravidity(String pissGravidity) {
	444	+ this.pissGravidity = pissGravidity;
	445	+ }
	446	+
447	447	public String getCheckComment() {
448		- return CheckComment;
	448	+ return checkComment;
449	449	}
450	450
451	451	public void setCheckComment(String checkComment) {
452		- CheckComment = checkComment;
	452	+ this.checkComment = checkComment;
453	453	}
454	454
455	455	public Date getWriteDate() {

...	...	@@ -92,7 +92,7 @@
92	92	//停经后是否用过药物（YnEnums2）
93	93	private String takingDrugsYn;
94	94	//停经后是否用过药物-注明药物名称
95		- private String DrugsName;
	95	+ private String drugsName;
96	96
97	97	/**
98	98	* 确诊早孕机构
99	99
...	...	@@ -107,13 +107,13 @@
107	107	private String diagnosisGroupOther;
108	108
109	109	//尿妊娠实验结果（LhPissGravidityEnum）
110		- private String PissGravidity;
	110	+ private String pissGravidity;
111	111	//B超检查结果（LhBChaoEnum）
112	112	private String bChao;
113	113	//B超检查结果-不确定及其他
114	114	private String bChaoOther;
115	115	//对孕前优生健康检查的评价（LhCheckCommentEnum）
116		- private String CheckComment;
	116	+ private String checkComment;
117	117
118	118	//填表日期
119	119	private Date writeDate;
120	120
...	...	@@ -385,11 +385,11 @@
385	385	}
386	386
387	387	public String getDrugsName() {
388		- return DrugsName;
	388	+ return drugsName;
389	389	}
390	390
391	391	public void setDrugsName(String drugsName) {
392		- DrugsName = drugsName;
	392	+ this.drugsName = drugsName;
393	393	}
394	394
395	395	public String getDiagnosisGroup() {
...	...	@@ -424,14 +424,6 @@
424	424	this.diagnosisGroupOther = diagnosisGroupOther;
425	425	}
426	426
427		- public String getPissGravidity() {
428		- return PissGravidity;
429		- }
430		-
431		- public void setPissGravidity(String pissGravidity) {
432		- PissGravidity = pissGravidity;
433		- }
434		-
435	427	public String getbChao() {
436	428	return bChao;
437	429	}
438	430
439	431
...	...	@@ -448,12 +440,20 @@
448	440	this.bChaoOther = bChaoOther;
449	441	}
450	442
	443	+ public String getPissGravidity() {
	444	+ return pissGravidity;
	445	+ }
	446	+
	447	+ public void setPissGravidity(String pissGravidity) {
	448	+ this.pissGravidity = pissGravidity;
	449	+ }
	450	+
451	451	public String getCheckComment() {
452		- return CheckComment;
	452	+ return checkComment;
453	453	}
454	454
455	455	public void setCheckComment(String checkComment) {
456		- CheckComment = checkComment;
	456	+ this.checkComment = checkComment;
457	457	}
458	458
459	459	public Date getWriteDate() {

...	...	@@ -115,6 +115,9 @@
115	115	update(new MongoQuery(new MongoCondition("id", lhBabyGravidityEndingTabModel.getId(), MongoOper.IS)).convertToMongoQuery(),lhBabyGravidityEndingTabModel);
116	116	}else {
117	117	//新增
	118	+ if (StringUtils.isEmpty(lhBabyGravidityEndingTabModel.getBuildId())) {
	119	+ return br.setErrormsg("参数缺失").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	120	+ }
118	121	lhBabyGravidityEndingTabModel.setYn(YnEnums.YES.getId());//设置增加数据为有效数据（删除状态）
119	122	save(lhBabyGravidityEndingTabModel);
120	123	}

...	...	@@ -115,6 +115,9 @@
115	115	update(new MongoQuery(new MongoCondition("id", lhBabyPregnancyFollowTabModel.getId(), MongoOper.IS)).convertToMongoQuery(),lhBabyPregnancyFollowTabModel);
116	116	}else {
117	117	//新增
	118	+ if (StringUtils.isEmpty(lhBabyPregnancyFollowTabModel.getBuildId())) {
	119	+ return br.setErrormsg("参数缺失").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	120	+ }
118	121	lhBabyPregnancyFollowTabModel.setYn(YnEnums.YES.getId());//设置增加数据为有效数据（删除状态）
119	122	save(lhBabyPregnancyFollowTabModel);
120	123	}

...	...	@@ -91,7 +91,7 @@
91	91	//停经后是否用过药物（YnEnums2）
92	92	private String takingDrugsYn;
93	93	//停经后是否用过药物-注明药物名称
94		- private String DrugsName;
	94	+ private String drugsName;
95	95
96	96	/**
97	97	* 确诊早孕机构
98	98
...	...	@@ -106,13 +106,13 @@
106	106	private String diagnosisGroupOther;
107	107
108	108	//尿妊娠实验结果（LhPissGravidityEnum）
109		- private String PissGravidity;
	109	+ private String pissGravidity;
110	110	//B超检查结果（LhBChaoEnum）
111	111	private String bChao;
112	112	//B超检查结果-不确定及其他
113	113	private String bChaoOther;
114	114	//对孕前优生健康检查的评价（LhCheckCommentEnum）
115		- private String CheckComment;
	115	+ private String checkComment;
116	116
117	117	//填表日期
118	118	private Date writeDate;
119	119
...	...	@@ -384,11 +384,11 @@
384	384	}
385	385
386	386	public String getDrugsName() {
387		- return DrugsName;
	387	+ return drugsName;
388	388	}
389	389
390	390	public void setDrugsName(String drugsName) {
391		- DrugsName = drugsName;
	391	+ this.drugsName = drugsName;
392	392	}
393	393
394	394	public String getDiagnosisGroup() {
395	395
396	396
...	...	@@ -424,13 +424,21 @@
424	424	}
425	425
426	426	public String getPissGravidity() {
427		- return PissGravidity;
	427	+ return pissGravidity;
428	428	}
429	429
430	430	public void setPissGravidity(String pissGravidity) {
431		- PissGravidity = pissGravidity;
	431	+ this.pissGravidity = pissGravidity;
432	432	}
433	433
	434	+ public String getCheckComment() {
	435	+ return checkComment;
	436	+ }
	437	+
	438	+ public void setCheckComment(String checkComment) {
	439	+ this.checkComment = checkComment;
	440	+ }
	441	+
434	442	public String getbChao() {
435	443	return bChao;
436	444	}
...	...	@@ -445,14 +453,6 @@
445	453
446	454	public void setbChaoOther(String bChaoOther) {
447	455	this.bChaoOther = bChaoOther;
448		- }
449		-
450		- public String getCheckComment() {
451		- return CheckComment;
452		- }
453		-
454		- public void setCheckComment(String checkComment) {
455		- CheckComment = checkComment;
456	456	}
457	457
458	458	public Date getWriteDate() {