diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentArchivesRegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentArchivesRegionController.java index 217157d..e8854ab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentArchivesRegionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentArchivesRegionController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -37,9 +38,28 @@ public class ResidentArchivesRegionController extends BaseController{ @RequestMapping(value = "/regionalWomenList", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryAllResidents(@Valid ResidentsArchiveQueryRequest queryRequest,HttpServletRequest request) { + public BaseResponse queryAllResidents(@Valid ResidentsArchiveQueryRequest queryRequest, + HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return residentsFacade.queryResidentsArchives(queryRequest,loginState.getId()); } + + /** + * 妇女健康档案管理数据导出接口 + * @param queryRequest + * @param request + * @param response + */ + @RequestMapping(value = "/regionalWomenExport", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public void regionalResidentsExport(@Valid ResidentsArchiveQueryRequest queryRequest, + HttpServletRequest request, + HttpServletResponse response) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + residentsFacade.regionaResidentsExport(queryRequest,loginState.getId(),response); + } + + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java index e246d80..a6c9603 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java @@ -55,7 +55,7 @@ public class ResidentsArchiveController extends BaseController { param.setVcCardNo(vcCardNo); param.setCertificateTypeId(certificateTypeId); param.setCardNo(cardNo); - return residentsArchiveFacade.queryResidentsArchive(param,loginState.getId()); + return residentsArchiveFacade.queryResidentsArchive(param , loginState.getId()); } /** @@ -169,5 +169,19 @@ public class ResidentsArchiveController extends BaseController { return residentsArchiveFacade.womenGuildSms(womenGuideSmsRequest, loginState.getId()); } + /** + * 删除单条居民建档 + * @param id + * @param request + * @return + */ + @RequestMapping(value = "/deleteResidentsArchive", method = RequestMethod.DELETE) + @ResponseBody + @TokenRequired + public BaseResponse deleteArchive(@RequestParam("id") String id, + HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return residentsArchiveFacade.deleteArchive(id,loginState.getId()); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java index b54073b..5cdbf8b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java @@ -1,5 +1,8 @@ package com.lyms.platform.operate.web.utils; +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.pojo.BasicConfig; import org.apache.commons.lang.StringUtils; import java.util.HashMap; @@ -19,7 +22,11 @@ public class FunvCommonUtil { public static String YES = "是"; public static String NO = "否"; - //返回中间四位数为*号的手机号 + /** + * 返回中间四位数为*号的手机号 + * @param phone + * @return + */ public static String getXingPhone(String phone){ if (StringUtils.isNotEmpty(phone)){ String a = phone.substring(0,3)+"****"+phone.substring(7,11); @@ -78,7 +85,38 @@ public class FunvCommonUtil { return ""; } -/* private static final Map content = new HashMap<>(); + /** + * 获取生日(****年**月**日) + * @param b + * @return + */ + public static String getBirthday(String b){ + if (b!=null){ + String year = b.substring(0,4); + String mouth = b.substring(5,7); + String day = b.substring(8,10); + return year + "年" + mouth + "月" + day + "日"; + } + return null; + } + + /** + * 获取基础基础名称 + * @param id 基础类型ID + * @param basicConfigService + * @return + */ + public static String getBaseicConfigByid(String id,BasicConfigService basicConfigService) { + if (StringUtils.isNotEmpty(id)){ + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id); + if (basicConfig!=null && basicConfig.getYn()!= YnEnums.NO.getId()){ + return basicConfig.getName(); + } + } + return ""; + } + + private static final Map content = new HashMap<>(); static { content.put("ycxjbs", "遗传性疾病史"); @@ -104,9 +142,17 @@ public class FunvCommonUtil { content.put("qmsgm", "青霉素过敏"); content.put("xfmsgm", "先锋霉素过敏"); content.put("halywgm", "磺胺类药物过敏"); - }*/ + } + + public static String findName(Map map){ + StringBuilder sb = new StringBuilder(); + + + return ""; + } + }