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 new file mode 100644 index 0000000..a348c46 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentArchivesRegionController.java @@ -0,0 +1,34 @@ +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.base.LoginContext; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest; +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 javax.validation.Valid; + +/** + * + * 妇女健康档案管理(区域妇幼) + * + * Created by Administrator on 2016/12/20 0020. + */ +@Controller +public class ResidentArchivesRegionController extends BaseController{ + + @RequestMapping(value = "/residentsArchiveList", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryAllPuerpera(@Valid ResidentsArchiveQueryRequest queryRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); +// return residentsArchiveFacade.queryResidentsArchives(residentsArchiveQueryRequest,loginState.getId(),"true"); + return null; + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java index d635e32..43b777d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java @@ -17,18 +17,34 @@ public class ResidentsArchiveQueryRequest extends BasePageQueryRequest{ private String certificateTypeId; //就诊卡号 private String vcCardNo; - //医院ID - private String hospitalId; + //姓名 + private String username; + //联系方式 + private String phone; + + /* 建档医院 */ //省 private String provinceId; //市 private String cityId; //区县 private String areaId; - //姓名 - private String username; - //联系方式 - private String phone; + //医院ID + private String hospitalId; + /* 居住地省市区 */ + private String liveProvinceId; + private String liveCityId; + private String liveAreaId; + /* 户籍地址省市区 */ + private String provinceRegisterId; + private String cityRegisterId; + private String areaRegisterId; + + //年龄(如: 24-26) + private String age; + //出生日期 + private String birthday; + public String getCertificateTypeId() { return certificateTypeId; 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 8063711..b54073b 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 @@ -2,6 +2,9 @@ package com.lyms.platform.operate.web.utils; import org.apache.commons.lang.StringUtils; +import java.util.HashMap; +import java.util.Map; + /** * 妇女模块公共方法 * @@ -75,4 +78,35 @@ public class FunvCommonUtil { return ""; } +/* private static final Map content = new HashMap<>(); + + static { + content.put("ycxjbs", "遗传性疾病史"); + content.put("jsjbs", "精神疾病史"); + content.put("xtjx", "先天畸形"); + content.put("xtyx", "先天愚型"); + content.put("ny", "聋哑"); + content.put("mr", "盲人"); + content.put("cel", "唇腭裂"); + content.put("xyb", "血友病"); + content.put("sm", "色盲"); + content.put("npx", "牛皮癣"); + content.put("st", "双胎"); + content.put("gb", "肝病"); + content.put("jh", "结核"); + + content.put("xy", "吸烟"); + content.put("yj", "饮酒"); + content.put("fyyw", "服用药物"); + content.put("jcydyhwz", "接触有毒有害物质"); + content.put("jcfsx", "接触放射线"); + + content.put("qmsgm", "青霉素过敏"); + content.put("xfmsgm", "先锋霉素过敏"); + content.put("halywgm", "磺胺类药物过敏"); + }*/ + + + + }