jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 23 additions and 4 deletions

...	...	@@ -5374,7 +5374,7 @@
5374	5374	model.setDoctorId(request.getDoctorId());
5375	5375	model.setContent(request.getContent());
5376	5376	model.setNextCheckTime(DateUtil.parseYMD(request.getNextCheckTime()));
5377		-
	5377	+ model.setRecordTime(DateUtil.parseYMD(request.getRecordTime()));
5378	5378	if (StringUtils.isNotEmpty(request.getId()))
5379	5379	{
5380	5380	model.setModified(new Date());
...	...	@@ -5384,7 +5384,7 @@
5384	5384	mongoTemplate.updateFirst(query, update, BabyRecordModel.class);
5385	5385	}
5386	5386	else {
5387		- model.setRecordTime(new Date());
	5387	+
5388	5388	model.setCreated(new Date());
5389	5389	model.setModified(new Date());
5390	5390	model.setHospitalId(autoMatchFacade.getHospitalId(userId));
...	...	@@ -5408,6 +5408,7 @@
5408	5408	data.put("motherName", babyModelDb.getMname());
5409	5409	data.put("sex", SexEnum.getTextById(babyModelDb.getSex()));
5410	5410	data.put("phone", babyModelDb.getMphone());
	5411	+ data.put("riskCode", StringUtils.riskCodeStr(babyModelDb.getRiskCode()));
5411	5412
5412	5413	String homeAddress = CommonsHelper.getResidence(babyModelDb.getProvinceId(), babyModelDb.getCityId(),
5413	5414	babyModelDb.getAreaId(), babyModelDb.getStreetId(), babyModelDb.getAddress(), basicConfigService);

...	...	@@ -143,6 +143,7 @@
143	143	Date date = DateUtil.getYmdDate(new Date());
144	144	babyCheckQuery.setCheckDateStart(date);
145	145	babyCheckQuery.setCheckDateEnd(new Date(date.getTime() + 24 * 60 * 60 * 1000 - 1));
	146	+ babyCheckQuery.setBuildId(babyId);
146	147	List<BabyCheckModel> babyChecks = babyCheckService.queryBabyCheckRecord(babyCheckQuery);
147	148	if (CollectionUtils.isNotEmpty(babyChecks))
148	149	{
...	...	@@ -1885,7 +1886,7 @@
1885	1886
1886	1887	if (null != babyDiet.getShape() && month == 6 && babyDiet.getShape() == 1) {
1887	1888	if (StringUtils.isNotEmpty(model.getFeedType())) {
1888		- if (Integer.valueOf(model.getFeedType()) == month) {
	1889	+ if (Integer.valueOf(model.getFeedType()) == babyDiet.getFeedingPattern()) {
1889	1890	data.put("feedingGuide", babyDiet.getQdhFeedingGuide());
1890	1891	}
1891	1892	} else {
...	...	@@ -1934,7 +1935,15 @@
1934	1935	if (month == 6) {
1935	1936	if (StringUtils.isNotEmpty(model.getFeedType())) {
1936	1937	if (babyDiet.getFeedingPattern() == Integer.valueOf(model.getFeedType())) {
1937		- data.put("feedingGuide", babyDiet.getQdhFeedingGuide());
	1938	+ if (kaupEvaluate.equals("消瘦") && babyDiet.getShape() == 0)
	1939	+ {
	1940	+ data.put("feedingGuide", babyDiet.getQdhFeedingGuide());
	1941	+ }
	1942	+ else if (kaupEvaluate.equals("超重") && babyDiet.getShape() == 2)
	1943	+ {
	1944	+ data.put("feedingGuide", babyDiet.getQdhFeedingGuide());
	1945	+ }
	1946	+
1938	1947	}
1939	1948	}
1940	1949	} else {

...	...	@@ -10,6 +10,15 @@
10	10	private String nextCheckTime;
11	11	private String content;
12	12	private String babyId;
	13	+ private String recordTime;
	14	+
	15	+ public String getRecordTime() {
	16	+ return recordTime;
	17	+ }
	18	+
	19	+ public void setRecordTime(String recordTime) {
	20	+ this.recordTime = recordTime;
	21	+ }
13	22
14	23	public String getBabyId() {
15	24	return babyId;