diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index cc94499..8e8b7ed 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -34,6 +34,8 @@ public class DateUtil { public static final int DAY_SECONDS = 86399; public static final int DAY_FULL_SECONDS = 86400; + public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; + public static String getymd() { return y_m_d.format(new Date()); } diff --git a/platform-dal/pom.xml b/platform-dal/pom.xml index e608865..82aa12e 100644 --- a/platform-dal/pom.xml +++ b/platform-dal/pom.xml @@ -1,39 +1,45 @@ - - com.lyms.core - regional-platform - 1.0.1 - - 4.0.0 - jar - platform-dal + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + com.lyms.core + regional-platform + 1.0.1 + + 4.0.0 + jar + platform-dal - - - com.lyms.core - platform-common - 1.0.1 - + + + com.lyms.core + platform-common + 1.0.1 + com.fasterxml.jackson.core jackson-annotations 2.9.0 compile + + org.projectlombok + lombok + 1.18.8 + provided + - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.7 - 1.7 - - - - platform-dal - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + + + platform-dal + \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java new file mode 100644 index 0000000..c880127 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java @@ -0,0 +1,171 @@ +package com.lyms.platform.pojo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.lyms.platform.common.result.BaseModel; +import com.lyms.platform.common.utils.DateUtil; +import lombok.Data; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; + +/** + * 孕前优生基础信息 实体类 + * + * @author: shuai-Bo + * @Date: 2019/11/20 0020 + * @Time: 9:40 + */ +@Document(collection = "lyms_preeugenics_base") +@Data +public class PreEugenicsBaseModel extends BaseModel { + //id + private String id; + /******************丈夫信息****************************/ + //丈夫姓名 + private String husbandName; + //民族 + private String husbandNation; + + /** + * 出生日期 + */ + @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date husbandBirthday; + + //年龄 + private String husbandAge; + + //文化程度 + private String husbandEducational; + + //身份证号码 + private String husbandCardNo; + + /** + * 职业 : 1农民 2工人 3服务业 4经商 5家务 6教师/公务员/职员 7其他 + */ + private String husbandCareer; + + /** + * 户口所在地 省 + */ + private String husbandAccountProvince; + + /** + * 户口所在地 市 + */ + private String husbandAccountCity; + + /** + * 户口所在地 县 + */ + private String husbandAccountCounty; + + /** + * 户口所在地 详细地址 + */ + private String husbandAccountAddress; + + /** + * 户口性质: + * 1农业户口 (含界定为农村居民者) 2.非农业 + */ + private String husbandAccountNature; + + /******************妻子信息**********************/ + /** + * 妻子姓名 + */ + private String wifeName; + + //民族 + private String wifeNation; + /** + * 出生日期 + */ + @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date wifeBirthday; + + //年龄 + private String wifeAge; + + //文化程度 + private String wifeEducational; + + //身份证号码 + private String wifeCardNo; + + /** + * 职业 : 1农民 2工人 3服务业 4经商 5家务 6教师/公务员/职员 7其他 + */ + private String wifeCareer; + + /** + * 户口所在地 省 + */ + private String wifeAccountProvince; + + /** + * 户口所在地 市 + */ + private String wifeAccountCity; + + /** + * 户口所在地 县 + */ + private String wifeAccountCounty; + + /** + * 户口所在地 详细地址 + */ + private String wifeAccountAddress; + + /** + * 户口性质: + * 1农业户口 (含界定为农村居民者) 2.非农业 + */ + private String wifeAccountNature; + + /** + * 妻子现住地址 省 + */ + private String wifeCurrentProvince; + + /** + * 妻子现住地址 市 + */ + private String wifeCurrentCity; + + /** + * 妻子现住地址 县 + */ + private String wifeCurrentCounty; + + /** + * 妻子现住地址 详细地址 + */ + private String wifeCurrentAddress; + + /** + * 结婚时间 + */ + @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date marriageTime; + + /** + * 联系电话 + */ + private String phone; + + /** + * 填写日期 + */ + @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date fillDate; + + /** + * 医生签名 + */ + private String doctor; + +} \ No newline at end of file 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 59dc821..07e4554 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 @@ -655,11 +655,13 @@ public class HearingDiagnoseController extends BaseController { result.setData(resList); pageInfo.setCount(confiList.size()); } else if (hdReq.getEnalble() == 2) { - for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { - resList.add(waitConfiList.get(i)); + if (CollectionUtils.isNotEmpty(waitConfiList)) { + for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { + resList.add(waitConfiList.get(i)); + } + pageInfo.setCount(waitConfiList.size()); + result.setData(resList); } - pageInfo.setCount(waitConfiList.size()); - result.setData(resList); } else if (hdReq.getEnalble() == 3) { for (int i = (hdReq.getPage() - 1) * hdReq.getLimit(); i < hdrList.size() && i < hdReq.getPage() * hdReq.getLimit(); i++) { resList.add(hdrList.get(i)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java new file mode 100644 index 0000000..9e4f7a9 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java @@ -0,0 +1,32 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.service.IPreEugenicsService; +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.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; + +/** + * @author: shuai-Bo + * @Date: 2019/11/20 0020 + * @Time: 11:06 + */ +@Controller +public class PreEugenicsBaseController extends BaseController { + @Autowired + private IPreEugenicsService iPreEugenicsService; + + @RequestMapping(value = "getPreEugenicsBase") + @ResponseBody + public BaseResponse getPreEugenicsBaseInfo(@RequestParam(value = "cardNo") String cardNo, + @RequestParam(value = "vcCardNo") String vcCardNo, HttpServletRequest request) { + + return iPreEugenicsService.getPreEugenicsBaseInfo(cardNo, vcCardNo, getUserId(request)); + } + +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java new file mode 100644 index 0000000..11ce562 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java @@ -0,0 +1,15 @@ +package com.lyms.platform.operate.web.service; + +import com.lyms.platform.common.result.BaseResponse; + +public interface IPreEugenicsService extends IBaseService { + /** + * 通过身份证就诊卡查询 孕前优生基本信息 + * + * @param cardNo + * @param vcCardNo + * @return + */ + BaseResponse getPreEugenicsBaseInfo(String cardNo, String vcCardNo, Integer userId); + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java new file mode 100644 index 0000000..5cdfc56 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -0,0 +1,22 @@ +package com.lyms.platform.operate.web.service.impl; + +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.service.IPreEugenicsService; +import org.springframework.stereotype.Service; + +/** + * 孕前优生实现类 + * + * @author: shuai-Bo + * @Date: 2019/11/20 0020 + * @Time: 11:28 + */ +@Service +public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugenicsService { + + + @Override + public BaseResponse getPreEugenicsBaseInfo(String cardNo, String vcCardNo, Integer userId) { + return null; + } +} \ No newline at end of file