jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 12 additions and 1 deletions

...	...	@@ -1332,6 +1332,7 @@
1332	1332
1333	1333	if (CollectionUtils.isNotEmpty(examinationModelList)) {
1334	1334	lastTime = DateUtil.getyyyy_MM_dd(examinationModelList.get(0).getCheckDate());
	1335	+ antexListResult.setTireNumber1(examinationModelList.get(0).getTireNumber());
1335	1336	} else {
1336	1337	AntExChuQuery antExChuQuery1 = new AntExChuQuery();
1337	1338	antExChuQuery1.setPid(patients.getPid());
...	...	@@ -1342,6 +1343,7 @@
1342	1343
1343	1344	if (CollectionUtils.isNotEmpty(antExChuModels)) {
1344	1345	lastTime = DateUtil.getyyyy_MM_dd(antExChuModels.get(0).getCheckTime());
	1346	+ antexListResult.setTireNumber1(antExChuModels.get(0).getTireNumber());
1345	1347	} else {
1346	1348	PatientsQuery patientsQuery1 = new PatientsQuery();
1347	1349	patientsQuery1.setYn(YnEnums.YES.getId());

...	...	@@ -42,13 +42,22 @@
42	42	private String lastBuildTime;
43	43
44	44	private String birth;
45		-
	45	+ // 胎数
	46	+ private String tireNumber1;
46	47	private String cardNo;
47	48	private String vcCardNo;
48	49	private String isSieve;
49	50	private String isH = "0";
50	51	//<!---------基本信息----------->
51	52
	53	+
	54	+ public String getTireNumber1() {
	55	+ return tireNumber1;
	56	+ }
	57	+
	58	+ public void setTireNumber1(String tireNumber1) {
	59	+ this.tireNumber1 = tireNumber1;
	60	+ }
52	61
53	62	public String getLastBuildTime() {
54	63	return lastBuildTime;