Commit 7cb6378df95d1f119274b7182130c16a7e984966
1 parent
b0f41673d4
Exists in
master
and in
6 other branches
bug修复
Showing 3 changed files with 4 additions and 82 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
View file @
7cb6378
| ... | ... | @@ -2,106 +2,31 @@ |
| 2 | 2 | |
| 3 | 3 | import com.lyms.platform.common.annotation.TokenRequired; |
| 4 | 4 | import com.lyms.platform.common.base.BaseController; |
| 5 | -import com.lyms.platform.common.constants.ErrorCodeConstants; | |
| 6 | -import com.lyms.platform.common.enums.ConfirmedEnums; | |
| 7 | -import com.lyms.platform.common.enums.HearingDiagnosisEnums; | |
| 8 | -import com.lyms.platform.common.enums.HighRiskEnum; | |
| 9 | 5 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 10 | -import com.lyms.platform.common.result.BaseResponse; | |
| 11 | -import com.lyms.platform.operate.web.result.InitFollowUp; | |
| 12 | -import com.lyms.platform.operate.web.result.InitHearingDiagnose; | |
| 13 | 6 | import com.lyms.platform.permission.model.BabyPatientExtendEar; |
| 14 | 7 | import com.lyms.platform.permission.model.BabyPatientExtendEarBirth; |
| 15 | 8 | import com.lyms.platform.permission.model.BabyPatientExtendEarFamily; |
| 16 | 9 | import com.lyms.platform.permission.model.BabyPatientExtendEarMother; |
| 17 | 10 | import com.lyms.platform.permission.service.BabyPatientExtendEarService; |
| 18 | 11 | import org.springframework.beans.factory.annotation.Autowired; |
| 19 | -import org.springframework.stereotype.Controller; | |
| 20 | 12 | import org.springframework.web.bind.annotation.RequestMapping; |
| 21 | 13 | import org.springframework.web.bind.annotation.RequestMethod; |
| 22 | 14 | import org.springframework.web.bind.annotation.ResponseBody; |
| 23 | 15 | |
| 24 | 16 | import javax.servlet.http.HttpServletRequest; |
| 25 | -import java.util.ArrayList; | |
| 26 | -import java.util.HashMap; | |
| 27 | -import java.util.List; | |
| 28 | -import java.util.Map; | |
| 29 | 17 | |
| 30 | 18 | /** |
| 31 | 19 | * 儿童建档相关逻辑 |
| 32 | - * | |
| 33 | 20 | * @Author: litao |
| 34 | 21 | * @Date: 2017/5/10 0010 18:25 |
| 35 | 22 | * @Version: V1.0 |
| 36 | 23 | */ |
| 37 | -@RequestMapping("/ear") | |
| 38 | -@Controller | |
| 24 | +//@RequestMapping("/ear") | |
| 25 | +//@Controller | |
| 39 | 26 | public class EarController extends BaseController { |
| 40 | 27 | |
| 41 | 28 | @Autowired |
| 42 | 29 | private BabyPatientExtendEarService babyPatientExtendEarService; |
| 43 | - | |
| 44 | - /** | |
| 45 | - * 获取随访页面初始数据 | |
| 46 | - * | |
| 47 | - * @return | |
| 48 | - */ | |
| 49 | - @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose") | |
| 50 | - @ResponseBody | |
| 51 | - public BaseResponse initFollowUp() { | |
| 52 | - //根据条件查询基础配置信息表 | |
| 53 | - InitFollowUp initHearingDiagnose = new InitFollowUp(); | |
| 54 | - ConfirmedEnums[] confirEnums = ConfirmedEnums.values(); | |
| 55 | - List<Map<Integer, String>> confirmResult = new ArrayList<>(); | |
| 56 | - for (ConfirmedEnums cn : confirEnums) { | |
| 57 | - Map<Integer, String> map = new HashMap<>(); | |
| 58 | - map.put(cn.getId(), cn.getName()); | |
| 59 | - confirmResult.add(map); | |
| 60 | - } | |
| 61 | - initHearingDiagnose.setConfirmResult(confirmResult); | |
| 62 | - return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); | |
| 63 | - } | |
| 64 | - | |
| 65 | - /** | |
| 66 | - * 获取听力诊断页面初始数据 | |
| 67 | - * | |
| 68 | - * @return | |
| 69 | - */ | |
| 70 | - @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose") | |
| 71 | - @ResponseBody | |
| 72 | - public BaseResponse initHearingDiagnose() { | |
| 73 | - //根据条件查询基础配置信息表 | |
| 74 | - InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose(); | |
| 75 | - ConfirmedEnums[] confirEnums = ConfirmedEnums.values(); | |
| 76 | - List<Map<Integer, String>> confirmResult = new ArrayList<>(); | |
| 77 | - for (ConfirmedEnums cn : confirEnums) { | |
| 78 | - Map<Integer, String> map = new HashMap<>(); | |
| 79 | - map.put(cn.getId(), cn.getName()); | |
| 80 | - confirmResult.add(map); | |
| 81 | - } | |
| 82 | - initHearingDiagnose.setConfirmResult(confirmResult); | |
| 83 | - | |
| 84 | - HearingDiagnosisEnums[] hdEnums = HearingDiagnosisEnums.values(); | |
| 85 | - List<Map<Integer, String>> hdList = new ArrayList<>(); | |
| 86 | - for (HearingDiagnosisEnums cn : hdEnums) { | |
| 87 | - Map<Integer, String> map = new HashMap<>(); | |
| 88 | - map.put(cn.getId(), cn.getName()); | |
| 89 | - hdList.add(map); | |
| 90 | - } | |
| 91 | - initHearingDiagnose.setHearingDiagnosis(hdList); | |
| 92 | - | |
| 93 | - HighRiskEnum[] hrEnums = HighRiskEnum.values(); | |
| 94 | - List<Map<Integer, String>> hrList = new ArrayList<>(); | |
| 95 | - for (HighRiskEnum cn : hrEnums) { | |
| 96 | - Map<Integer, String> map = new HashMap<>(); | |
| 97 | - map.put(cn.getId(), cn.getName()); | |
| 98 | - hrList.add(map); | |
| 99 | - } | |
| 100 | - initHearingDiagnose.setHighRiskConfirms(hrList); | |
| 101 | - | |
| 102 | - return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); | |
| 103 | - } | |
| 104 | - | |
| 105 | 30 | |
| 106 | 31 | /** |
| 107 | 32 | * 添加儿童建档 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
View file @
7cb6378
| ... | ... | @@ -18,7 +18,6 @@ |
| 18 | 18 | import com.lyms.platform.pojo.BabyModel; |
| 19 | 19 | import org.apache.commons.lang.StringUtils; |
| 20 | 20 | import org.springframework.beans.factory.annotation.Autowired; |
| 21 | -import org.springframework.stereotype.Controller; | |
| 22 | 21 | import org.springframework.web.bind.annotation.RequestMapping; |
| 23 | 22 | import org.springframework.web.bind.annotation.RequestMethod; |
| 24 | 23 | import org.springframework.web.bind.annotation.ResponseBody; |
| ... | ... | @@ -31,7 +30,7 @@ |
| 31 | 30 | * @createTime 2017年05月09日 16时54分 |
| 32 | 31 | * @discription 跟踪相关接口 |
| 33 | 32 | */ |
| 34 | -@Controller | |
| 33 | +//@Controller | |
| 35 | 34 | public class FollowUpController extends BaseController { |
| 36 | 35 | @Autowired |
| 37 | 36 | private BabyPatientExtendEarFollowUpService babyPatientExtendEarFollowUpService; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
View file @
7cb6378
| ... | ... | @@ -11,7 +11,6 @@ |
| 11 | 11 | import com.lyms.platform.operate.web.request.HearingDiagnoseRequest; |
| 12 | 12 | import com.lyms.platform.operate.web.result.FrontEndResult; |
| 13 | 13 | import com.lyms.platform.operate.web.result.HearingDiagnoseListResult; |
| 14 | -import com.lyms.platform.operate.web.result.InitHearingDiagnose; | |
| 15 | 14 | import com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnose; |
| 16 | 15 | import com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnoseQuery; |
| 17 | 16 | import com.lyms.platform.permission.service.BabyPatientExtendEarHearingDiagnoseService; |
| ... | ... | @@ -19,7 +18,6 @@ |
| 19 | 18 | import com.lyms.platform.query.BasicConfigQuery; |
| 20 | 19 | import org.apache.commons.lang.StringUtils; |
| 21 | 20 | import org.springframework.beans.factory.annotation.Autowired; |
| 22 | -import org.springframework.stereotype.Controller; | |
| 23 | 21 | import org.springframework.web.bind.annotation.RequestMapping; |
| 24 | 22 | import org.springframework.web.bind.annotation.RequestMethod; |
| 25 | 23 | import org.springframework.web.bind.annotation.ResponseBody; |
| ... | ... | @@ -33,7 +31,7 @@ |
| 33 | 31 | * @createTime 2017年05月09日 16时54分 |
| 34 | 32 | * @discription 跟踪相关接口 |
| 35 | 33 | */ |
| 36 | -@Controller | |
| 34 | +//@Controller | |
| 37 | 35 | public class HearingDiagnoseController extends BaseController { |
| 38 | 36 | @Autowired |
| 39 | 37 | private BabyPatientExtendEarHearingDiagnoseService hearingDiagnoseService; |