From 17aac347227e236f9076f7cb062d34014acac49a Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 17 May 2017 09:34:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/EarController.java | 77 +++++++++++++++++++++- .../operate/web/controller/FollowUpController.java | 5 +- .../web/controller/HearingDiagnoseController.java | 5 +- 3 files changed, 81 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index 8c6a6c8..9099a5e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -2,18 +2,30 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.ConfirmedEnums; +import com.lyms.platform.common.enums.HearingDiagnosisEnums; +import com.lyms.platform.common.enums.HighRiskEnum; import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.result.InitFollowUp; +import com.lyms.platform.operate.web.result.InitHearingDiagnose; import com.lyms.platform.permission.model.BabyPatientExtendEar; import com.lyms.platform.permission.model.BabyPatientExtendEarBirth; import com.lyms.platform.permission.model.BabyPatientExtendEarFamily; import com.lyms.platform.permission.model.BabyPatientExtendEarMother; import com.lyms.platform.permission.service.BabyPatientExtendEarService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 儿童建档相关逻辑 @@ -21,14 +33,75 @@ import javax.servlet.http.HttpServletRequest; * @Date: 2017/5/10 0010 18:25 * @Version: V1.0 */ -//@RequestMapping("/ear") -//@Controller +@RequestMapping("/ear") +@Controller public class EarController extends BaseController { @Autowired private BabyPatientExtendEarService babyPatientExtendEarService; /** + * 获取随访页面初始数据 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/initFollowUp") + @ResponseBody + public BaseResponse initFollowUp() { + //根据条件查询基础配置信息表 + InitFollowUp initHearingDiagnose = new InitFollowUp(); + ConfirmedEnums[] confirEnums = ConfirmedEnums.values(); + List> confirmResult = new ArrayList<>(); + for (ConfirmedEnums cn : confirEnums) { + Map map = new HashMap<>(); + map.put(cn.getId(), cn.getName()); + confirmResult.add(map); + } + initHearingDiagnose.setConfirmResult(confirmResult); + return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } + + /** + * 获取听力诊断页面初始数据 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose") + @ResponseBody + public BaseResponse initHearingDiagnose() { + //根据条件查询基础配置信息表 + InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); + ConfirmedEnums[] confirEnums = ConfirmedEnums.values(); + List> confirmResult = new ArrayList<>(); + for (ConfirmedEnums cn : confirEnums) { + Map map = new HashMap<>(); + map.put(cn.getId(), cn.getName()); + confirmResult.add(map); + } + initHearingDiagnose.setConfirmResult(confirmResult); + + HearingDiagnosisEnums[] hdEnums = HearingDiagnosisEnums.values(); + List> hdList = new ArrayList<>(); + for (HearingDiagnosisEnums cn : hdEnums) { + Map map = new HashMap<>(); + map.put(cn.getId(), cn.getName()); + hdList.add(map); + } + initHearingDiagnose.setHearingDiagnosis(hdList); + + HighRiskEnum[] hrEnums = HighRiskEnum.values(); + List> hrList = new ArrayList<>(); + for (HighRiskEnum cn : hrEnums) { + Map map = new HashMap<>(); + map.put(cn.getId(), cn.getName()); + hrList.add(map); + } + initHearingDiagnose.setHighRiskConfirms(hrList); + + return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } + + /** * 添加儿童建档 * @return */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java index 926a61b..70e1328 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java @@ -18,6 +18,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.BabyModel; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; @@ -30,7 +31,7 @@ import java.util.*; * @createTime 2017年05月09日 16时54分 * @discription 跟踪相关接口 */ -//@Controller +@Controller public class FollowUpController extends BaseController { @Autowired private BabyPatientExtendEarFollowUpService babyPatientExtendEarFollowUpService; @@ -76,7 +77,7 @@ public class FollowUpController extends BaseController { * @param fuId 随访记录id * @return */ - @RequestMapping(method = RequestMethod.POST, value = "/queryBabyPatientExtendEarFollowUpList") + @RequestMapping(method = RequestMethod.POST, value = "/queryBabyPatientExtendEarFollowUpOne") @ResponseBody public BaseResponse queryBabyPatientExtendEarFollowUpOne(String fuId) { BabyPatientExtendEarFollowUp followUp = babyPatientExtendEarFollowUpService.getBabyPatientExtendEarFollowUp(fuId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 5893e31..2e38736 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -18,6 +18,7 @@ import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.query.BasicConfigQuery; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; @@ -31,7 +32,7 @@ import java.util.*; * @createTime 2017年05月09日 16时54分 * @discription 跟踪相关接口 */ -//@Controller +@Controller public class HearingDiagnoseController extends BaseController { @Autowired private BabyPatientExtendEarHearingDiagnoseService hearingDiagnoseService; @@ -48,7 +49,7 @@ public class HearingDiagnoseController extends BaseController { * @param hdId 听力诊断记录id * @return */ - @RequestMapping(method = RequestMethod.GET, value = "/queryHearingDiagnoseList") + @RequestMapping(method = RequestMethod.GET, value = "/queryHearingDiagnoseOne") @ResponseBody public BaseResponse queryHearingDiagnoseOne(String hdId ){ BabyPatientExtendEarHearingDiagnose behd = hearingDiagnoseService.getBabyPatientExtendEarHearingDiagnose(hdId); -- 1.8.3.1