jiangjiazhi / regional-platform

Commit 4af0c2c95e196b322234a7581aaf23634c7ac109

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 26 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java

...	...	@@ -14,10 +14,7 @@
14	14	import com.lyms.platform.common.result.BaseResponse;
15	15	import com.lyms.platform.common.utils.DateUtil;
16	16	import com.lyms.platform.operate.web.utils.FunvCommonUtil;
17		-import com.lyms.platform.pojo.BabyModel;
18		-import com.lyms.platform.pojo.BoneModel;
19		-import com.lyms.platform.pojo.MicroelementModel;
20		-import com.lyms.platform.pojo.Patients;
	17	+import com.lyms.platform.pojo.*;
21	18	import com.lyms.platform.query.BabyModelQuery;
22	19	import com.lyms.platform.query.BoneQuery;
23	20	import com.lyms.platform.query.PatientsQuery;
...	...	@@ -25,6 +22,8 @@
25	22	import org.apache.commons.lang.StringUtils;
26	23	import org.springframework.beans.factory.annotation.Autowired;
27	24	import org.springframework.data.mongodb.core.MongoTemplate;
	25	+import org.springframework.data.mongodb.core.query.Criteria;
	26	+import org.springframework.data.mongodb.core.query.Query;
28	27	import org.springframework.stereotype.Component;
29	28
30	29	import java.util.*;
...	...	@@ -54,6 +53,9 @@
54	53	@Autowired
55	54	private BabyBookbuildingService babyBookbuildingService;
56	55
	56	+ @Autowired
	57	+ private MongoTemplate mongoTemplate;
	58	+
57	59	public BaseResponse queryBoneList(String queryNo, Integer start, Integer end, Integer age, String vcCardNo,Integer type ,Integer page, Integer limit, Integer userId) {
58	60
59	61
...	...	@@ -201,6 +203,7 @@
201	203	BoneModel model = BoneService.queryOneBone(query);
202	204	if (model != null)
203	205	{
	206	+ //孕期骨密度报告
204	207	if (type == 0)
205	208	{
206	209	Patients pat = patientsService.findOnePatientById(model.getPatientId());
...	...	@@ -224,6 +227,7 @@
224	227	int week = DateUtil.getWeek(lastMenses,model.getCreated());
225	228
226	229	}
	230	+ //儿童骨密度报告
227	231	else
228	232	{
229	233	BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getPatientId());
230	234
...	...	@@ -244,9 +248,21 @@
244	248	data.put("sex", babyModel.getSex() == null ? "" : SexEnum.getTextById(babyModel.getSex()));
245	249	data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));
246	250	int month = DateUtil.getBabyAgeMonth(babyModel.getBirth(),model.getCreated());
247		- }
248	251
249		-
	252	+ List<BoneConfigModel> configModels = mongoTemplate.find(
	253	+ Query.query(Criteria.where("type").is(1)), BoneConfigModel.class);
	254	+ if (CollectionUtils.isNotEmpty(configModels))
	255	+ {
	256	+ for (BoneConfigModel configModel : configModels)
	257	+ {
	258	+ if (configModel.getStart() <= month && month <= configModel.getEnd())
	259	+ {
	260	+ List<String> contents = model.getResult() == 0 ?configModel.getNormals() : (model.getResult() == 1 ? configModel.getReduces() : configModel.getSerious());
	261	+ data.put("contents",contents);
	262	+ }
	263	+ }
	264	+ }
	265	+ }
250	266	}
251	267
252	268	healthChargeFacade.addHealthCharge(hospitalId,8, model.getPatientId(), 1, 1, userId, doctorId, false);

...	...	@@ -202,6 +202,10 @@
202	202	{
203	203	ResidentsArchiveModel model = modelList.get(0);
204	204	spouseCode = model.getCode() == null ? "" : String.valueOf(model.getCode());
	205	+
	206	+ checkupResult.setSpouseName(model.getUsername());
	207	+ checkupResult.setSpouseCertificateTypeId(model.getCertificateTypeId());
	208	+ checkupResult.setSpouseCertificateNum(model.getCertificateNum());
205	209	}
206	210	}
207	211