jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b16d8db1a3c79dbf943b803c2d54475c3ac61083

Authored by zhangchao
1 parent bcd757c7a9
Exists in dev

#fix:新增出生证明列表相关功能

Showing 5 changed files with 393 additions and 244 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java View file @ b16d8db
1 1 package com.lyms.platform.operate.web.controller;
2 2  
  3 +import com.alibaba.fastjson.JSONObject;
3 4 import com.lyms.platform.biz.service.ArchiveDataServicer;
4 5 import com.lyms.platform.biz.service.PatientsService;
5 6 import com.lyms.platform.common.annotation.TokenRequired;
... ... @@ -13,6 +14,7 @@
13 14 import com.lyms.platform.operate.web.facade.PatientServiceFacade;
14 15 import com.lyms.platform.operate.web.facade.ViewFacade;
15 16 import com.lyms.platform.operate.web.result.BirthResult;
  17 +import com.lyms.platform.operate.web.vo.ArchiveUsers;
16 18 import com.lyms.platform.pojo.ArchiveData;
17 19 import com.lyms.platform.query.ArchiveDataQuery;
18 20 import com.lyms.platform.query.PatientsQuery;
... ... @@ -62,6 +64,13 @@
62 64 return patientServiceFacade.getPuerperaList(loginState.getId(),patientsQuery);
63 65 }
64 66  
  67 +
  68 + @RequestMapping(value = "/wx/getPuerperaFmList", method = RequestMethod.GET)
  69 + @ResponseBody
  70 + public BaseResponse getPuerperaList(@RequestParam String parentId){
  71 + return patientServiceFacade.getPuerperaFmList(parentId);
  72 + }
  73 +
