jiangjiazhi / regional-platform

Authored by liquanyu almost 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 6 additions and 1 deletions

...	...	@@ -1760,6 +1760,7 @@
1760	1760	AntExRecordModel model1 = recordModels.get(0);
1761	1761	model1.setNextCheckTime(DateUtil.parseYMD(nextTime));
1762	1762	model1.setCheckDoctor(doctorId);
	1763	+ model1.setSieveType(sieveType);
1763	1764	recordService.updateOne(model1,model1.getId());
1764	1765	}
1765	1766	}
...	...	@@ -1905,6 +1906,7 @@
1905	1906	yumInfosMap.put("fhr", fhr);
1906	1907	yumInfosMap.put("edema", edema);
1907	1908	yumInfosMap.put("nextTime", nextTime);
	1909	+ yumInfosMap.put("sieveType", sieveType);
1908	1910	WxMeasureInfoModel wxMeasure = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("1")), WxMeasureInfoModel.class);
1909	1911	if (null == wxMeasure) {
1910	1912	listMap.add(yumInfosMap);
...	...	@@ -1927,6 +1929,9 @@
1927	1929	if (currentTime.equals(inputTime)) {
1928	1930	if (null == yumInfosMap.get("fuh") \|\| "" == yumInfosMap.get("fuh")) {
1929	1931	yumInfosMap.put("fuh", map.get("fuh"));
	1932	+ }
	1933	+ if (null == yumInfosMap.get("sieveType") \|\| "" == yumInfosMap.get("sieveType")) {
	1934	+ yumInfosMap.put("sieveType", map.get("sieveType"));
1930	1935	}
1931	1936	if (null == yumInfosMap.get("abdominalGirth") \|\| "" == yumInfosMap.get("abdominalGirth")) {
1932	1937	yumInfosMap.put("abdominalGirth", map.get("abdominalGirth"));

...	...	@@ -1443,7 +1443,7 @@
1443	1443	}
1444	1444	examinationModel.setBamnio(bamnio);
1445	1445	examinationModel.setOperaterUserId(operaterUserId);
1446		-
	1446	+ examinationModel.setSieveType(sieveType);
1447	1447
1448	1448
1449	1449	return examinationModel;