jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 606a01bfb9d8d499ce36e368cebb3ce89d48be62

Authored by yangfei
2 parents 4802c25d89 bc47cb31a4
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntenatalExaminationDaoImpl.java View file @ 606a01b
... ... @@ -166,7 +166,7 @@
166 166 Criteria criteria = Criteria.where("hospitalId").is(hospitalId);
167 167 if (startTime != null && endTime != null)
168 168 {
169   - criteria.and("checkTime").gte(startTime).lte(endTime);
  169 + criteria.and("buildTime").gte(startTime).lte(endTime);
170 170 }
171 171 DBObject dbObject = criteria.getCriteriaObject();
172 172 MapReduceCommand cmd = new MapReduceCommand(collections, map, reduce,
platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java View file @ 606a01b
... ... @@ -80,6 +80,17 @@
80 80 private String areaId;
81 81 private String streetId;
82 82  
  83 + // 0～12 孕周 16～20 孕周 21～24 孕周 28～36 孕周 37～ 分娩
  84 + // 1 表示在上面各个孕周范围内的第一次检查，2 不是
  85 + private Integer isFirst;
  86 +
  87 + public Integer getIsFirst() {
  88 + return isFirst;
  89 + }
  90 +
  91 + public void setIsFirst(Integer isFirst) {
  92 + this.isFirst = isFirst;
  93 + }
83 94  
84 95 public String getAddress() {
85 96 return address;
platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java View file @ 606a01b
... ... @@ -229,6 +229,18 @@
229 229 private Date gteCreated;
230 230 private String pid;
231 231  
  232 + // 0～12 孕周 16～20 孕周 21～24 孕周 28～36 孕周 37～ 分娩
  233 + // 1 表示在上面各个孕周范围内的第一次检查，2 不是
  234 + private Integer isFirst;
  235 +
  236 + public Integer getIsFirst() {
  237 + return isFirst;
  238 + }
  239 +
  240 + public void setIsFirst(Integer isFirst) {
  241 + this.isFirst = isFirst;
  242 + }
  243 +
232 244 public Date getCheckTimeStart() {
233 245 return checkTimeStart;
234 246 }
... ... @@ -398,6 +410,10 @@
398 410  
399 411 if (StringUtils.isNotEmpty(name)) {
400 412 condition = condition.and("name", name, MongoOper.IS);
  413 + }
  414 +
  415 + if (isFirst != null) {
  416 + condition = condition.and("isFirst", isFirst, MongoOper.IS);
401 417 }
402 418 if (null != NeNullCheckDoctor) {
403 419 condition = condition.and("checkDoctor", null, MongoOper.NE);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java View file @ 606a01b
... ... @@ -84,18 +84,18 @@
84 84 * @param areaId
85 85 * @return
86 86 */
87   -// @RequestMapping(method = RequestMethod.GET,value = "/getCheckPointBuildDetailExport")
88   -// @ResponseBody
89   -// @TokenRequired
90   -// public void getCheckPointBuildDetailExport(HttpServletRequest request,HttpServletResponse httpServletResponse,
91   -// @RequestParam(required = false) String time,
92   -// @RequestParam(required = false)String hospitalId,
93   -// @RequestParam(required = false)String provinceId,
94   -// @RequestParam(required = false)String cityId,
95   -// @RequestParam(required = false)String areaId) {
96   -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
97   -// areaCountFacade.getCheckPointBuildDetailExport(time, hospitalId, provinceId, cityId, areaId, loginState.getId(),httpServletResponse);
98   -// }
  87 + @RequestMapping(method = RequestMethod.GET,value = "/getCheckPointBuildDetailExport")
  88 + @ResponseBody
  89 + @TokenRequired
  90 + public void getCheckPointBuildDetailExport(HttpServletRequest request,HttpServletResponse httpServletResponse,
  91 + @RequestParam(required = false) String time,
  92 + @RequestParam(required = false)String hospitalId,
  93 + @RequestParam(required = false)String provinceId,
  94 + @RequestParam(required = false)String cityId,
  95 + @RequestParam(required = false)String areaId) {
  96 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  97 + areaCountFacade.getCheckPointBuildDetailExport(time, hospitalId, provinceId, cityId, areaId, loginState.getId(),httpServletResponse);
  98 + }
99 99  
100 100  
101 101 /**
... ... @@ -131,38 +131,6 @@
131 131 cityId, areaId, page, limit, loginState.getId(),nodeName);
132 132 }
133 133  
134   -
135   - /**
136   - * 产检券使用明细 导出
137   - * @param request
138   - * @param time
139   - * @param hospitalId
140   - * @param provinceId
141   - * @param cityId
142   - * @param areaId
143   - * @param page
144   - * @param limit
145   - * @param nodeType 1 首次 2 全部
146   - * @param nodeName 0:0～12 孕周 1: 16～20 孕周 2: 21～24 孕周 3:28～36 孕周 4:37～ 分娩
147   - * @return
148   - */
149   -// @RequestMapping(method = RequestMethod.GET,value = "/getCheckDetailExport")
150   -// @ResponseBody
151   -// @TokenRequired
152   -// public void getCheckDetailExport(HttpServletRequest request,HttpServletResponse httpServletResponse,
153   -// @RequestParam(required = false) String time,
154   -// @RequestParam(required = false)String hospitalId,
155   -// @RequestParam(required = false)String provinceId,
156   -// @RequestParam(required = false)String cityId,
157   -// @RequestParam(required = false)String areaId,
158   -// @RequestParam(required = false) Integer page,
159   -// @RequestParam(required = false) Integer limit,
160   -// @RequestParam(required = false)Integer nodeType,
161   -// @RequestParam(required = false)Integer nodeName) {
162   -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
163   -// areaCountFacade.getCheckDetailExport(nodeType,time, hospitalId, provinceId, cityId, areaId, loginState.getId(),
164   -// httpServletResponse,nodeName);
165   -// }
166 134  
167 135 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java View file @ 606a01b
1 1 package com.lyms.platform.operate.web.facade;
2 2  
3 3  
4   -import com.lyms.platform.biz.service.AntenatalExaminationService;
5   -import com.lyms.platform.biz.service.BasicConfigService;
6   -import com.lyms.platform.biz.service.DataPermissionService;
7   -import com.lyms.platform.biz.service.PatientsService;
  4 +import com.lyms.platform.biz.service.*;
8 5 import com.lyms.platform.common.constants.ErrorCodeConstants;
9 6 import com.lyms.platform.common.enums.YnEnums;
10 7 import com.lyms.platform.common.result.BaseListResponse;
11 8  
12 9  
... ... @@ -14,14 +11,17 @@
14 11 import com.lyms.platform.common.utils.StringUtils;
15 12 import com.lyms.platform.operate.web.utils.CommonsHelper;
16 13 import com.lyms.platform.operate.web.utils.FunvCommonUtil;
  14 +import com.lyms.platform.operate.web.utils.ResponseUtil;
17 15 import com.lyms.platform.operate.web.worker.CheckPointCountWorker;
18 16 import com.lyms.platform.permission.model.Organization;
19 17 import com.lyms.platform.permission.model.OrganizationQuery;
20 18 import com.lyms.platform.permission.model.Users;
21 19 import com.lyms.platform.permission.service.OrganizationService;
22 20 import com.lyms.platform.permission.service.UsersService;
  21 +import com.lyms.platform.pojo.AntExRecordModel;
23 22 import com.lyms.platform.pojo.DataPermissionsModel;
24 23 import com.lyms.platform.pojo.Patients;
  24 +import com.lyms.platform.query.AntExRecordQuery;
25 25 import com.lyms.platform.query.DataPermissionsModelQuery;
26 26 import com.lyms.platform.query.PatientsQuery;
27 27 import org.apache.commons.collections.CollectionUtils;
... ... @@ -29,6 +29,8 @@
29 29 import org.springframework.beans.factory.annotation.Qualifier;
30 30 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
31 31 import org.springframework.stereotype.Component;
  32 +
  33 +import javax.servlet.http.HttpServletResponse;
32 34 import java.util.*;
33 35 import java.util.concurrent.Future;
34 36  
35 37  
... ... @@ -41,7 +43,11 @@
41 43 @Component
42 44 public class AreaCountFacade {
43 45  
  46 +
44 47 @Autowired
  48 + private AntExRecordService recordService;
  49 +
  50 + @Autowired
45 51 private AutoMatchFacade autoMatchFacade;
46 52  
47 53 @Autowired
... ... @@ -369,6 +375,22 @@
369 375 */
370 376 public BaseResponse getCheckPointBuildDetail(String time, String hospitalId,
371 377 String provinceId, String cityId, String areaId, Integer page, Integer limit, Integer userId) {
  378 +
  379 + PatientsQuery patientsQuery = new PatientsQuery();
  380 + patientsQuery.setNeed("true");
  381 + List<Map<String,Object>> list = getCheckPointList( time, hospitalId,
  382 + provinceId, cityId, areaId, page, limit, userId,patientsQuery);
  383 +
  384 + return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setPageInfo(patientsQuery.getPageInfo());
  385 + }
  386 +
  387 +
  388 +
  389 + private List getCheckPointList(String time, String hospitalId,
  390 + String provinceId, String cityId,
  391 + String areaId, Integer page, Integer limit,
  392 + Integer userId,PatientsQuery patientsQuery)
  393 + {
372 394 List<String> hospitalIds = new ArrayList<>();
373 395 if (StringUtils.isNotEmpty(hospitalId)) {
374 396 hospitalIds.add(hospitalId);
... ... @@ -388,7 +410,7 @@
388 410 endTime = DateUtil.parseYMD(times[1]);
389 411 }
390 412 }
391   - PatientsQuery patientsQuery = new PatientsQuery();
  413 +
392 414 patientsQuery.setYn(YnEnums.YES.getId());
393 415 patientsQuery.setHospitalList(hospitalIds);
394 416  
395 417  
... ... @@ -401,8 +423,8 @@
401 423  
402 424 patientsQuery.setBookbuildingDateStart(startTime);
403 425 patientsQuery.setBookbuildingDateEnd(endTime);
404   - patientsQuery.setNeed("true");
405 426  
  427 +
406 428 patientsQuery.setPage(page);
407 429 patientsQuery.setLimit(limit);
408 430  
409 431  
410 432  
... ... @@ -455,10 +477,49 @@
455 477  
456 478 }
457 479 }
  480 + return list;
  481 + }
458 482  
459   - return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setPageInfo(patientsQuery.getPageInfo());
  483 +
  484 + public void getCheckPointBuildDetailExport(String time, String hospitalId, String provinceId, String cityId, String areaId,
  485 + Integer userId, HttpServletResponse httpServletResponse) {
  486 +
  487 + PatientsQuery patientsQuery = new PatientsQuery();
  488 + patientsQuery.setNeed("true");
  489 + List<Map<String,Object>> list = getCheckPointList( time, hospitalId,
  490 + provinceId, cityId, areaId, null, null, userId,patientsQuery);
  491 +
  492 + List<Map<String,Object>> results = new ArrayList<>();
  493 + if (CollectionUtils.isNotEmpty(list))
  494 + {
  495 + for (Map<String,Object> map : list)
  496 + {
  497 + Map<String,Object> result = new HashMap<>();
  498 + result.put("createDate", map.get("CREATE_DATE") == null ? "" : DateUtil.getyyyy_MM_dd((Date)map.get("CREATE_DATE"))); //建档日期
  499 + result.put("name", map.get("NAME")); //姓名
  500 + result.put("buildWeek", map.get("YZ_NAME")); //建档孕周
  501 + result.put("hospitalName", map.get("HOSPITAL_NAME")); //建档机构
  502 + result.put("doctor",map.get("DOCTOR_NAME")); //建档医生
  503 + result.put("homeAddr", map.get("HOME_ADDR")); //居住地
  504 + result.put("hjAddr",map.get("HJ_ADDR")); //户籍地
  505 + result.put("telNo",map.get("TEL_NO")); //联系电话
  506 + results.add(result);
  507 + }
  508 + }
  509 +
  510 + Map<String, String> cnames = new LinkedHashMap<>();
  511 + cnames.put("createDate", "建档日期"); //建档日期
  512 + cnames.put("name", "姓名"); //姓名
  513 + cnames.put("buildWeek", "建档孕周"); //建档孕周
  514 + cnames.put("hospitalName", "建档机构"); //建档机构
  515 + cnames.put("doctor","建档医生"); //建档医生
  516 + cnames.put("homeAddr","居住地"); //居住地
  517 + cnames.put("hjAddr","户籍地"); //户籍地
  518 + cnames.put("telNo","联系电话"); //联系电话
  519 + ResponseUtil.responseExcel(cnames, results, httpServletResponse);
460 520 }
461 521  
  522 +
462 523 /**
463 524 * 产检明细
464 525 * @param nodeType 1 首次 2 全部
465 526  
466 527  
... ... @@ -499,20 +560,124 @@
499 560 }
500 561 }
501 562  
502   - return null;
  563 + AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
  564 + antExRecordQuery.setBirthStart(startTime);
  565 + antExRecordQuery.setBuildTimeEnd(endTime);
  566 + antExRecordQuery.setHospitalList(hospitalIds);
  567 + antExRecordQuery.setPage(page);
  568 + antExRecordQuery.setLimit(limit);
  569 + antExRecordQuery.setNeed("true");
  570 + antExRecordQuery.setIsFirst(nodeType);
  571 +
  572 +
  573 + if (nodeName != null)
  574 + {
  575 + if (nodeName == 0)
  576 + {
  577 + antExRecordQuery.setcDueWeekStart(0);
  578 + antExRecordQuery.setcDueWeekEnd((12 + 1) * 7 - 1);
  579 + }
  580 + else if (nodeName == 1)
  581 + {
  582 + antExRecordQuery.setcDueWeekStart(16);
  583 + antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1);
  584 + }
  585 + else if (nodeName == 2)
  586 + {
  587 + antExRecordQuery.setcDueWeekStart(21);
  588 + antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1);
  589 + }
  590 + else if (nodeName == 3)
  591 + {
  592 + antExRecordQuery.setcDueWeekStart(28);
  593 + antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1);
  594 + }
  595 + else if (nodeName == 4)
  596 + {
  597 + antExRecordQuery.setcDueWeekStart(37);
  598 + antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1);
  599 + }
  600 + }
  601 +
  602 +
  603 + List<AntExRecordModel> list = recordService.queryAntExRecords(antExRecordQuery);
  604 +
  605 + List<Map> results = new ArrayList<>();
  606 + if (CollectionUtils.isNotEmpty(list))
  607 + {
  608 + for(AntExRecordModel model : list)
  609 + {
  610 + Map<String,Object> map = new HashMap<>();
  611 + map.put("EXAMINE_DATE", DateUtil.getyyyy_MM_dd(model.getCheckTime())); //产检日期
  612 + map.put("NAME",model.getName()); //姓名
  613 + map.put("YZ_NAME", StringUtils.dueWeek(model.getcDay())); //产检孕周
  614 + map.put("EXAMINE_HISTORY_NUM",""); //产检第次
  615 +
  616 +
  617 + String chospital = "";
  618 + if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getHospitalId())) {
  619 + Organization organization = organizationService.getOrganization(Integer.parseInt(model.getHospitalId()));
  620 + if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
  621 + chospital = organization.getName();
  622 + }
  623 + }
  624 +
  625 + map.put("EXAMINE_HOSPITAL",chospital); //产检机构
  626 +
  627 +
  628 + //建档医生
  629 + String bookbuildingDoctor = "";
  630 + if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getBuildDoctor()) && FunvCommonUtil.isNumeric(model.getBuildDoctor())) {
  631 + Users users = usersService.getUsers(Integer.parseInt(model.getBuildDoctor()));
  632 + if (users != null && users.getYn() == YnEnums.YES.getId()) {
  633 + bookbuildingDoctor = users.getName();
  634 + }
  635 + }
  636 +
  637 + map.put("DOCTOR_NAME",bookbuildingDoctor); //建档医生
  638 +
  639 +
  640 +
  641 + String checkDoctor = "";
  642 + if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getCheckDoctor()) && FunvCommonUtil.isNumeric(model.getCheckDoctor())) {
  643 + Users users = usersService.getUsers(Integer.parseInt(model.getCheckDoctor()));
  644 + if (users != null && users.getYn() == YnEnums.YES.getId()) {
  645 + checkDoctor = users.getName();
  646 + }
  647 + }
  648 +
  649 + map.put("DOCTOR_NAME", checkDoctor); //产检医生
  650 +
  651 + PatientsQuery patientsQuery = new PatientsQuery();
  652 + patientsQuery.setYn(YnEnums.YES.getId());
  653 + patientsQuery.setId(model.getParentId());
  654 + List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
  655 +
  656 +
  657 + String buildHosp = "";
  658 + if (CollectionUtils.isNotEmpty(patientsList))
  659 + {
  660 + if (org.apache.commons.lang.StringUtils.isNotEmpty(patientsList.get(0).getHospitalId())) {
  661 + Organization organization = organizationService.getOrganization(Integer.parseInt(patientsList.get(0).getHospitalId()));
  662 + if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
  663 + buildHosp = organization.getName();
  664 + }
  665 + }
  666 + }
  667 + map.put("JD_HOSPITAL",buildHosp); //建档机构
  668 + map.put("TEL_NO",map.get("TEL_NO")); //联系电话
  669 + results.add(map);
  670 + results.add(map);
  671 + }
  672 + }
  673 + return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setPageInfo(antExRecordQuery.getPageInfo());
503 674 }
504 675 }
505 676  
506   -// public BaseResponse getCheckPointBuildDetail(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer page, Integer limit, Integer userId) {
507   -//
508   -// PageInfo pageInfo = new PageInfo(page, 0, count, limit);
509   -//
510   -// List<Map<String, Object>> checkBuildtList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql);
511   -// return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(checkBuildtList).setPageInfo(pageInfo);
512   -// }
513 677  
514 678  
515 679  
  680 +
516 681 // public void getCheckDetailExport(Integer pointType, String time, String hospitalId,
517 682 // String provinceId, String cityId, String areaId,
518 683 // Integer userId, HttpServletResponse httpServletResponse,Integer nodeName) {
... ... @@ -545,40 +710,6 @@
545 710 // cnames.put("jdHospital","建档机构"); //建档机构
546 711 // cnames.put("telNo","联系电话"); //联系电话
547 712 //
548   -// ResponseUtil.responseExcel(cnames,results,httpServletResponse);
549   -// }
550   -
551   -// public void getCheckPointBuildDetailExport(String time, String hospitalId, String provinceId, String cityId, String areaId,
552   -// Integer userId, HttpServletResponse httpServletResponse) {
553   -//
554   -//
555   -// List<Map<String,Object>> results = new ArrayList<>();
556   -// if (CollectionUtils.isNotEmpty(ticketList))
557   -// {
558   -// for (Map<String,Object> map : ticketList)
559   -// {
560   -// Map<String,Object> result = new HashMap<>();
561   -// result.put("createDate", map.get("CREATE_DATE") == null ? "" : DateUtil.getyyyy_MM_dd((Date)map.get("CREATE_DATE"))); //建档日期
562   -// result.put("name", map.get("NAME")); //姓名
563   -// result.put("buildWeek", map.get("YZ_NAME")); //建档孕周
564   -// result.put("hospitalName", map.get("HOSPITAL_NAME")); //建档机构
565   -// result.put("doctor",map.get("DOCTOR_NAME")); //建档医生
566   -// result.put("homeAddr", map.get("HOME_ADDR")); //居住地
567   -// result.put("hjAddr",map.get("HJ_ADDR")); //户籍地
568   -// result.put("telNo",map.get("TEL_NO")); //联系电话
569   -// results.add(result);
570   -// }
571   -// }
572   -//
573   -// Map<String, String> cnames = new LinkedHashMap<>();
574   -// cnames.put("createDate", "建档日期"); //建档日期
575   -// cnames.put("name", "姓名"); //姓名
576   -// cnames.put("buildWeek", "建档孕周"); //建档孕周
577   -// cnames.put("hospitalName", "建档机构"); //建档机构
578   -// cnames.put("doctor","建档医生"); //建档医生
579   -// cnames.put("homeAddr","居住地"); //居住地
580   -// cnames.put("hjAddr","户籍地"); //户籍地
581   -// cnames.put("telNo","联系电话"); //联系电话
582 713 // ResponseUtil.responseExcel(cnames,results,httpServletResponse);
583 714 // }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 606a01b
... ... @@ -546,8 +546,18 @@
546 546 patientsQuery.setFmAgeEnd(riskPatientsQueryRequest.getFmEndAge());
547 547 }
548 548  
  549 + //建档孕周
  550 + if (riskPatientsQueryRequest.getBuildWeekStart() != null)
  551 + {
  552 + patientsQuery.setBuildDaysStart(riskPatientsQueryRequest.getBuildWeekStart()*7);
  553 + }
549 554  
  555 + if (riskPatientsQueryRequest.getBuildWeekEnd() != null)
  556 + {
  557 + patientsQuery.setBuildDaysEnd((riskPatientsQueryRequest.getBuildWeekEnd() + 1) * 7 - 1);
  558 + }
550 559  
  560 +
551 561 return patientsQuery;
552 562 }
553 563  
... ... @@ -865,7 +875,7 @@
865 875 data.put("dueDate", rp.getDueDate());
866 876 data.put("checkDoctor", rp.getCheckDoctor());
867 877 data.put("lName", rp.getlName());
868   - data.put("phone", rp.getRealPhone());
  878 + data.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(rp.getRealPhone()));
869 879 data.put("serviceType", rp.getServiceType());
870 880 data.put("serviceStatus", rp.getServiceStatus());
871 881 datas.add(data);
... ... @@ -898,7 +908,7 @@
898 908 data.put("cHTimes", rp.getcHTimes());
899 909 data.put("checkDoctor", rp.getCheckDoctor());
900 910 data.put("lName", rp.getlName());
901   - data.put("phone", rp.getRealPhone());
  911 + data.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(rp.getRealPhone()));
902 912 data.put("serviceType", "服务类型");
903 913 data.put("serviceStatus", "服务类型");
904 914 datas.add(data);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ 606a01b
... ... @@ -137,6 +137,27 @@
137 137 //分娩日期
138 138 private String fmTime;
139 139  
  140 +
  141 + //建档孕周
  142 + private Integer buildWeekStart;
  143 + private Integer buildWeekEnd;
  144 +
  145 + public Integer getBuildWeekStart() {
  146 + return buildWeekStart;
  147 + }
  148 +
  149 + public void setBuildWeekStart(Integer buildWeekStart) {
  150 + this.buildWeekStart = buildWeekStart;
  151 + }
  152 +
  153 + public Integer getBuildWeekEnd() {
  154 + return buildWeekEnd;
  155 + }
  156 +
  157 + public void setBuildWeekEnd(Integer buildWeekEnd) {
  158 + this.buildWeekEnd = buildWeekEnd;
  159 + }
  160 +
140 161 public String getFmTime() {
141 162 return fmTime;
142 163 }