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 aeef8b7..8c6a6c8 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,108 +2,33 @@ 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; /** * 儿童建档相关逻辑 - * * @Author: litao * @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 = "/initHearingDiagnose") - @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 afe5069..926a61b 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,7 +18,6 @@ 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; @@ -31,7 +30,7 @@ import java.util.*; * @createTime 2017年05月09日 16时54分 * @discription 跟踪相关接口 */ -@Controller +//@Controller public class FollowUpController extends BaseController { @Autowired private BabyPatientExtendEarFollowUpService babyPatientExtendEarFollowUpService; 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 40257ad..5893e31 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 @@ -11,7 +11,6 @@ import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.request.HearingDiagnoseRequest; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.operate.web.result.HearingDiagnoseListResult; -import com.lyms.platform.operate.web.result.InitHearingDiagnose; import com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnose; import com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnoseQuery; import com.lyms.platform.permission.service.BabyPatientExtendEarHearingDiagnoseService; @@ -19,7 +18,6 @@ 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; @@ -33,7 +31,7 @@ import java.util.*; * @createTime 2017年05月09日 16时54分 * @discription 跟踪相关接口 */ -@Controller +//@Controller public class HearingDiagnoseController extends BaseController { @Autowired private BabyPatientExtendEarHearingDiagnoseService hearingDiagnoseService;