shiyang / regional-platform

Commit c0fb1070d842b9073c4b02178c692df314d3280e

Authored by jiangjiazhi over 8 years ago

修改新电子病历

Showing 4 changed files with 64 additions and 24 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java

...	...	@@ -159,8 +159,13 @@
159	159	/**
160	160	* 高危评分
161	161	*/
162		- private Integer hScore;
	162	+ private Integer hScoreStart;
	163	+
163	164	/**
	165	+ * 高危评分
	166	+ */
	167	+ private Integer hScoreEnd;
	168	+ /**
164	169	* 高危因素
165	170	*/
166	171	private String rFactor;
167	172
...	...	@@ -373,14 +378,7 @@
373	378	this.areaIdOrRestId = areaIdOrRestId;
374	379	}
375	380
376		- public Integer gethScore() {
377		- return hScore;
378		- }
379	381
380		- public void sethScore(Integer hScore) {
381		- this.hScore = hScore;
382		- }
383		-
384	382	public String getrFactor() {
385	383	return rFactor;
386	384	}
387	385
...	...	@@ -528,12 +526,8 @@
528	526	if (null != created) {
529	527	condition = condition.and("created", created, MongoOper.LTE);
530	528	}
531		- if (null != hScore) {
532		- condition = condition.and("riskScore", hScore, MongoOper.IS);
533		- }else if (null != isHighRisk) {
534		- condition = condition.and("riskScore", 0, MongoOper.GT);
535		- }
536	529
	530	+
537	531	if (StringUtils.isNotEmpty( rLevel)) {
538	532	condition = condition.and("riskLevelId", rLevel, MongoOper.LIKE);
539	533	}
540	534
...	...	@@ -624,8 +618,8 @@
624	618	if (-1 != type) {
625	619	condition = condition.and("type", type, MongoOper.IS);
626	620	}
627		-
628	621	boolean isAddStart = Boolean.FALSE;
	622	+
629	623	Criteria c = null;
630	624	if (null != lastMensesStart) {
631	625	c = Criteria.where("lastMenses").gte(lastMensesStart);
...	...	@@ -641,6 +635,25 @@
641	635	}
642	636
643	637
	638	+ if (null != hScoreStart) {
	639	+// condition = condition.and("riskScore", hScore, MongoOper.IS);
	640	+
	641	+ if (null != hScoreStart) {
	642	+ c = Criteria.where("riskScore").gte(hScoreStart);
	643	+ isAddStart = Boolean.TRUE;
	644	+ }
	645	+ if (null != hScoreEnd) {
	646	+ if (isAddStart) {
	647	+ c = c.lte(hScoreEnd);
	648	+ } else {
	649	+ c = Criteria.where("riskScore").lte(hScoreEnd);
	650	+ }
	651	+ isAddStart = Boolean.TRUE;
	652	+ }
	653	+ }else if (null != isHighRisk) {
	654	+ condition = condition.and("riskScore", 0, MongoOper.GT);
	655	+ }
	656	+
644	657	if (null != bookbuildingDateStart) {
645	658	c = Criteria.where("bookbuildingDate").gte(bookbuildingDateStart);
646	659	isAddStart = Boolean.TRUE;
...	...	@@ -694,6 +707,21 @@
694	707	return condition.toMongoQuery();
695	708	}
696	709
	710	+ public Integer gethScoreEnd() {
	711	+ return hScoreEnd;
	712	+ }
	713	+
	714	+ public void sethScoreEnd(Integer hScoreEnd) {
	715	+ this.hScoreEnd = hScoreEnd;
	716	+ }
	717	+
	718	+ public Integer gethScoreStart() {
	719	+ return hScoreStart;
	720	+ }
	721	+
	722	+ public void sethScoreStart(Integer hScoreStart) {
	723	+ this.hScoreStart = hScoreStart;
	724	+ }
697	725
698	726	public Date getBirth() {
699	727	return birth;

...	...	@@ -102,7 +102,7 @@
102	102	//修改孕妇高危等级
103	103	// updatePatientRiskLevel(model, patients);
104	104
105		-
	105	+ updateLastRisk(antExAddRequest.getParentId());
106	106	if (null != patients.getBuildType() && patients.getBuildType() == 3) {
107	107	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
108	108	referralApplyOrderQuery.setParentId(patients.getId());

...	...	@@ -200,7 +200,8 @@
200	200	//设置为孕妇
201	201	patientsQuery.setType(type);
202	202	patientsQuery.setLikeName(riskPatientsQueryRequest.getName());
203		- patientsQuery.sethScore(riskPatientsQueryRequest.gethScore());
	203	+ patientsQuery.sethScoreStart(riskPatientsQueryRequest.getStrtHScore());
	204	+ patientsQuery.sethScoreEnd(riskPatientsQueryRequest.getEndHScore());
204	205	patientsQuery.setrFactor(riskPatientsQueryRequest.getrFactor());
205	206	Date currentDate = DateUtil.formatDate(new Date());
206	207	if (null != riskPatientsQueryRequest.getServiceType()) {

...	...	@@ -43,7 +43,9 @@
43	43	private String rLevel;
44	44	//高危评分
45	45	@FormParam
46		- private Integer hScore;
	46	+ private Integer endHScore;
	47	+
	48	+ private Integer strtHScore;
47	49	//风险因素
48	50	@FormParam
49	51	private String rFactor;
...	...	@@ -60,6 +62,22 @@
60	62	@FormParam
61	63	private Integer expVip;
62	64
	65	+ public Integer getEndHScore() {
	66	+ return endHScore;
	67	+ }
	68	+
	69	+ public void setEndHScore(Integer endHScore) {
	70	+ this.endHScore = endHScore;
	71	+ }
	72	+
	73	+ public Integer getStrtHScore() {
	74	+ return strtHScore;
	75	+ }
	76	+
	77	+ public void setStrtHScore(Integer strtHScore) {
	78	+ this.strtHScore = strtHScore;
	79	+ }
	80	+
63	81	public Integer getEndChsj() {
64	82	return endChsj;
65	83	}
...	...	@@ -142,9 +160,6 @@
142	160	this.startAge = startAge;
143	161	}
144	162
145		- public void sethScore(Integer hScore) {
146		- this.hScore = hScore;
147		- }
148	163
149	164	public Integer getServiceStatus() {
150	165	return serviceStatus;
...	...	@@ -154,10 +169,6 @@
154	169	this.serviceStatus = serviceStatus;
155	170	}
156	171
157		-
158		- public Integer gethScore() {
159		- return hScore;
160		- }
161	172
162	173	public String getCardNo() {
163	174	return cardNo;