jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 8 changed files with 89 additions and 10 deletions

...	...	@@ -327,6 +327,20 @@
327	327	//稀有血型 1 是稀有血型，空不是
328	328	private String rareType;
329	329
	330	+ /**
	331	+ * 承德需求外地过来分娩或者内蒙只过来分娩，临时建档只为了开证的，在建档页面加一个补录的字段标记
	332	+ */
	333	+ //空或者1为正常 2为补录
	334	+ private String normal;
	335	+
	336	+ public String getNormal() {
	337	+ return normal;
	338	+ }
	339	+
	340	+ public void setNormal(String normal) {
	341	+ this.normal = normal;
	342	+ }
	343	+
330	344	public String getRareType() {
331	345	return rareType;
332	346	}

...	...	@@ -372,7 +372,18 @@
372	372
373	373	private String trackHospitalId;
374	374
	375	+ //空或者1为正常 2为补录
	376	+ private String normal;
375	377
	378	+ public String getNormal() {
	379	+ return normal;
	380	+ }
	381	+
	382	+ public void setNormal(String normal) {
	383	+ this.normal = normal;
	384	+ }
	385	+
	386	+
376	387	public String getTrackHospitalId() {
377	388	return trackHospitalId;
378	389	}
...	...	@@ -474,6 +485,21 @@
474	485	MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS);
475	486	condition = condition.orCondition(new MongoCondition[]{con1, con});
476	487	}
	488	+
	489	+ if (null != normal) {
	490	+ if ("1".equals(normal))
	491	+ {
	492	+ MongoCondition con1 = MongoCondition.newInstance("normal", normal, MongoOper.IS);
	493	+ MongoCondition con = MongoCondition.newInstance("normal", Boolean.FALSE, MongoOper.EXISTS);
	494	+ condition = condition.orCondition(new MongoCondition[]{con1, con});
	495	+ }
	496	+ else
	497	+ {
	498	+ condition = condition.and("normal", normal, MongoOper.IS);
	499	+ }
	500	+
	501	+ }
	502	+
477	503	if (null != pcensusTypeId) {
478	504	condition = condition.and("pcensusTypeId", pcensusTypeId, MongoOper.IS);
479	505	}

...	...	@@ -140,15 +140,15 @@
140	140	@RequestMapping(method = RequestMethod.GET)
141	141	public BaseResponse list(TrackDownQueryRequest downQueryRequest, HttpServletRequest request) {
142	142
143		- if ((downQueryRequest.getBeOverdueDaysEnd() != null && downQueryRequest.getBeOverdueDaysStart() == null) \|\| (downQueryRequest.getBeOverdueDaysEnd() == null && downQueryRequest.getBeOverdueDaysStart() == null))
144		- {
145		- downQueryRequest.setBeOverdueDaysStart(1);
146		- }
147		-
148		- if ((downQueryRequest.getCheckOverDaysEnd() != null && downQueryRequest.getCheckOverDaysStart() == null) \|\| (downQueryRequest.getCheckOverDaysEnd() == null && downQueryRequest.getCheckOverDaysStart() == null))
149		- {
150		- downQueryRequest.setCheckOverDaysStart(1);
151		- }
	143	+// if ((downQueryRequest.getBeOverdueDaysEnd() != null && downQueryRequest.getBeOverdueDaysStart() == null) \|\| (downQueryRequest.getBeOverdueDaysEnd() == null && downQueryRequest.getBeOverdueDaysStart() == null))
	144	+// {
	145	+// downQueryRequest.setBeOverdueDaysStart(1);
	146	+// }
	147	+//
	148	+// if ((downQueryRequest.getCheckOverDaysEnd() != null && downQueryRequest.getCheckOverDaysStart() == null) \|\| (downQueryRequest.getCheckOverDaysEnd() == null && downQueryRequest.getCheckOverDaysStart() == null))
	149	+// {
	150	+// downQueryRequest.setCheckOverDaysStart(1);
	151	+// }
152	152
153	153	return downFacade.list(downQueryRequest, getUserId(request));
154	154	}

...	...	@@ -1707,6 +1707,7 @@
1707	1707	*/
1708	1708	public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) {
1709	1709	Patients patient = new Patients();
	1710	+ patient.setNormal(yunRequest.getNormal());
1710	1711	patient.setChildExtAddrs(yunRequest.getChildExtAddrs());
1711	1712	//默认为未分娩
1712	1713	patient.setIsDeliver("0");

...	...	@@ -249,7 +249,7 @@
249	249	patientsQuery.setPhone(riskPatientsQueryRequest.getPhone());
250	250	patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
251	251	patientsQuery.setNotEnable(riskPatientsQueryRequest.getNotEnable());
252		-
	252	+ patientsQuery.setNormal(riskPatientsQueryRequest.getNormal());
253	253	patientsQuery.setLiveType(riskPatientsQueryRequest.getLiveType());
254	254	//乡镇卫生院查询条件
255	255	if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getTownOrgId())) {
...	...	@@ -1765,6 +1765,8 @@
1765	1765	PatientManagerResult patientManagerResult = new PatientManagerResult();
1766	1766
1767	1767	PatientsQuery patientsQuery = new PatientsQuery();
	1768	+
	1769	+ patientsQuery.setNormal(patientManagerRequest.getNormal());
1768	1770
1769	1771	patientsQuery.setLiveType(patientManagerRequest.getLiveType());
1770	1772	patientsQuery.setAssistUserId(patientManagerRequest.getAssistUserId());

...	...	@@ -105,6 +105,17 @@
105	105
106	106	private Integer endAge;
107	107
	108	+ //空或者1为正常 2为补录
	109	+ private String normal;
	110	+
	111	+ public String getNormal() {
	112	+ return normal;
	113	+ }
	114	+
	115	+ public void setNormal(String normal) {
	116	+ this.normal = normal;
	117	+ }
	118	+
108	119	public Integer getStartAge() {
109	120	return startAge;
110	121	}

...	...	@@ -167,6 +167,17 @@
167	167
168	168	private String townOrgId;
169	169
	170	+ //空或者1为正常 2为补录
	171	+ private String normal;
	172	+
	173	+ public String getNormal() {
	174	+ return normal;
	175	+ }
	176	+
	177	+ public void setNormal(String normal) {
	178	+ this.normal = normal;
	179	+ }
	180	+
170	181	//乡镇卫生院Id
171	182	public String getTownOrgId() {
172	183	return townOrgId;

...	...	@@ -377,6 +377,20 @@
377	377	//乐陵市妇幼母子保健手册下发机构id
378	378	private String lowerHairOgrId;
379	379
	380	+ /**
	381	+ * 承德需求外地过来分娩或者内蒙只过来分娩，临时建档只为了开证的，在建档页面加一个补录的字段标记
	382	+ */
	383	+ //空或者1为正常 2为补录
	384	+ private String normal;
	385	+
	386	+ public String getNormal() {
	387	+ return normal;
	388	+ }
	389	+
	390	+ public void setNormal(String normal) {
	391	+ this.normal = normal;
	392	+ }
	393	+
380	394	public String getLowerHairOgrId() {
381	395	return lowerHairOgrId;
382	396	}