jiangjiazhi / regional-platform

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

Showing 12 changed files with 104 additions and 2 deletions

...	...	@@ -388,6 +388,17 @@
388	388	private String cjfy;//刺激反应
389	389	private String zl;//张力
390	390
	391	+ //居住类别
	392	+ private String liveType;
	393	+
	394	+ public String getLiveType() {
	395	+ return liveType;
	396	+ }
	397	+
	398	+ public void setLiveType(String liveType) {
	399	+ this.liveType = liveType;
	400	+ }
	401	+
391	402	public String getHx() {
392	403	return hx;
393	404	}

...	...	@@ -61,8 +61,9 @@
61	61
62	62	//畸形key
63	63	private String deformityKey;
	64	+ //居住类别
	65	+ private String liveType;
64	66
65		-
66	67	/**
67	68	* 母亲的id
68	69	*/
69	70
...	...	@@ -772,8 +773,10 @@
772	773	}
773	774
774	775
	776	+ if (null != liveType) {
	777	+ condition = condition.and("liveType", liveType, MongoOper.IS);
	778	+ }
775	779
776		-
777	780	if (null != buildType) {
778	781	condition = condition.and("buildType", buildType, MongoOper.IS);
779	782	}
...	...	@@ -1073,6 +1076,14 @@
1073	1076	return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
1074	1077	}
1075	1078	return condition.toMongoQuery();
	1079	+ }
	1080	+
	1081	+ public String getLiveType() {
	1082	+ return liveType;
	1083	+ }
	1084	+
	1085	+ public void setLiveType(String liveType) {
	1086	+ this.liveType = liveType;
1076	1087	}
1077	1088
1078	1089	public String getMcertNo() {

...	...	@@ -29,6 +29,8 @@
29	29
30	30	private String husbandPhone;
31	31
	32	+ //居住类别
	33	+ private String liveType;
32	34	/**
33	35	* 关键字
34	36	*/
...	...	@@ -363,6 +365,10 @@
363	365	condition = condition.and("provinceRegisterId", noProvinceRegisterId, MongoOper.NE);
364	366	}
365	367
	368	+ if (null != liveType) {
	369	+ condition = condition.and("pliveTypeId", liveType, MongoOper.NE);
	370	+ }
	371	+
366	372	if (null != sendCareMan) {
367	373	condition = condition.and("sendCareMan", sendCareMan, MongoOper.IS);
368	374	}
...	...	@@ -985,6 +991,14 @@
985	991	return condition.toMongoQuery();
986	992	}
987	993
	994	+
	995	+ public String getLiveType() {
	996	+ return liveType;
	997	+ }
	998	+
	999	+ public void setLiveType(String liveType) {
	1000	+ this.liveType = liveType;
	1001	+ }
