jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 23 additions and 0 deletions

...	...	@@ -52,6 +52,11 @@
52	52
53	53	//结案转归 1痊愈□ 2好转□ 3转院□ 4失访□
54	54	private String cCOutcome;
	55	+
	56	+ //1是 2否结案
	57	+ private String caseClosed;
	58	+
	59	+
55	60	//高危因素
56	61	private List highRiskDiagnose;
57	62
...	...	@@ -284,6 +289,11 @@
284	289	if (null != cCOutcome) {
285	290	condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS);
286	291	}
	292	+
	293	+ if (null != caseClosed) {
	294	+ condition = condition.and("caseClosed", caseClosed, MongoOper.IS);
	295	+ }
	296	+
287	297	if (highRiskDiagnose !=null) {
288	298	condition = condition.and("highRiskDiagnose", highRiskDiagnose, MongoOper.IN);
289	299	}

...	...	@@ -1280,6 +1280,8 @@
1280	1280	base.setBabyCardNo(model.getCardNo());
1281	1281	base.setBnationId(model.getBnationId() == null ? "" : getBasicConfig(model.getBnationId()));
1282	1282	/end/
	1283	+ base.setBlNo(model.getBlNo());//住院号
	1284	+
1283	1285	base.setYn(model.getYn());
1284	1286	base.setDataStatus(model.getDataStatus());
1285	1287	base.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason()));

...	...	@@ -22,6 +22,9 @@
22	22	//社保卡
23	23	private String sINCard;
24	24
	25	+ //病历号(住院号)
	26	+ private String blNo;
	27	+
25	28	//新生儿民族Id
26	29	private String bnationId;
27	30	//儿童身份证
...	...	@@ -94,6 +97,14 @@
94	97	private String babyHeight;
95	98
96	99	private String babyWeight;
	100	+
	101	+ public String getBlNo() {
	102	+ return blNo;
	103	+ }
	104	+
	105	+ public void setBlNo(String blNo) {
	106	+ this.blNo = blNo;
	107	+ }
97	108
98	109	public String getBabyHeight() {
99	110	return babyHeight;