65 74 @RequestMapping(value = "/wx/getPatientInfo", method = RequestMethod.GET)
66 75 @ResponseBody
67 76 public BaseResponse getPatientInfo(@RequestParam String parentId){
... ... @@ -70,8 +79,9 @@
70 79  
71 80 @RequestMapping(value = "/wx/update", method = RequestMethod.POST)
72 81 @ResponseBody
73   - public BaseResponse update(BirthResult birthResult){
74   - return patientServiceFacade.updatePuerpera(birthResult);
  82 + public BaseResponse update(String birthResult){
  83 + BirthResult birth = JsonUtil.jkstr2Obj(birthResult, BirthResult.class);
  84 + return patientServiceFacade.updatePuerpera(birth);
75 85 }
76 86  
77 87 @RequestMapping(value = "/wx/getBirthInfo", method = RequestMethod.GET)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ b16d8db
... ... @@ -1893,69 +1893,160 @@
1893 1893  
1894 1894 public BaseResponse updatePuerpera(BirthResult birthResult){
1895 1895 BaseResponse baseResponse = new BaseResponse();
1896   - if (StringUtils.isEmpty(birthResult.getParentId())||StringUtils.isEmpty(birthResult.getBabyId())){
  1896 + if (StringUtils.isEmpty(birthResult.getParentId())){
1897 1897 baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
1898 1898 baseResponse.setErrormsg("数据异常");
1899 1899 return baseResponse;
1900 1900 }
  1901 + Patients mPatients= patientsService.findOnePatientById(birthResult.getParentId());
  1902 + if (mPatients==null){
  1903 + baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  1904 + baseResponse.setErrormsg("数据异常");
  1905 + return baseResponse;
  1906 + }
1901 1907 Patients patients=new Patients();
1902 1908 BeanUtils.copy(birthResult, patients);
1903 1909 patients.setId(birthResult.getParentId());
1904 1910 patientsService.updatePatient(patients);
1905   - BabyModel babyModel=new BabyModel();
1906   - babyModel.setId(birthResult.getBabyId());
1907   - if (StringUtils.isNotEmpty(birthResult.getBabyWeek())){
1908   - babyModel.setWeek(birthResult.getBabyWeek());
  1911 + List<BirthBabyResult> babyResults= birthResult.getResultList();
  1912 + if (CollectionUtils.isNotEmpty(babyResults)){
  1913 + for (BirthBabyResult birthBaby:babyResults){
  1914 + BabyModel babyModel=new BabyModel();
  1915 + if (StringUtils.isEmpty(birthBaby.getBabyId())){
  1916 + babyModel=getBabyModel(babyModel,mPatients);
  1917 + }else {
  1918 + babyModel.setId(birthBaby.getBabyId());
  1919 + }
  1920 + if (StringUtils.isNotEmpty(birthBaby.getBabyWeek())){
  1921 + babyModel.setWeek(birthBaby.getBabyWeek());
  1922 + }
  1923 + if (StringUtils.isNotEmpty(birthBaby.getBabyHeight())){
  1924 + babyModel.setBabyHeight(birthBaby.getBabyHeight());
  1925 + }
  1926 + if (StringUtils.isNotEmpty(birthBaby.getBabyWeight())){
  1927 + babyModel.setBabyWeight(birthBaby.getBabyWeight());
  1928 + }
  1929 + if (StringUtils.isNotEmpty(birthBaby.getDeliverOrg())){
  1930 + babyModel.setDeliverOrg(birthBaby.getDeliverOrg());
  1931 + }
  1932 + if (birthBaby.getBabySex()!=null){
  1933 + babyModel.setSex(birthBaby.getBabySex());
  1934 + }
  1935 + if (StringUtils.isNotEmpty(birthBaby.getBabyName())){
  1936 + babyModel.setName(birthBaby.getBabyName());
  1937 + }
  1938 + if (StringUtils.isNotEmpty(birthBaby.getFirstName())){
  1939 + babyModel.setFirstName(birthBaby.getFirstName());
  1940 + }
  1941 + if (StringUtils.isNotEmpty(birthBaby.getLastName())){
  1942 + babyModel.setLastName(birthBaby.getLastName());
  1943 + }
  1944 + if (StringUtils.isNotEmpty(birthBaby.getBabyAddress())){
  1945 + babyModel.setBabyAddress(birthBaby.getBabyAddress());
  1946 + }
  1947 + if(StringUtils.isNotEmpty(birthBaby.getBabyStreetId())){
  1948 + babyModel.setBabyStreetId(birthBaby.getBabyStreetId());
  1949 + }
  1950 + if (StringUtils.isNotEmpty(birthBaby.getBabyProvinceId())){
  1951 + babyModel.setBabyProvinceId(birthBaby.getBabyProvinceId());
  1952 + }
  1953 + if (StringUtils.isNotEmpty(birthBaby.getBabyCityId())){
  1954 + babyModel.setBabyCityId(birthBaby.getBabyCityId());
  1955 + }
  1956 + if (StringUtils.isNotEmpty(birthBaby.getBabyAreaId())){
  1957 + babyModel.setBabyAreaId(birthBaby.getBabyAreaId());
  1958 + }
  1959 + if(StringUtils.isNotEmpty(birthBaby.getBabyVillageId())){
  1960 + babyModel.setBabyVillageId(birthBaby.getBabyVillageId());
  1961 + }
  1962 + if (StringUtils.isNotEmpty(birthBaby.getBlNo())){
  1963 + babyModel.setBlNo(birthBaby.getBlNo());
  1964 + }
  1965 + if (StringUtils.isEmpty(babyModel.getId())){
  1966 + babyService.addOneBaby(babyModel);
  1967 + }else {
  1968 + babyService.updateOneBaby(babyModel,babyModel.getId());
  1969 + }
  1970 + }
1909 1971 }
1910   - if (StringUtils.isNotEmpty(birthResult.getBabyHeight())){
1911   - babyModel.setBabyHeight(birthResult.getBabyHeight());
  1972 +
  1973 + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  1974 + baseResponse.setErrormsg("成功");
  1975 + return baseResponse;
  1976 + }
  1977 +
  1978 + public BabyModel getBabyModel(BabyModel babyModel,Patients patients){
  1979 + babyModel.setYn(1);
  1980 + babyModel.setHospitalId(patients.getHospitalId());
  1981 + babyModel.setmHighRiskReason(patients.getRiskFactorId());
  1982 + babyModel.setPid(patients.getPid());
  1983 + babyModel.setParentId(patients.getId());
  1984 + babyModel.setCreated(new Date());
  1985 + babyModel.setBirth(patients.getFmDate());
  1986 + babyModel.setFname(patients.getHusbandName());
  1987 + babyModel.setFphone(patients.getHusbandPhone());
  1988 + babyModel.setFjob(patients.getHworkUnit());
  1989 + babyModel.setFbirth(patients.getHusbandBirth());
  1990 + babyModel.setFproTypeId(patients.getHprofessionTypeId());
  1991 + babyModel.setFcertNo(patients.getHcertificateNum());
  1992 + babyModel.setFcertTypeId(patients.getHcertificateTypeId());
  1993 + babyModel.setfLevelId(patients.getHlevelTypeId());
  1994 + babyModel.setMname(patients.getUsername());
  1995 + babyModel.setMphone(patients.getPhone());
  1996 + babyModel.setMjob(patients.getPworkUnit());
  1997 + babyModel.setMbirth(patients.getBirth());
  1998 + babyModel.setMproTypeId(patients.getPprofessionTypeId());
  1999 + babyModel.setMcertNo(patients.getCardNo());
  2000 + babyModel.setMcertTypeId(patients.getHcertificateTypeId());
  2001 + babyModel.setmLevelId(patients.getLevelTypeId());
  2002 + babyModel.setBuildType(2);
  2003 + babyModel.setDueWeek(patients.getFmWeek());
  2004 + // babyModel.set
  2005 + return babyModel;
  2006 + }
  2007 + public BaseResponse getPuerperaFmList(String parentId){
  2008 + BaseResponse baseResponse = new BaseResponse();
  2009 + Patients patients= patientsService.findOnePatientById(parentId);
  2010 + if (patients==null||patients.getType()!=3){
  2011 + baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  2012 + baseResponse.setErrormsg("数据异常");
  2013 + return baseResponse;
1912 2014 }
1913   - if (StringUtils.isNotEmpty(birthResult.getBabyWeight())){
1914   - babyModel.setBabyWeight(birthResult.getBabyWeight());
  2015 + String carNo= patients.getCardNo();
  2016 + PatientsQuery patientsQuery=new PatientsQuery();
  2017 + patientsQuery.setType(3);
  2018 + patientsQuery.setYn(1);
  2019 + patientsQuery.setCardNo(carNo);
  2020 + List<Patients> patientsList= patientsService.queryPatient(patientsQuery);
  2021 + if (CollectionUtils.isNotEmpty(patientsList)){
  2022 + List<Map<String,Object>> mapList=new ArrayList<>();
  2023 + BabyModelQuery babyQuery=new BabyModelQuery();
  2024 + for (Patients patients1:patientsList){
  2025 + Map<String,Object> params=new HashMap<>();
  2026 + params.put("fmDate",patients1.getFmDate());
  2027 + params.put("parentId",patients1.getId());
  2028 + babyQuery.setParentId(patients1.getId());
  2029 + babyQuery.setBirthStart(patients1.getFmDate());
  2030 + babyQuery.setBirthEnd(patients1.getFmDate());
  2031 + List<BabyModel> modelList= babyService.queryBabyWithQuery(babyQuery);
  2032 + if (CollectionUtils.isNotEmpty(modelList)){
  2033 + String babyName="";
  2034 + for (BabyModel babyModel:modelList){
  2035 + babyName+= babyModel.getFirstName()+babyModel.getLastName()+",";
  2036 + }
  2037 + params.put("babyName",babyName);
  2038 + }
  2039 + mapList.add(params);
  2040 + }
  2041 + baseResponse.setObject(mapList);
1915 2042 }
1916   - if (StringUtils.isNotEmpty(birthResult.getDeliverOrg())){
1917   - babyModel.setDeliverOrg(birthResult.getDeliverOrg());
1918   - }
1919   - if (birthResult.getBabySex()!=null){
1920   - babyModel.setSex(birthResult.getBabySex());
1921   - }
1922   - if (StringUtils.isNotEmpty(birthResult.getBabyName())){
1923   - babyModel.setName(birthResult.getBabyName());
1924   - }
1925   - if (StringUtils.isNotEmpty(birthResult.getFirstName())){
1926   - babyModel.setFirstName(birthResult.getFirstName());
1927   - }
1928   - if (StringUtils.isNotEmpty(birthResult.getLastName())){
1929   - babyModel.setLastName(birthResult.getLastName());
1930   - }
1931   - if (StringUtils.isNotEmpty(birthResult.getBabyAddress())){
1932   - babyModel.setBabyAddress(birthResult.getBabyAddress());
1933   - }
1934   - if(StringUtils.isNotEmpty(birthResult.getBabyStreetId())){
1935   - babyModel.setBabyStreetId(birthResult.getBabyStreetId());
1936   - }
1937   - if (StringUtils.isNotEmpty(birthResult.getBabyProvinceId())){
1938   - babyModel.setBabyProvinceId(birthResult.getBabyProvinceId());
1939   - }
1940   - if (StringUtils.isNotEmpty(birthResult.getBabyCityId())){
1941   - babyModel.setBabyCityId(birthResult.getBabyCityId());
1942   - }
1943   - if (StringUtils.isNotEmpty(birthResult.getBabyAreaId())){
1944   - babyModel.setBabyAreaId(birthResult.getBabyAreaId());
1945   - }
1946   - if(StringUtils.isNotEmpty(birthResult.getBabyVillageId())){
1947   - babyModel.setBabyVillageId(birthResult.getBabyVillageId());
1948   - }
1949   - if (StringUtils.isNotEmpty(birthResult.getBlNo())){
1950   - babyModel.setBlNo(birthResult.getBlNo());
1951   - }
1952   -
1953   - babyService.updateOneBaby(babyModel,babyModel.getId());
1954 2043 baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1955 2044 baseResponse.setErrormsg("成功");
1956 2045 return baseResponse;
  2046 +
1957 2047 }
1958 2048  
  2049 +
1959 2050 public BaseResponse getPuerperaInfo(String parentId){
1960 2051 BaseResponse baseResponse = new BaseResponse();
1961 2052 Patients patients= patientsService.findOnePatientById(parentId);
1962 2053  
... ... @@ -1982,21 +2073,28 @@
1982 2073 babyQuery.setParentId(patients.getId());
1983 2074 List<BabyModel> babyModels= babyService.queryBabyWithQuery(babyQuery);
1984 2075 if (CollectionUtils.isNotEmpty(babyModels)){
1985   - BabyModel babyModel= babyModels.get(0);
1986   - birthResult.setBabyId(babyModel.getId());
1987   - birthResult.setBabyHeight(babyModel.getBabyHeight());
1988   - birthResult.setBabyName(babyModel.getName());
1989   - birthResult.setBabyWeight(babyModel.getBabyWeight());
1990   - birthResult.setBabyWeek(babyWeek);
1991   - birthResult.setBabySex(babyModel.getSex());
1992   - birthResult.setCommunityId(babyModel.getCommunityId());
1993   - if (StringUtils.isNotEmpty(babyModel.getDeliverOrg())){
1994   - Organization organization= organizationService.getOrganization(Integer.valueOf(babyModel.getDeliverOrg()));
1995   - birthResult.setDeliverOrg(organization.getName());
  2076 + List<BirthBabyResult> list=new ArrayList<>();
  2077 + for (BabyModel babyModel:babyModels){
  2078 + BirthBabyResult birthBabyResult=new BirthBabyResult();
  2079 + birthBabyResult.setBabyId(babyModel.getId());
  2080 + birthBabyResult.setBabyHeight(babyModel.getBabyHeight());
  2081 + birthBabyResult.setBabyName(babyModel.getName());
  2082 + birthBabyResult.setBabyWeight(babyModel.getBabyWeight());
  2083 + birthBabyResult.setBabyWeek(babyWeek);
  2084 + birthBabyResult.setBabySex(babyModel.getSex());
  2085 + birthBabyResult.setCommunityId(babyModel.getCommunityId());
  2086 + if (StringUtils.isNotEmpty(babyModel.getDeliverOrg())){
  2087 + Organization organization= organizationService.getOrganization(Integer.valueOf(babyModel.getDeliverOrg()));
  2088 + birthBabyResult.setDeliverOrg(organization.getName());
  2089 + }
  2090 + if(StringUtils.isNotEmpty(babyModel.getBlNo())){
  2091 + birthBabyResult.setBlNo(babyModel.getBlNo());
  2092 + }
  2093 + birthBabyResult.setFirstName(babyModel.getFirstName());
  2094 + birthBabyResult.setLastName(babyModel.getLastName());
  2095 + list.add(birthBabyResult);
1996 2096 }
1997   - birthResult.setBlNo(babyModel.getBlNo());
1998   - birthResult.setFirstName(babyModel.getFirstName());
1999   - birthResult.setLastName(babyModel.getLastName());
  2097 + birthResult.setResultList(list);
2000 2098 }
2001 2099 baseResponse.setObject(birthResult);
2002 2100 baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
... ... @@ -2036,20 +2134,28 @@
2036 2134 babyQuery.setParentId(patients.getId());
2037 2135 List<BabyModel> babyModels= babyService.queryBabyWithQuery(babyQuery);
2038 2136 if (CollectionUtils.isNotEmpty(babyModels)){
2039   - BabyModel babyModel= babyModels.get(0);
2040   - birthResult.setBabyId(babyModel.getId());
2041   - birthResult.setBabyHeight(babyModel.getBabyHeight());
2042   - birthResult.setBabyName(babyModel.getName());
2043   - birthResult.setBabyWeight(babyModel.getBabyWeight());
2044   - birthResult.setBabyWeek(babyWeek);
2045   - birthResult.setBabySex(babyModel.getSex());
2046   - birthResult.setCommunityId(babyModel.getCommunityId());
2047   - birthResult.setDeliverOrg(babyModel.getDeliverOrg());
2048   - //birthResult.setBlNo(babyModel.getBlNo());
2049   - birthResult.setFirstName(babyModel.getFirstName());
2050   - birthResult.setLastName(babyModel.getLastName());
2051   - //birthResult.setBabyAddress(CommonsHelper.getResidence(babyModel.getBabyProvinceId(),babyModel.getBabyCityId(),babyModel.getBabyAreaId(),babyModel.getBabyStreetId(),babyModel.getBabyAddress(),basicConfigService));
2052   -
  2137 + List<BirthBabyResult> babyResults=new ArrayList<>();
  2138 + for (BabyModel babyModel:babyModels){
  2139 + BirthBabyResult birthBabyResult=new BirthBabyResult();
  2140 + birthBabyResult.setBabyId(babyModel.getId());
  2141 + birthBabyResult.setBabyHeight(babyModel.getBabyHeight());
  2142 + birthBabyResult.setBabyName(babyModel.getName());
  2143 + birthBabyResult.setBabyWeight(babyModel.getBabyWeight());
  2144 + birthBabyResult.setBabyWeek(babyWeek);
  2145 + birthBabyResult.setBabySex(babyModel.getSex());
  2146 + birthBabyResult.setCommunityId(babyModel.getCommunityId());
  2147 + if (StringUtils.isNotEmpty(babyModel.getDeliverOrg())){
  2148 + Organization organization= organizationService.getOrganization(Integer.valueOf(babyModel.getDeliverOrg()));
  2149 + birthBabyResult.setDeliverOrg(organization.getName());
  2150 + }
  2151 + if(StringUtils.isNotEmpty(babyModel.getBlNo())){
  2152 + birthBabyResult.setBlNo(babyModel.getBlNo());
  2153 + }
  2154 + birthBabyResult.setFirstName(babyModel.getFirstName());
  2155 + birthBabyResult.setLastName(babyModel.getLastName());
  2156 + babyResults.add(birthBabyResult);
  2157 + }
  2158 + birthResult.setResultList(babyResults);
2053 2159 }
2054 2160 birthResults.add(birthResult);
2055 2161 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ b16d8db
... ... @@ -443,9 +443,15 @@
443 443 babyQuery.setParentId(data.getId());
444 444 List<BabyModel> babyModels= babyService.queryBabyWithQuery(babyQuery);
445 445 if (CollectionUtils.isNotEmpty(babyModels)){
446   - BabyModel babyModel= babyModels.get(0);
  446 + List<Map<String,String>> list=new ArrayList<>();
  447 + for (BabyModel babyModel:babyModels){
  448 + //BabyModel babyModel= babyModels.get(0);
  449 + Map<String,String> params=new HashMap<>();
  450 + params.put("babyAddress",CommonsHelper.getResidence(babyModel.getBabyProvinceId(),babyModel.getBabyCityId(),babyModel.getBabyAreaId(),babyModel.getBabyStreetId(),babyModel.getBabyAddress(),basicConfigService));
  451 + list.add(params);
  452 + }
447 453 /* 儿童数据*/
448   - map.put("babyAddress",CommonsHelper.getResidence(babyModel.getBabyProvinceId(),babyModel.getBabyCityId(),babyModel.getBabyAreaId(),babyModel.getBabyStreetId(),babyModel.getBabyAddress(),basicConfigService));
  454 + map.put("babyAddress",list);
449 455 }
450 456 return map;
451 457 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthBabyResult.java View file @ b16d8db
  1 +package com.lyms.platform.operate.web.result;
  2 +
  3 +public class BirthBabyResult {
  4 + /**
  5 + * 儿童出生社区id
  6 + */
  7 + private String communityId;
  8 + //助产机构
  9 + private String deliverOrg;
  10 + //儿童孕周
  11 + private String babyWeek;
  12 + private Integer babySex;
  13 + //体重
  14 + private String babyWeight;
  15 + //身高
  16 + private String babyHeight;
  17 +
  18 + private String babyId;
  19 + /**
  20 + * 小孩名称
  21 + */
  22 + private String babyName;
  23 + private String firstName;
  24 + private String lastName;
  25 + //病历号(住院号)
  26 + private String blNo;
  27 + /**
  28 + * 儿童出生地址
  29 + */
  30 + private String babyAddress;
  31 + private String babyProvinceId;
  32 + private String babyCityId;
  33 + private String babyAreaId;
  34 + private String babyStreetId;
  35 + private String babyVillageId;
  36 +
  37 + public String getCommunityId() {
  38 + return communityId;
  39 + }
  40 +
  41 + public void setCommunityId(String communityId) {
  42 + this.communityId = communityId;
  43 + }
  44 +
  45 + public String getDeliverOrg() {
  46 + return deliverOrg;
  47 + }
  48 +
  49 + public void setDeliverOrg(String deliverOrg) {
  50 + this.deliverOrg = deliverOrg;
  51 + }
  52 +
  53 + public String getBabyWeek() {
  54 + return babyWeek;
  55 + }
  56 +
  57 + public void setBabyWeek(String babyWeek) {
  58 + this.babyWeek = babyWeek;
  59 + }
  60 +
  61 + public Integer getBabySex() {
  62 + return babySex;
  63 + }
  64 +
  65 + public void setBabySex(Integer babySex) {
  66 + this.babySex = babySex;
  67 + }
  68 +
  69 + public String getBabyWeight() {
  70 + return babyWeight;
  71 + }
  72 +
  73 + public void setBabyWeight(String babyWeight) {
  74 + this.babyWeight = babyWeight;
  75 + }
  76 +
  77 + public String getBabyHeight() {
  78 + return babyHeight;
  79 + }
  80 +
  81 + public void setBabyHeight(String babyHeight) {
  82 + this.babyHeight = babyHeight;
  83 + }
  84 +
  85 + public String getBabyId() {
  86 + return babyId;
  87 + }
  88 +
  89 + public void setBabyId(String babyId) {
  90 + this.babyId = babyId;
  91 + }
  92 +
  93 + public String getBabyName() {
  94 + return babyName;
  95 + }
  96 +
  97 + public void setBabyName(String babyName) {
  98 + this.babyName = babyName;
  99 + }
  100 +
  101 + public String getFirstName() {
  102 + return firstName;
  103 + }
  104 +
  105 + public void setFirstName(String firstName) {
  106 + this.firstName = firstName;
  107 + }
  108 +
  109 + public String getLastName() {
  110 + return lastName;
  111 + }
  112 +
  113 + public void setLastName(String lastName) {
  114 + this.lastName = lastName;
  115 + }
  116 +
  117 + public String getBlNo() {
  118 + return blNo;
  119 + }
  120 +
  121 + public void setBlNo(String blNo) {
  122 + this.blNo = blNo;
  123 + }
  124 +
  125 + public String getBabyAddress() {
  126 + return babyAddress;
  127 + }
  128 +
  129 + public void setBabyAddress(String babyAddress) {
  130 + this.babyAddress = babyAddress;
  131 + }
  132 +
  133 + public String getBabyProvinceId() {
  134 + return babyProvinceId;
  135 + }
  136 +
  137 + public void setBabyProvinceId(String babyProvinceId) {
  138 + this.babyProvinceId = babyProvinceId;
  139 + }
  140 +
  141 + public String getBabyCityId() {
  142 + return babyCityId;
  143 + }
  144 +
  145 + public void setBabyCityId(String babyCityId) {
  146 + this.babyCityId = babyCityId;
  147 + }
  148 +
  149 + public String getBabyAreaId() {
  150 + return babyAreaId;
  151 + }
  152 +
  153 + public void setBabyAreaId(String babyAreaId) {
  154 + this.babyAreaId = babyAreaId;
  155 + }
  156 +
  157 + public String getBabyStreetId() {
  158 + return babyStreetId;
  159 + }
  160 +
  161 + public void setBabyStreetId(String babyStreetId) {
  162 + this.babyStreetId = babyStreetId;
  163 + }
  164 +
  165 + public String getBabyVillageId() {
  166 + return babyVillageId;
  167 + }
  168 +
  169 + public void setBabyVillageId(String babyVillageId) {
  170 + this.babyVillageId = babyVillageId;
  171 + }
  172 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java View file @ b16d8db
... ... @@ -4,8 +4,10 @@
4 4 import com.lyms.platform.common.utils.DateUtil;
5 5  
6 6 import java.util.Date;
  7 +import java.util.List;
7 8  
8 9 public class BirthResult {
  10 + private String hospitalId;
9 11 private String parentId;
10 12 private String pId;
11 13 private String username;
12 14  
13 15  
... ... @@ -94,39 +96,25 @@
94 96 private String streetId;
95 97 private String villageId;
96 98  
97   - /**
98   - * 儿童出生社区id
99   - */
100   - private String communityId;
101   - //助产机构
102   - private String deliverOrg;
103   - //儿童孕周
104   - private String babyWeek;
105   - private Integer babySex;
106   - //体重
107   - private String babyWeight;
108   - //身高
109   - private String babyHeight;
  99 + public String getHospitalId() {
  100 + return hospitalId;
  101 + }
110 102  
111   - private String babyId;
112   - /**
113   - * 小孩名称
114   - */
115   - private String babyName;
116   - private String firstName;
117   - private String lastName;
118   - //病历号(住院号)
119   - private String blNo;
120   - /**
121   - * 儿童出生地址
122   - */
123   - private String babyAddress;
124   - private String babyProvinceId;
125   - private String babyCityId;
126   - private String babyAreaId;
127   - private String babyStreetId;
128   - private String babyVillageId;
  103 + public void setHospitalId(String hospitalId) {
  104 + this.hospitalId = hospitalId;
  105 + }
129 106  
  107 + //儿童信息数组
  108 + private List<BirthBabyResult> resultList;
  109 +
  110 + public List<BirthBabyResult> getResultList() {
  111 + return resultList;
  112 + }
  113 +
  114 + public void setResultList(List<BirthBabyResult> resultList) {
  115 + this.resultList = resultList;
  116 + }
  117 +
130 118 public Integer getHmarriageAge() {
131 119 return husbandBirth!=null?DateUtil.getAge(husbandBirth):hmarriageAge;
132 120 }
133 121  
134 122  
... ... @@ -143,26 +131,8 @@
143 131 this.husbandBirth = husbandBirth;
144 132 }
145 133  
146   - public String getFirstName() {
147   - return firstName;
148   - }
149 134  
150   - public void setFirstName(String firstName) {
151   - this.firstName = firstName;
152   - }
153 135  
154   - public String getLastName() {
155   - return lastName;
156   - }
157   -
158   - public void setLastName(String lastName) {
159   - this.lastName = lastName;
160   - }
161   -
162   - public String getBabyId() {
163   - return babyId;
164   - }
165   -
166 136 public String getPhone() {
167 137 return phone;
168 138 }
... ... @@ -187,18 +157,6 @@
187 157 this.fmDate = fmDate;
188 158 }
189 159  
190   - public void setBabyId(String babyId) {
191   - this.babyId = babyId;
192   - }
193   -
194   - public String getBlNo() {
195   - return blNo;
196   - }
197   -
198   - public void setBlNo(String blNo) {
199   - this.blNo = blNo;
200   - }
201   -
202 160 public String getParentId() {
203 161 return parentId;
204 162 }
... ... @@ -439,62 +397,6 @@
439 397 this.villageId = villageId;
440 398 }
441 399  
442   - public String getCommunityId() {
443   - return communityId;
444   - }
445   -
446   - public void setCommunityId(String communityId) {
447   - this.communityId = communityId;
448   - }
449   -
450   - public String getDeliverOrg() {
451   - return deliverOrg;
452   - }
453   -
454   - public void setDeliverOrg(String deliverOrg) {
455   - this.deliverOrg = deliverOrg;
456   - }
457   -
458   - public String getBabyWeek() {
459   - return babyWeek;
460   - }
461   -
462   - public void setBabyWeek(String babyWeek) {
463   - this.babyWeek = babyWeek;
464   - }
465   -
466   - public Integer getBabySex() {
467   - return babySex;
468   - }
469   -
470   - public void setBabySex(Integer babySex) {
471   - this.babySex = babySex;
472   - }
473   -
474   - public String getBabyWeight() {
475   - return babyWeight;
476   - }
477   -
478   - public void setBabyWeight(String babyWeight) {
479   - this.babyWeight = babyWeight;
480   - }
481   -
482   - public String getBabyHeight() {
483   - return babyHeight;
484   - }
485   -
486   - public void setBabyHeight(String babyHeight) {
487   - this.babyHeight = babyHeight;
488   - }
489   -
490   - public String getBabyName() {
491   - return babyName;
492   - }
493   -
494   - public void setBabyName(String babyName) {
495   - this.babyName = babyName;
496   - }
497   -
498 400 public Date getBirth() {
499 401 return birth;
500 402 }
... ... @@ -559,52 +461,5 @@
559 461 this.villageRegister = villageRegister;
560 462 }
561 463  
562   - public String getBabyAddress() {
563   - return babyAddress;
564   - }
565   -
566   - public void setBabyAddress(String babyAddress) {
567   - this.babyAddress = babyAddress;
568   - }
569   -
570   - public String getBabyProvinceId() {
571   - return babyProvinceId;
572   - }
573   -
574   - public void setBabyProvinceId(String babyProvinceId) {
575   - this.babyProvinceId = babyProvinceId;
576   - }
577   -
578   - public String getBabyCityId() {
579   - return babyCityId;
580   - }
581   -
582   - public void setBabyCityId(String babyCityId) {
583   - this.babyCityId = babyCityId;
584   - }
585   -
586   - public String getBabyAreaId() {
587   - return babyAreaId;
588   - }
589   -
590   - public void setBabyAreaId(String babyAreaId) {
591   - this.babyAreaId = babyAreaId;
592   - }
593   -
594   - public String getBabyStreetId() {
595   - return babyStreetId;
596   - }
597   -
598   - public void setBabyStreetId(String babyStreetId) {
599   - this.babyStreetId = babyStreetId;
600   - }
601   -
602   - public String getBabyVillageId() {
603   - return babyVillageId;
604   - }
605   -
606   - public void setBabyVillageId(String babyVillageId) {
607   - this.babyVillageId = babyVillageId;
608   - }
609 464 }