From dcdafd62f5a7adf904f6ddf3b1e52bda307ee3c4 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 19 Sep 2018 14:36:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/QuestionFacade.java | 28 ++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/QuestionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/QuestionFacade.java index 95ce545..2d7aa7d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/QuestionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/QuestionFacade.java @@ -1,11 +1,13 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.biz.service.QuestionService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.QuestionEnums; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; @@ -14,9 +16,11 @@ import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.QuestionModel; +import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.QuestionQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -37,10 +41,14 @@ public class QuestionFacade { @Autowired private PatientsService patientsService; + @Autowired private OrganizationService organizationService; @Autowired + private AntenatalExaminationService antenatalExaminationService; + + @Autowired private UsersService usersService; @Autowired @@ -91,7 +99,23 @@ public class QuestionFacade { data.put("questions",questionModel.getQuestions()); data.put("trouble",questionModel.getTrouble()); - data.put("score",questionModel.getScore()); + data.put("score", questionModel.getScore()); + + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setPid(patients.getPid()); + antExChuQuery.setYn(YnEnums.YES.getId()); + String yunChi = ""; + String chanChi = ""; + List chuModelList = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(chuModelList)) + { + AntExChuModel chuModel = chuModelList.get(0); + yunChi = chuModel.getPregnancyTimes() == null ? "" : chuModel.getPregnancyTimes()+""; + chanChi = chuModel.getProdTime() == null ? "" : chuModel.getProdTime()+""; + } + + data.put("yunChi",yunChi); + data.put("chanChi",chanChi); data.put("investDate",DateUtil.getyyyy_MM_dd1(questionModel.getInvestDate())); @@ -99,7 +123,7 @@ public class QuestionFacade { data.put("hospital", CommonsHelper.getHospitalName(questionModel.getInvestHospitalId(), organizationService)); - data.put("content",QuestionEnums.getContentByScore(questionModel.getScore())); + data.put("content", QuestionEnums.getContentByScore(questionModel.getScore())); String diary = ""; if (questionModel.getScore() != null && questionModel.getScore() > 10) { -- 1.8.3.1