diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java index f8077e1..bcd70c9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java @@ -41,7 +41,7 @@ import java.util.Map; * Created by Administrator on 2015/9/17 0017. */ @Controller -public class RegionController extends BaseController{ +public class RegionController extends BaseController { @Autowired private BasicConfigService basicConfigService; @@ -53,14 +53,15 @@ public class RegionController extends BaseController{ * mongo 里面省市区的id */ public static final String CHINA_BASIC_ID = "f6c505dd-835a-43d7-b0bb-fdb9eb0b7b31"; + @TokenRequired - @RequestMapping(value = "/regions",method = RequestMethod.GET) + @RequestMapping(value = "/regions", method = RequestMethod.GET) public void getRegions(@RequestParam(value = "parentId", required = false) String parentId, - HttpServletResponse httpServletResponse, HttpServletRequest request ){ + HttpServletResponse httpServletResponse, HttpServletRequest request) { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Users user = usersService.getUsers(loginState.getId()); - if(null == user) { + if (null == user) { ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "not find login user!"); return; } @@ -68,14 +69,15 @@ public class RegionController extends BaseController{ query.setYn(YnEnums.YES.getId()); query.setTypeId("b7ea005c-dfac-4c2a-bdae-25239b3f44fd"); - if(UserTypeEnum.NORMAL_USER.getId().equals(user.getType())) { - if(null == user.getOrgId()) { + if (UserTypeEnum.NORMAL_USER.getId().equals(user.getType())) { + if (null == user.getOrgId()) { ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SYSTEM_ERROR, "user not defined orgId error!"); return; } Organization organization = organizationService.getOrganization(user.getOrgId()); - if("0".equals(parentId)){ - parentId = SystemConfig.CHINA_BASIC_ID;; + if ("0".equals(parentId)) { + parentId = SystemConfig.CHINA_BASIC_ID; + ; } /* if (null != organization.getProvinceId() && null==parentId) { parentId = organization.getProvinceId(); @@ -91,9 +93,9 @@ public class RegionController extends BaseController{ parentId = organization.getStreetId(); query.setId(parentId); }else {*/ - query.setParentId(parentId); + query.setParentId(parentId); // } - }else{ + } else { query.setParentId(parentId); } @@ -105,14 +107,14 @@ public class RegionController extends BaseController{ query.setEnable(1); List configList = basicConfigService.queryBasicConfig(query); - List> list =new ArrayList>(); - if (CollectionUtils.isNotEmpty(configList)){ - for (BasicConfig config :configList){ - Map region=new HashMap(); - region.put("id",config.getId()); - region.put("regionName",config.getName()); + List> list = new ArrayList>(); + if (CollectionUtils.isNotEmpty(configList)) { + for (BasicConfig config : configList) { + Map region = new HashMap(); + region.put("id", config.getId()); + region.put("regionName", config.getName()); region.put("parentId", config.getParentId()); - region.put("code", config.getCode() ); + region.put("code", config.getCode()); list.add(region); } } @@ -120,16 +122,16 @@ public class RegionController extends BaseController{ } - @RequestMapping(value = "/queryRegions",method = RequestMethod.GET) + @RequestMapping(value = "/queryRegions", method = RequestMethod.GET) public void queryRegions(@RequestParam(value = "parentId", required = false) String parentId, @RequestParam(value = "id", required = false) String id, - HttpServletResponse httpServletResponse, HttpServletRequest request ){ + HttpServletResponse httpServletResponse, HttpServletRequest request) { BasicConfigQuery query = new BasicConfigQuery(); - if(StringUtils.isBlank(parentId) && StringUtils.isBlank(id)) { + if (StringUtils.isBlank(parentId) && StringUtils.isBlank(id)) { query.setParentId(SystemConfig.CHINA_BASIC_ID); - } else if(StringUtils.isNotBlank(parentId)){ + } else if (StringUtils.isNotBlank(parentId)) { query.setParentId(parentId); - }else if(StringUtils.isNotBlank(id)) { + } else if (StringUtils.isNotBlank(id)) { query.setId(id); } @@ -137,44 +139,41 @@ public class RegionController extends BaseController{ query.setTypeId("b7ea005c-dfac-4c2a-bdae-25239b3f44fd"); List configList = basicConfigService.queryBasicConfig(query); - List> list =new ArrayList>(); - if (CollectionUtils.isNotEmpty(configList)){ - for (BasicConfig config :configList){ - Map region=new HashMap(); - region.put("id",config.getId()); - region.put("name",config.getName()); - region.put("code",config.getCode()); + List> list = new ArrayList>(); + if (CollectionUtils.isNotEmpty(configList)) { + for (BasicConfig config : configList) { + Map region = new HashMap(); + region.put("id", config.getId()); + region.put("name", config.getName()); + region.put("code", config.getCode()); list.add(region); } } ResultUtils.buildSuccessResultAndWrite(httpServletResponse, list); } - @RequestMapping(value = "/getAddress",method = RequestMethod.GET) + + @RequestMapping(value = "/getAddress", method = RequestMethod.GET) public void getAddress() { BasicConfigQuery regionsQuery = new BasicConfigQuery(); regionsQuery.setParentId(CHINA_BASIC_ID); regionsQuery.setYn(YnEnums.YES.getId()); List basicConfigList = basicConfigService.queryBasicConfig(regionsQuery); List list = new ArrayList<>(); - for(BasicConfig bc : basicConfigList) - { + for (BasicConfig bc : basicConfigList) { list.add(bc.getName()); regionsQuery.setParentId(bc.getId()); List list1 = basicConfigService.queryBasicConfig(regionsQuery); - for(BasicConfig bc1 : list1) - { + for (BasicConfig bc1 : list1) { list.add(bc1.getName()); regionsQuery.setParentId(bc1.getId()); List list2 = basicConfigService.queryBasicConfig(regionsQuery); - for(BasicConfig bc2 : list2) - { + for (BasicConfig bc2 : list2) { list.add(bc2.getName()); regionsQuery.setParentId(bc2.getId()); List list3 = basicConfigService.queryBasicConfig(regionsQuery); - for(BasicConfig bc3 : list3) - { + for (BasicConfig bc3 : list3) { list.add(bc3.getName()); } @@ -194,12 +193,13 @@ public class RegionController extends BaseController{ /** * 解析身份证地址 + * * @param address * @return */ @RequestMapping(value = "/getAddressItems", method = RequestMethod.GET) @ResponseBody - public BaseObjectResponse getAddressItems(@RequestParam(required = true)String address) throws UnsupportedEncodingException { + public BaseObjectResponse getAddressItems(@RequestParam(required = true) String address) throws UnsupportedEncodingException { //address = new String(address.getBytes("ISO-8859-1"),"utf-8"); return basicConfigService.getAddressItems(address); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index fd05cb5..2c26abf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -2429,7 +2429,7 @@ public class BabyCheckFacade extends BaseServiceImpl { BabyCheckModel checkModel = babyCheckModels.get(0); int month = DateUtil.getMonth(model.getBirth(), checkModel.getCheckDate()); - if (month == 0 || month > 36) { + if (month > 36) { return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("月龄范围没有报告"); } @@ -2445,7 +2445,9 @@ public class BabyCheckFacade extends BaseServiceImpl { baseInfo.put("heightEvaluate", checkModel.getHeightEvaluate()); baseInfo.put("month", month); - + if (month == 0) { + month = 1; + } String kaupEvaluate = ""; if (StringUtils.isNotEmpty(checkModel.getWeight()) && StringUtils.isNotEmpty(checkModel.getHeight())) { String bmi = patientWeightService.getBmi(checkModel.getWeight(), checkModel.getHeight()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 1975678..3a2cdc2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -6282,8 +6282,12 @@ public class ViewFacade { if (null != checkModel) { result.setCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); result.setMonthAge(DateUtil.getBabyMonthAge(checkModel.getBirth(), checkModel.getCheckDate())); - result.setWeight(StringUtils.isNotEmpty(checkModel.getWeight()) ? checkModel.getWeight() + "kg,评价：" + checkModel.getWeightEvaluate() : ""); - result.setHeight(StringUtils.isNotEmpty(checkModel.getHeight()) ? checkModel.getHeight() + "cm,评价：" + checkModel.getHeightEvaluate() : ""); + String weight = StringUtils.isNotEmpty(checkModel.getWeight()) ? checkModel.getWeight() + "kg," : ""; + String height = StringUtils.isNotEmpty(checkModel.getHeight()) ? checkModel.getHeight() + "cm," : ""; + String weightEvaluate = StringUtils.isNotEmpty(checkModel.getWeightEvaluate()) ? "评价：" + checkModel.getWeightEvaluate() : ""; + String heightEvaluate = StringUtils.isNotEmpty(checkModel.getHeightEvaluate()) ? "评价：" + checkModel.getHeightEvaluate() : ""; + result.setWeight(weight + weightEvaluate); + result.setHeight(height + heightEvaluate); result.setWeightOrHeight(checkModel.getHeightWeight()); result.setPhysiqueInfo(checkModel.getGrowthEvaluate()); result.setHeadCircumference(checkModel.getHead()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/SessionProvider.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/SessionProvider.java index a69c017..265039e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/SessionProvider.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/SessionProvider.java @@ -90,7 +90,7 @@ public class SessionProvider implements ISessionProvider { public LoginContext register(Integer userId, String phone, String account, String pwd) { ISessionProvider iSessionProvider = iSessionProviderMap.get(currentStrateger); if (null != iSessionProvider) { - return iSessionProvider.register(userId, phone, account,pwd); + return iSessionProvider.register(userId, phone, account, pwd); } if (null != defaultSessionProvider) { return defaultSessionProvider.register(userId, phone, account, pwd);