jiangjiazhi / regional-platform

Authored by liquanyu over 8 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 65 additions and 18 deletions

...	...	@@ -176,8 +176,8 @@
176	176	//母亲备注
177	177	private String mremark;
178	178
179		- //当前是否高危 0 非高危 1高危
180		- private Integer currentHighRisk;
	179	+// //当前是否高危 0 非高危 1高危
	180	+// private Integer currentHighRisk;
181	181
182	182	//当前下次检查时间
183	183	private Date nextDate;
184	184
185	185
...	...	@@ -196,8 +196,28 @@
196	196	private String phoneId;
197	197
198	198
	199	+ //是否高危 0 非高危 1高危
	200	+ private Integer lastHighRisk;
199	201
	202	+ //诊断
	203	+ private String lastDiagnose;
200	204
	205	+ public Integer getLastHighRisk() {
	206	+ return lastHighRisk;
	207	+ }
	208	+
	209	+ public void setLastHighRisk(Integer lastHighRisk) {
	210	+ this.lastHighRisk = lastHighRisk;
	211	+ }
	212	+
	213	+ public String getLastDiagnose() {
	214	+ return lastDiagnose;
	215	+ }
	216	+
	217	+ public void setLastDiagnose(String lastDiagnose) {
	218	+ this.lastDiagnose = lastDiagnose;
	219	+ }
	220	+
201	221	public String getCardId() {
202	222	return cardId;
203	223	}
204	224
...	...	@@ -735,13 +755,7 @@
735	755	this.highRisk = highRisk;
736	756	}
737	757
738		- public Integer getCurrentHighRisk() {
739		- return currentHighRisk;
740		- }
741	758
742		- public void setCurrentHighRisk(Integer currentHighRisk) {
743		- this.currentHighRisk = currentHighRisk;
744		- }
745	759
746	760	public Date getVipEndTime() {
747	761	return vipEndTime;

...	...	@@ -158,6 +158,28 @@
158	158	//person表的主键
159	159	private String pid;
160	160
	161	+ //是否高危 0 非高危 1高危
	162	+ private Integer lastHighRisk;
	163	+
	164	+ //诊断
	165	+ private String lastDiagnose;
	166	+
	167	+ public String getLastDiagnose() {
	168	+ return lastDiagnose;
	169	+ }
	170	+
	171	+ public void setLastDiagnose(String lastDiagnose) {
	172	+ this.lastDiagnose = lastDiagnose;
	173	+ }
	174	+
	175	+ public Integer getLastHighRisk() {
	176	+ return lastHighRisk;
	177	+ }
	178	+
	179	+ public void setLastHighRisk(Integer lastHighRisk) {
	180	+ this.lastHighRisk = lastHighRisk;
	181	+ }
	182	+
161	183	public String getPid() {
162	184	return pid;
163	185	}
...	...	@@ -324,8 +346,8 @@
324	346	if(null!=hospitalId){
325	347	condition=condition.and("hospitalId", hospitalId, MongoOper.IS);
326	348	}
327		- if(!StringUtils.isEmpty(diagnose)){
328		- condition=condition.and("diagnose", diagnose, MongoOper.LIKE);
	349	+ if(!StringUtils.isEmpty(lastDiagnose)){
	350	+ condition=condition.and("lastDiagnose", lastDiagnose, MongoOper.LIKE);
329	351	}
330	352	if(!StringUtils.isEmpty(phoneId) \|\| !StringUtils.isEmpty(cardId)){
331	353	MongoCondition con1 = MongoCondition.newInstance("phoneId", phoneId, MongoOper.LIKE);
...	...	@@ -336,6 +358,11 @@
336	358	if(null!=sex){
337	359	condition=condition.and("sex", sex, MongoOper.IS);
338	360	}
	361	+
	362	+ if(null!=lastHighRisk){
	363	+ condition=condition.and("lastHighRisk", lastHighRisk, MongoOper.IS);
	364	+ }
	365	+
339	366
340	367	if(null!=serviceStatus){
341	368	condition=condition.and("serviceStatus", serviceStatus, MongoOper.IS);

...	...	@@ -690,7 +690,7 @@
690	690	bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar()));
691	691
692	692
693		- bm.setCurrentHighRisk(b.getHighRisk());
	693	+ bm.setLastHighRisk(b.getHighRisk());
694	694
695	695
696	696	return bm;
...	...	@@ -1354,7 +1354,7 @@
1354	1354	babyQuery.setBirthEnd(start);
1355	1355	}
1356	1356
1357		- babyQuery.setDiagnose(request.getDiagnose());
	1357	+ babyQuery.setLastDiagnose(request.getDiagnose());
1358	1358	//预约时间
1359	1359	if (StringUtils.isNotEmpty(request.getNextDate()))
1360	1360	{
...	...	@@ -1388,7 +1388,7 @@
1388	1388
1389	1389	//0 非高危 1 高危 2 全部
1390	1390	if (request.getHighRiskType() != null && request.getHighRiskType() != 2) {
1391		- babyQuery.setHighRisk(request.getHighRiskType());
	1391	+ babyQuery.setLastHighRisk(request.getHighRiskType());
1392	1392	}
1393	1393
1394	1394	List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);

...	...	@@ -70,11 +70,14 @@
70	70
71	71	//儿童体检后更新下次预约时间和是否高危在基础数据表里面
72	72	BabyModel bm = new BabyModel();
73		- bm.setCurrentHighRisk(request.getHighRisk());
74		- bm.setNextDate(DateUtil.parseYMD(request.getNextDate()));
75	73	bm.setModified(new Date());
	74	+ bm.setLastHighRisk(request.getHighRisk());
	75	+ bm.setNextDate(DateUtil.parseYMD(request.getNextDate()));
	76	+ if (CollectionUtils.isNotEmpty(request.getDiagnose()))
	77	+ {
	78	+ bm.setLastDiagnose(JsonUtil.array2JsonString(request.getDiagnose()));
	79	+ }
76	80	babyBookbuildingService.updateBabyBuild(bm, request.getBuildId());
77		-
78	81	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
79	82	}
80	83
81	84
...	...	@@ -175,9 +178,12 @@
175	178	//儿童体检后更新下次预约时间和是否高危在基础数据表里面
176	179	BabyModel bm = new BabyModel();
177	180	bm.setModified(new Date());
178		- bm.setModified(new Date());
179		- bm.setCurrentHighRisk(request.getHighRisk());
	181	+ bm.setLastHighRisk(request.getHighRisk());
180	182	bm.setNextDate(DateUtil.parseYMD(request.getNextDate()));
	183	+ if (CollectionUtils.isNotEmpty(request.getDiagnose()))
	184	+ {
	185	+ bm.setLastDiagnose(JsonUtil.array2JsonString(request.getDiagnose()));
	186	+ }
181	187	babyBookbuildingService.updateBabyBuild(bm, request.getBuildId());
182	188
183	189	BabyCheckModel model = getBabyCheckModel(request);