shiyang / regional-platform

Commit 49507598f9fe74b2c0cf90405005a46572fae369

Authored by hujiaqi over 8 years ago

查询号和生产方式

Showing 4 changed files with 42 additions and 41 deletions

platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java

...	...	@@ -31,6 +31,8 @@
31	31
32	32	private boolean neEnd;
33	33
	34	+ private String deliveryModeQueryJson;
	35	+
34	36	public boolean isNeEnd() {
35	37	return neEnd;
36	38	}
...	...	@@ -127,6 +129,9 @@
127	129	if (null != hospitalId) {
128	130	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
129	131	}
	132	+ if (null != deliveryModeQueryJson) {
	133	+ condition = condition.and("deliveryMode", deliveryModeQueryJson, MongoOper.LIKE);
	134	+ }
130	135	Criteria c = null;
131	136
132	137	Boolean isAddStart = Boolean.FALSE;
...	...	@@ -215,6 +220,14 @@
215	220
216	221	public void setDeliveryMode(String deliveryMode) {
217	222	this.deliveryMode = deliveryMode;
	223	+ }
	224	+
	225	+ public String getDeliveryModeQueryJson() {
	226	+ return deliveryModeQueryJson;
	227	+ }
	228	+
	229	+ public void setDeliveryModeQueryJson(String deliveryModeQueryJson) {
	230	+ this.deliveryModeQueryJson = deliveryModeQueryJson;
218	231	}
219	232	}

...	...	@@ -182,6 +182,9 @@
182	182	//查询号
183	183	private String queryNo;
184	184
	185	+ //另一个查询号
	186	+ private String queryNo1;
	187	+
185	188	public String getQueryNo() {
186	189	return queryNo;
187	190	}
...	...	@@ -190,6 +193,14 @@
190	193	this.queryNo = queryNo;
191	194	}
192	195
	196	+ public String getQueryNo1() {
	197	+ return queryNo1;
	198	+ }
	199	+
	200	+ public void setQueryNo1(String queryNo1) {
	201	+ this.queryNo1 = queryNo1;
	202	+ }
	203	+
193	204	public Integer getPostViewTimes() {
194	205	return postViewTimes;
195	206	}
...	...	@@ -881,6 +892,14 @@
881	892	MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS);
882	893	MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS);
883	894	c1= c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria();
	895	+ }
	896	+
	897	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(queryNo1)) {
	898	+ MongoCondition c = MongoCondition.newInstance();
	899	+ MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
	900	+ MongoCondition con2 = MongoCondition.newInstance("username", queryNo, MongoOper.IS);
	901	+ MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS);
	902	+ c1= c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
884	903	}
885	904
886	905	if (lastCheckEmployeeId != null) {

...	...	@@ -912,13 +912,11 @@
912	912	}
913	913	}
914	914
915		- patientsQuery.setName(StringUtils.isEmpty(childbirthManagerRequest.getUserName()) ? null : childbirthManagerRequest.getUserName());
916	915	patientsQuery.setYn(YnEnums.YES.getId());
917	916	patientsQuery.setType(3);
918	917	patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()));
919		- patientsQuery.setCardNo(StringUtils.isEmpty(childbirthManagerRequest.getCardNo()) ? null : childbirthManagerRequest.getCardNo());
920		- patientsQuery.setPhone(StringUtils.isEmpty(childbirthManagerRequest.getPhone()) ? null : childbirthManagerRequest.getPhone());
921	918	patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone());
	919	+ patientsQuery.setQueryNo1(childbirthManagerRequest.getQueryNo());
922	920	// 分娩方式去另外一张表查
923	921	List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
924	922	List<String> parentIdList = new ArrayList<>();
...	...	@@ -933,7 +931,8 @@
933	931	}
934	932
935	933	MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
936		- matDeliverQuery.setDeliveryMode(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : childbirthManagerRequest.getDeliveryMode());
	934	+ String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode();
	935	+ matDeliverQuery.setDeliveryModeQueryJson(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson);
937	936	matDeliverQuery.setParentIdList(parentIdList);
938	937	matDeliverQuery.setPage(childbirthManagerRequest.getPage());
939	938	matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());

...	...	@@ -9,27 +9,13 @@
9	9
10	10	/**
11	11	* @auther HuJiaqi
12		- * @createTime 2016年12月07日 14时13分
13		- * @discription 产妇姓名
	12	+ * @createTime 2016年12月19日 16时02分
	13	+ * @discription 查询号
14	14	*/
15		- private String userName;
	15	+ private String queryNo;
16	16
17	17	/**
18	18	* @auther HuJiaqi
19		- * @createTime 2016年12月07日 14时13分
20		- * @discription 证件号
21		- */
22		- private String cardNo;
23		-
24		- /**
25		- * @auther HuJiaqi
26		- * @createTime 2016年12月07日 14时13分
27		- * @discription 联系方式
28		- */
29		- private String phone;
30		-
31		- /**
32		- * @auther HuJiaqi
33	19	* @createTime 2016年12月13日 17时13分
34	20	* @discription 分娩日期
35	21	*/
36	22
...	...	@@ -53,28 +39,12 @@
53	39
54	40	private Integer operatorId;
55	41
56		- public String getUserName() {
57		- return userName;
	42	+ public String getQueryNo() {
	43	+ return queryNo;
58	44	}
59	45
60		- public void setUserName(String userName) {
61		- this.userName = userName;
62		- }
63		-
64		- public String getCardNo() {
65		- return cardNo;
66		- }
67		-
68		- public void setCardNo(String cardNo) {
69		- this.cardNo = cardNo;
70		- }
71		-
72		- public String getPhone() {
73		- return phone;
74		- }
75		-
76		- public void setPhone(String phone) {
77		- this.phone = phone;
	46	+ public void setQueryNo(String queryNo) {
	47	+ this.queryNo = queryNo;
78	48	}
79	49
80	50	public String getBirthDate() {