jiangjiazhi / regional-platform

Commit 25a0306a0752fd4264b8b7d8104a33a0b4c181ee

Authored by jiangjiazhi over 8 years ago

Exists in master and in 6 other branches

1

Showing 3 changed files with 27 additions and 38 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java

...	...	@@ -6,6 +6,7 @@
6	6	import com.lyms.platform.common.dao.operator.MongoOper;
7	7	import com.lyms.platform.common.dao.operator.MongoQuery;
8	8	import com.lyms.platform.common.utils.StringUtils;
	9	+import org.apache.commons.collections.CollectionUtils;
9	10	import org.springframework.data.mongodb.core.query.Criteria;
10	11
11	12	import java.util.Date;
12	13
13	14
14	15
...	...	@@ -52,17 +53,19 @@
52	53	private String buildDoctor;
53	54
54	55	private String enable;
55		- private String enableNot;
56		- private String source;
	56	+ private List<String> enableListNot;
57	57
58		- public String getEnableNot() {
59		- return enableNot;
	58	+ public List<String> getEnableListNot() {
	59	+ return enableListNot;
60	60	}
61	61
62		- public void setEnableNot(String enableNot) {
63		- this.enableNot = enableNot;
	62	+ public void setEnableListNot(List<String> enableListNot) {
	63	+ this.enableListNot = enableListNot;
64	64	}
65	65
	66	+ private String source;
	67	+
	68	+
66	69	public String getSource() {
67	70	return source;
68	71	}
69	72
70	73
...	...	@@ -140,27 +143,8 @@
140	143	*/
141	144	private Boolean isNull;
142	145
143		- private Boolean extEnable;
144	146
145		- //是否是主档案
146		- private String enableNETwo;
147	147
148		- public String getEnableNETwo() {
149		- return enableNETwo;
150		- }
151		-
152		- public void setEnableNETwo(String enableNETwo) {
153		- this.enableNETwo = enableNETwo;
154		- }
155		-
156		- public Boolean getExtEnable() {
157		- return extEnable;
158		- }
159		-
160		- public void setExtEnable(Boolean extEnable) {
161		- this.extEnable = extEnable;
162		- }
163		-
164	148	public Integer[] getOrServiceStatus() {
165	149	return orServiceStatus;
166	150	}
...	...	@@ -540,13 +524,6 @@
540	524	condition = condition.and("source", source, MongoOper.IS);
541	525	}
542	526
543		- if(null!=extEnable){
544		- condition.and("enable",extEnable,MongoOper.EXISTS);
545		- }
546		-
547		- if(null!=enableNETwo){
548		- condition.and("enable",enableNETwo,MongoOper.NE);
549		- }
550	527	if (-1 != yn) {
551	528	condition = condition.and("yn", yn, MongoOper.IS);
552	529	}
...	...	@@ -609,8 +586,8 @@
609	586	condition = condition.and("dueType", dueType, MongoOper.IS);
610	587	}
611	588
612		- if (!StringUtils.isEmpty(enableNot)) {
613		- condition = condition.and("enable", enableNot, MongoOper.NE);
	589	+ if (CollectionUtils.isNotEmpty(enableListNot)) {
	590	+ condition = condition.and("enable", enableListNot, MongoOper.NE);
614	591	}
615	592
616	593	if (null != hospitalIdList) {

...	...	@@ -884,7 +884,10 @@
884	884	condition = condition.orCondition(new MongoCondition[]{condition1, condition2});
885	885	}
886	886	if(null!=extEnable){
887		- condition.and("enable",extEnable,MongoOper.EXISTS);
	887	+ List list=new ArrayList();
	888	+ list.add("1");
	889	+ list.add("2");
	890	+ condition = condition.and("enable", list, MongoOper.NE);
888	891	}
889	892
890	893	if (buildTypeEq != null) {

...	...	@@ -1247,7 +1247,10 @@
1247	1247	babyQuery.setPid(babayPerson.getId());
1248	1248
1249	1249	if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))){
1250		- babyQuery.setExtEnable(false);
	1250	+ List list = new ArrayList();
	1251	+ list.add("1");
	1252	+ list.add("2");
	1253	+ babyQuery.setEnableListNot(list);
1251	1254	}
1252	1255
1253	1256
...	...	@@ -1296,7 +1299,10 @@
1296	1299	babyQuery.setYn(YnEnums.YES.getId());
1297	1300	babyQuery.setVcCardNo(param.getVcCardNo());
1298	1301	if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))){
1299		- babyQuery.setExtEnable(false);
	1302	+ List list = new ArrayList();
	1303	+ list.add("1");
	1304	+ list.add("2");
	1305	+ babyQuery.setEnableListNot(list);
1300	1306	}
1301	1307
1302	1308	babyQuery.setHospitalIdList(groupsFacade.findGroupHospital(userId,false));
...	...	@@ -1523,7 +1529,10 @@
1523	1529	String hospitalName = "";
1524	1530	BabyModelQuery babyQuery = new BabyModelQuery();
1525	1531	if(String.valueOf("true").equals(request.getIsArea())){
1526		- babyQuery.setEnableNETwo("2");
	1532	+ List list = new ArrayList();
	1533	+ list.add("1");
	1534	+ list.add("2");
	1535	+ babyQuery.setEnableListNot(list);
1527	1536	OrganizationQuery organizationQuery = new OrganizationQuery();
1528	1537
1529	1538	if(!StringUtils.isEmpty(request.getHospitalId())){