988	1002
989	1003	public String getPcensusTypeId() {
990	1004	return pcensusTypeId;

...	...	@@ -217,6 +217,7 @@
217	217	@RequestParam(value = "hospitalAreaId",required = false) String hospitalAreaId,
218	218	@RequestParam(value = "hospitalId",required = false) String hospitalId,
219	219	@RequestParam(value = "vcCardNo",required = false) String vcCardNo,
	220	+ @RequestParam(value = "liveType",required = false) String liveType,
220	221	@RequestParam(value = "isArea",required = false) String isArea) {
221	222
222	223	if (CollectionUtils.isNotEmpty(highRiskInfos)){

...	...	@@ -1053,6 +1053,7 @@
1053	1053	bm.setDataStatus(0);
1054	1054	}
1055	1055
	1056	+ bm.setLiveType(b.getLiveType());
1056	1057	bm.setFileCode(b.getFileCode());
1057	1058	bm.setBabyHighRiskReason(b.getBabyHighRiskReason());
1058	1059	bm.setmHighRiskReason(b.getmHighRiskReason());
...	...	@@ -2127,6 +2128,8 @@
2127	2128	babyQuery.setWeakSonInfos(request.getWeakSonInfos());
2128	2129	//多项体弱儿因素查询
2129	2130	babyQuery.setHighRiskInfos(request.getHighRiskInfos());
	2131	+
	2132	+ babyQuery.setLiveType(request.getLiveType());
2130	2133
2131	2134	if(String.valueOf("true").equals(request.getIsArea())){
2132	2135	List list = new ArrayList();

...	...	@@ -243,6 +243,8 @@
243	243	patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
244	244	patientsQuery.setNotEnable(riskPatientsQueryRequest.getNotEnable());
245	245
	246	+ patientsQuery.setLiveType(riskPatientsQueryRequest.getLiveType());
	247	+
246	248	//设置为孕妇
247	249	patientsQuery.setType(type);
248	250
...	...	@@ -1118,6 +1120,8 @@
1118	1120	PatientManagerResult patientManagerResult = new PatientManagerResult();
1119	1121
1120	1122	PatientsQuery patientsQuery = new PatientsQuery();
	1123	+
	1124	+ patientsQuery.setLiveType(patientManagerRequest.getLiveType());
1121	1125	patientsQuery.setAssistUserId(patientManagerRequest.getAssistUserId());
1122	1126	patientsQuery.setSendCareMan(patientManagerRequest.getSendCareMan());
1123	1127	if (patientManagerRequest.getBuildWeekStart() != null) {

...	...	@@ -4018,6 +4018,9 @@
4018	4018
4019	4019	result.setMommyProfessionType(getBasicConfig(model.getMproTypeId()));
4020	4020
	4021	+
	4022	+ result.setLiveType(getBasicConfig(model.getLiveType()));
	4023	+
4021	4024	result.setFatherLevel(getBasicConfig(model.getfLevelId()));
4022	4025	result.setFatherProfessionType(getBasicConfig(model.getFproTypeId()));
4023	4026	if (StringUtils.isNotEmpty(model.getDeliverOrg())) {

...	...	@@ -88,7 +88,10 @@
88	88	//母亲备注
89	89	private String mremark;
90	90
	91	+ //居住类别
	92	+ private String liveType;
91	93
	94	+
92	95	/*********父亲基本信息*********/
93	96
94	97	//父亲姓名
...	...	@@ -316,6 +319,14 @@
316	319
317	320	//档案编号滦平需求
318	321	private String fileCode;
	322	+
	323	+ public String getLiveType() {
	324	+ return liveType;
	325	+ }
	326	+
	327	+ public void setLiveType(String liveType) {
	328	+ this.liveType = liveType;
	329	+ }
319	330
320	331	public Integer getDueDay() {
321	332	return dueDay;

...	...	@@ -83,6 +83,17 @@
83	83
84	84	private String vcCardNo;
85	85
	86	+ //居住类别
	87	+ private String liveType;
	88	+
	89	+ public String getLiveType() {
	90	+ return liveType;
	91	+ }
	92	+
	93	+ public void setLiveType(String liveType) {
	94	+ this.liveType = liveType;
	95	+ }
	96	+
86	97	public String getVcCardNo() {
87	98	return vcCardNo;
88	99	}

...	...	@@ -87,6 +87,17 @@
87	87	//辅助建档医生id
88	88	private String assistUserId;
89	89
	90	+ //居住类别
	91	+ private String liveType;
	92	+
	93	+ public String getLiveType() {
	94	+ return liveType;
	95	+ }
	96	+
	97	+ public void setLiveType(String liveType) {
	98	+ this.liveType = liveType;
	99	+ }
	100	+
90	101	public String getAssistUserId() {
91	102	return assistUserId;
92	103	}

...	...	@@ -156,6 +156,9 @@
156	156	//1-需要隐藏姓名、电话、地址
157	157	private int showDetail;
158	158
	159	+ //居住类别
	160	+ private String liveType;
	161	+
159	162	/**
160	163	* 排序策略枚举
161	164	*/
...	...	@@ -286,6 +289,14 @@
286	289	this.fmTime = fmTime;
287	290	}
288	291
	292	+
	293	+ public String getLiveType() {
	294	+ return liveType;
	295	+ }
	296	+
	297	+ public void setLiveType(String liveType) {
	298	+ this.liveType = liveType;
	299	+ }
289	300
290	301	//分娩年龄
291	302	private Integer fmStartAge;

...	...	@@ -256,6 +256,17 @@
256	256
257	257	private String hospitalId;
258	258
	259	+ //居住类别
	260	+ private String liveType;
	261	+
	262	+ public String getLiveType() {
	263	+ return liveType;
	264	+ }
	265	+
	266	+ public void setLiveType(String liveType) {
	267	+ this.liveType = liveType;
	268	+ }
	269	+
259	270	public String getHospitalId() {
260	271	return hospitalId;
261	272	}