jiangjiazhi / regional-platform

Commit 11d322e9f826ee879e8201fca182dce0ebaded78

Authored by liquanyu about 6 years ago

Exists in master and in 6 other branches

血压

Showing 3 changed files with 69 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BloodPressure.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java

...	...	@@ -45,6 +45,48 @@
45	45	//0 未推送 1已经推送
46	46	private Integer sevenSend;
47	47
	48	+ //孕前体重
	49	+ private String beforWeight;
	50	+ //当前体重
	51	+ private String weight;
	52	+ //身高
	53	+ private String height;
	54	+
	55	+ //胎数
	56	+ private String foetusNum;
	57	+
	58	+ public String getFoetusNum() {
	59	+ return foetusNum;
	60	+ }
	61	+
	62	+ public void setFoetusNum(String foetusNum) {
	63	+ this.foetusNum = foetusNum;
	64	+ }
	65	+
	66	+ public String getBeforWeight() {
	67	+ return beforWeight;
	68	+ }
	69	+
	70	+ public void setBeforWeight(String beforWeight) {
	71	+ this.beforWeight = beforWeight;
	72	+ }
	73	+
	74	+ public String getWeight() {
	75	+ return weight;
	76	+ }
	77	+
	78	+ public void setWeight(String weight) {
	79	+ this.weight = weight;
	80	+ }
	81	+
	82	+ public String getHeight() {
	83	+ return height;
	84	+ }
	85	+
	86	+ public void setHeight(String height) {
	87	+ this.height = height;
	88	+ }
	89	+
48	90	public Integer getExceptionSend() {
49	91	return exceptionSend;
50	92	}

...	...	@@ -1386,12 +1386,28 @@
1386	1386	patientBaseResult.setRiskScore(highScoreResult.getScoreStr());
1387	1387	} catch (Exception e) {
1388	1388	}
	1389	+
1389	1390	Patients p = mongoTemplate.findById(patientBaseResult.getId(), Patients.class);
	1391	+
1390	1392	if (p != null) {
1391	1393	AntExChuModel chuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").ne("0")).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
1392	1394	if (chuModel != null) {
1393		- patientBaseResult.setHeight(StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : "");
1394		- patientBaseResult.setWeight(StringUtils.isNotEmpty(chuModel.getWeight()) ? chuModel.getWeight() : "");
	1395	+ if (StringUtils.isNotEmpty(chuModel.getHeight()) && StringUtils.isNotEmpty(chuModel.getWeight()))
	1396	+ {
	1397	+ patientBaseResult.setHeight(StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : "");
	1398	+ patientBaseResult.setWeight(StringUtils.isNotEmpty(chuModel.getWeight()) ? chuModel.getWeight() : "");
	1399	+ patientBaseResult.setBeforWeight(StringUtils.isNotEmpty(chuModel.getYqWeight()) ? chuModel.getYqWeight() : "");
	1400	+ }
	1401	+ else
	1402	+ {
	1403	+ PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(p.getId())), PatientWeight.class);
	1404	+ if (patientWeight != null)
	1405	+ {
	1406	+ patientBaseResult.setHeight(StringUtils.isNotEmpty(patientWeight.getBeforeHeight()) ? patientWeight.getBeforeHeight() : "");
	1407	+ patientBaseResult.setWeight(StringUtils.isNotEmpty(patientWeight.getNowWeight()) ? patientWeight.getNowWeight() : "");
	1408	+ patientBaseResult.setBeforWeight(StringUtils.isNotEmpty(patientWeight.getBeforeWeight()) ? patientWeight.getBeforeWeight() : "");
	1409	+ }
	1410	+ }
1395	1411	}
1396	1412	}
1397	1413	PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patientBaseResult.getId())), PatientWeight.class);

...	...	@@ -50,6 +50,7 @@
50	50	private String height;
51	51	//体重
52	52	private String weight ;
	53	+ private String beforWeight ;
53	54
54	55	private String birth;
55	56
...	...	@@ -57,6 +58,14 @@
57	58
58	59	//新增产前诊断信息
59	60	private List<Map<String,String>> dia;
	61	+
	62	+ public String getBeforWeight() {
	63	+ return beforWeight;
	64	+ }
	65	+
	66	+ public void setBeforWeight(String beforWeight) {
	67	+ this.beforWeight = beforWeight;
	68	+ }
60	69
61	70	public List<Map<String, String>> getDia() {
62	71	return dia;