jiangjiazhi / regional-platform

Authored by shiyang almost 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 8 additions and 10 deletions

...	...	@@ -2294,7 +2294,7 @@
2294	2294	data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone()));
2295	2295	data.put("cardNo", patientsQueryRequest.getIsEncry() == 0 ? rp.getCardNo() : StringUtils.encryCardNo(rp.getCardNo()));
2296	2296	data.put("remark", rp.getRemark());
2297		- data.put("dueWeek", rp.getDueWeek());
	2297	+ data.put("dueWeek2", rp.getDueWeek2());
2298	2298	data.put("normal", rp.getNormal());
2299	2299	datas.add(data);
2300	2300	}
...	...	@@ -2354,7 +2354,7 @@
2354	2354	cnames.put("dueWeek", "分娩日期");
2355	2355	cnames.put("createdWeek", "建档孕周");
2356	2356	cnames.put("normal", "建档状态");
2357		- cnames.put("dueWeek", "分娩孕周");
	2357	+ cnames.put("dueWeek2", "分娩孕周");
2358	2358	cnames.put("cTimes", "总复查次数");
2359	2359	cnames.put("tireNumber", "胎数");
2360	2360	cnames.put("rLevel", "高危等级");

...	...	@@ -115,14 +115,14 @@
115	115	//空或者1为正常 2为补录
116	116	private String normal;
117	117	//分娩时间
118		- private String dueDate;
	118	+ private String dueWeek2;
119	119
120		- public String getDueDate() {
121		- return dueDate;
	120	+ public String getDueWeek2() {
	121	+ return dueWeek2;
122	122	}
123	123
124		- public void setDueDate(String dueDate) {
125		- this.dueDate = dueDate;
	124	+ public void setDueWeek2(String dueWeek2) {
	125	+ this.dueWeek2 = dueWeek2;
126	126	}
127	127
128	128	public String getNormal() {

...	...	@@ -243,7 +243,7 @@
243	243	List <MaternalDeliverModel> maternalDeliverModels = matDeliverService.query(matDeliverQuery);
244	244	if (CollectionUtils.isNotEmpty(maternalDeliverModels)) {
245	245	//分娩孕周
246		- chanResult.setDueWeek(maternalDeliverModels.get(0).getDueWeek());
	246	+ chanResult.setDueWeek2(maternalDeliverModels.get(0).getDueWeek());
247	247	chanResult.setTireNumber(TaiShuEnums.getTitle(maternalDeliverModels.get(0).getTireNumber() + ""));
248	248	try {
249	249	chanResult.setfCh(organizationService.getOrganization(Integer.valueOf(maternalDeliverModels.get(0).getHospitalId())).getName());
...	...	@@ -370,8 +370,6 @@
370	370
371	371	chanResult.sethScore(patients.getRiskScore());
372	372	chanResult.setNormal(StringUtils.isNotEmpty(patients.getNormal())?"2".equals(patients.getNormal())?"补录":"正常":"正常");
373		- //分娩时间
374		- chanResult.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
375	373	data.add(chanResult);
376	374	logger.debug(stopWatch.toString());
377	375	}