diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java index 7c40812..1402bff 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java @@ -14,7 +14,7 @@ public class PatientSerEnums { //服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) public enum SerTypeEnums{ bzfw(6, "标准服务"), - gwjzzd(1,"孕期精准医疗"), + yqjzzd(1,"孕期精准医疗"), tz(2,"体重管理"), xt(3, "血糖管理"), xy(4, "血压管理"), diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index eaa1954..af3d275 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -18,7 +18,6 @@ import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; import com.lyms.platform.permission.service.CouponService; -import com.lyms.platform.pojo.Patients; import org.apache.commons.httpclient.HttpClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; @@ -156,8 +155,10 @@ public class PregnantBuildController extends BaseController{ */ @RequestMapping(value = "/queryPregnantBuildById/{id}", method = RequestMethod.GET) @ResponseBody - public BaseObjectResponse queryPregnantBuildRecord(@PathVariable("id")String id){ - BaseObjectResponse objectResponse = bookbuildingFacade.queryPregnantBuildById(id); + @TokenRequired + public BaseObjectResponse queryPregnantBuildRecord(@PathVariable("id")String id,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + BaseObjectResponse objectResponse = bookbuildingFacade.queryPregnantBuildById(id,loginState.getId()); return objectResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 1b9ee1e..35fef83 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -20,9 +20,7 @@ import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.JdbcUtil; import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.permission.dao.master.CouponMapper; -import com.lyms.platform.permission.model.Organization; -import com.lyms.platform.permission.model.OrganizationQuery; -import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; @@ -33,7 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; -import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; @@ -124,13 +121,16 @@ public class BookbuildingFacade { private PatientCheckTicketService patientCheckTicketService; @Autowired private AreaCodeService areaCodeService; - + @Autowired private GenSequenceIdService genSequenceIdService; @Autowired private CouponService couponService; + @Autowired + private PatientServiceFacade patientServiceFacade; + /** * 根据患者的建档ID，查询还未使用的免费产检查券 * @@ -257,6 +257,7 @@ public class BookbuildingFacade { patient.setCreated(new Date()); patient.setModified(new Date()); patient.setOperator(userId); + Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); operateLogFacade.addAddOptLog(userId, Integer.valueOf(yunRequest.getHospitalId()), p, OptActionEnums.ADD.getId(), "孕妇建档"); @@ -266,7 +267,7 @@ public class BookbuildingFacade { if (resperson != null) { - Patients p1 =new Patients(); + Patients p1 = new Patients(); p1.setId(p.getId()); HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(resperson.getId(), true); @@ -277,7 +278,7 @@ public class BookbuildingFacade { if (CollectionUtils.isNotEmpty(highScoreResult.getLevelId())) { p1.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId())); } - yunBookbuildingService.updatePregnant(p1,p.getId()); + yunBookbuildingService.updatePregnant(p1, p.getId()); } @@ -292,12 +293,6 @@ public class BookbuildingFacade { //加入产筛 patientsService.validata(p); - if (type == ServiceObjEnums.YUNOBJ.getId()) { - //生成建档短信 -// createBuildSms(p); - createBuildMsg(p); - } - if (p.getType() != null && p.getType() == 1) { @@ -310,19 +305,19 @@ public class BookbuildingFacade { AreaCodeModel areaCode = null; - String groupId= groupsFacade.findItemIdByCurrentUserId(autoMatchFacade.getHospitalId(userId)); - if(org.apache.commons.lang.StringUtils.isNotEmpty(groupId)){ + String groupId = groupsFacade.findItemIdByCurrentUserId(autoMatchFacade.getHospitalId(userId)); + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupId)) { OrganizationGroupsItems groupsItems = groupsFacade.findById(groupId); - if(null!=groupsItems){ + if (null != groupsItems) { if (CollectionUtils.isNotEmpty(code)) { areaCode = code.get(0); } - if (null != areaCode&&StringUtils.isNotEmpty(areaCode.getAreaCode())) { + if (null != areaCode && StringUtils.isNotEmpty(areaCode.getAreaCode())) { // 建档成功后，给孕妇造五个条形码 String ticketPid = autoIncermentService.nextPatientTicketId(areaCode.getAreaCode()); - int start = TicketTypeEnums.TICKTE_ALL.getType().equals(groupsItems.getTicketType()) ?1:PatientCheckTicketFacade.complyCurrentDay(p.getLastMenses()); - for (Integer i =start; i <= 5; i++) { + int start = TicketTypeEnums.TICKTE_ALL.getType().equals(groupsItems.getTicketType()) ? 1 : PatientCheckTicketFacade.complyCurrentDay(p.getLastMenses()); + for (Integer i = start; i <= 5; i++) { PatientCheckTicket ticket = new PatientCheckTicket(); ticket.setStatus(1); ticket.setHospitalId(p.getHospitalId()); @@ -338,13 +333,38 @@ public class BookbuildingFacade { } } + //建档开通增值服务 + if (CollectionUtils.isNotEmpty(yunRequest.getSerInfos())) { + + PatientService patientService = new PatientService(); + patientService.setSerInfos(yunRequest.getSerInfos()); + patientService.setCreateUser(String.valueOf(userId)); + //开通日期与建档日期一致 + patientService.setCreateDate(DateUtil.parseYMD(yunRequest.getBookbuildingDate())); + patientService.setParentid(p.getId()); + try { + patientServiceFacade.addPatientService(patientService, userId); + } catch (Exception e) { + System.out.println("孕妇建档服务开通异常！"); + e.printStackTrace(); + } + } + + + if (type == ServiceObjEnums.YUNOBJ.getId()) { + //生成建档短信 +// createBuildSms(p); + createBuildMsg(p); + } + + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(p.getId()); return br; } - + /** * 添加孕妇建档 * @@ -499,19 +519,19 @@ public class BookbuildingFacade { AreaCodeModel areaCode = null; - String groupId= groupsFacade.findItemIdByCurrentUserId(autoMatchFacade.getHospitalId(userId)); - if(org.apache.commons.lang.StringUtils.isNotEmpty(groupId)){ + String groupId = groupsFacade.findItemIdByCurrentUserId(autoMatchFacade.getHospitalId(userId)); + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupId)) { OrganizationGroupsItems groupsItems = groupsFacade.findById(groupId); - if(null!=groupsItems){ + if (null != groupsItems) { if (CollectionUtils.isNotEmpty(code)) { areaCode = code.get(0); } - if (null != areaCode&&StringUtils.isNotEmpty(areaCode.getAreaCode())) { + if (null != areaCode && StringUtils.isNotEmpty(areaCode.getAreaCode())) { // 建档成功后，给孕妇造五个条形码 // String ticketPid = autoIncermentService.nextPatientTicketId(areaCode.getAreaCode()); - int start = TicketTypeEnums.TICKTE_ALL.getType().equals(groupsItems.getTicketType()) ?1:PatientCheckTicketFacade.complyCurrentDay(p.getLastMenses()); - for (Integer i =start; i <= 5; i++) { + int start = TicketTypeEnums.TICKTE_ALL.getType().equals(groupsItems.getTicketType()) ? 1 : PatientCheckTicketFacade.complyCurrentDay(p.getLastMenses()); + for (Integer i = start; i <= 5; i++) { PatientCheckTicket ticket = new PatientCheckTicket(); ticket.setStatus(1); ticket.setHospitalId(p.getHospitalId()); @@ -627,14 +647,11 @@ public class BookbuildingFacade { smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); smsList.setMessages(messages); //调用发送接口 - if ("4".equals(HIS_VERSION) || "20".equals(HIS_VERSION)) - { + if ("4".equals(HIS_VERSION) || "20".equals(HIS_VERSION)) { //秦皇岛 //保存到同步表中 syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getHospitalId()); - } - else - { + } else { //保存到短信中心 线上 MessageCenterService.saveMsgCenter(smsList); } @@ -646,7 +663,6 @@ public class BookbuildingFacade { } - /** * 创建孕妇建档短信 */ @@ -730,15 +746,12 @@ public class BookbuildingFacade { smsList.setMessages(messages); //调用发送接口 - ExceptionUtils.catchException("patient build msg = "+ messages); - if ("4".equals(HIS_VERSION)) - { + ExceptionUtils.catchException("patient build msg = " + messages); + if ("4".equals(HIS_VERSION)) { //秦皇岛 //保存到同步表中 syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1()); - } - else - { + } else { //保存到短信中心 线上 MessageCenterService.saveSmsCenter(smsList); } @@ -897,21 +910,23 @@ public class BookbuildingFacade { /** * 修改初诊 复诊的末次月经字段 + * * @param lastMenses */ - private void updateAntExLastMenses(Date lastMenses,String pid,Date bookBuildDate){ - AntExQuery antExQuery=new AntExQuery(); + private void updateAntExLastMenses(Date lastMenses, String pid, Date bookBuildDate) { + AntExQuery antExQuery = new AntExQuery(); antExQuery.setStart(bookBuildDate); antExQuery.setPid(pid); antExQuery.setYn(YnEnums.YES.getId()); - List antexList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - if(CollectionUtils.isNotEmpty(antexList)){ - for(AntenatalExaminationModel antex:antexList){ + List antexList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + if (CollectionUtils.isNotEmpty(antexList)) { + for (AntenatalExaminationModel antex : antexList) { antex.setLastMenses(lastMenses); - antenatalExaminationService.updateOneAnt(antex,antex.getId()); + antenatalExaminationService.updateOneAnt(antex, antex.getId()); } } } + /** * 查询孕妇建档记录 * @@ -940,12 +955,9 @@ public class BookbuildingFacade { //优先查询本院通过就诊卡 List localPatients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); patientsQuery.setHospitalId(null); - if (CollectionUtils.isNotEmpty(localPatients)) - { + if (CollectionUtils.isNotEmpty(localPatients)) { patients = localPatients; - } - else - { + } else { //区域模式 patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId, false)); @@ -970,7 +982,7 @@ public class BookbuildingFacade { typeMap.put("hisPatient", fnfyHisService.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo())); } else if ("4".equals(HIS_VERSION)) { typeMap.put("hisPatient", qhdfyHisService.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo())); - }else if ("6".equals(HIS_VERSION)){ + } else if ("6".equals(HIS_VERSION)) { typeMap.put("hisPatient", dzfyHisService.getPatientInfoList(bookbuildingQueryRequest.getVcCardNo())); } } @@ -1008,7 +1020,7 @@ public class BookbuildingFacade { //历史建档记录 List list = new ArrayList<>(); List results = new ArrayList<>(); - String pid =null; + String pid = null; if (CollectionUtils.isNotEmpty(patients)) { for (Patients pat : patients) { @@ -1027,7 +1039,7 @@ public class BookbuildingFacade { result.setType(pat.getType()); result.setDueStatus(pat.getDueStatus()); result.setPid(pat.getPid()); - pid=pat.getPid(); + pid = pat.getPid(); results.add(result); } } @@ -1104,17 +1116,17 @@ public class BookbuildingFacade { // 纠正末次月经和末次月经反起存 - if(StringUtils.isEmpty(yunRequest.getFuckLastMens())) { + if (StringUtils.isEmpty(yunRequest.getFuckLastMens())) { patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); } else { patient.setFuckLastMens(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); patient.setLastMenses(DateUtil.parseYMD(yunRequest.getFuckLastMens())); } + patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); patient.setLastMenstrualPeriodBasis(yunRequest.getLastMenstrualPeriodBasis()); patient.setLastMenstrualPeriodBasisDoctorId(yunRequest.getLastMenstrualPeriodBasisDoctorId()); patient.setLastMenstrualPeriodBasisDate(yunRequest.getLastMenstrualPeriodBasisDate()); - patient.setLastMenstrualPeriodBasisOther(yunRequest.getLastMenstrualPeriodBasisOther()); patient.setMensStartDay(yunRequest.getMensStartDay()); @@ -1194,8 +1206,6 @@ public class BookbuildingFacade { patient.setHstreetRegisterId(yunRequest.getHusbandStreetRegisterId()); patient.setHlevelTypeId(yunRequest.getHusbandLevelTypeId()); - patient.setServiceStatus(yunRequest.getServiceStatus()); - if (yunRequest.getExpType() != null) { if (yunRequest.getExpType() == ExpYunEnums.SGY.getId()) { Date vipEndTime = DateUtil.addMonth(DateUtil.parseYMD(yunRequest.getBookbuildingDate()), 3); @@ -1218,12 +1228,25 @@ public class BookbuildingFacade { // patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); + //建档开通增值服务,以前数据 + if (CollectionUtils.isNotEmpty(yunRequest.getSerInfos())) { + for (Map serInfo : yunRequest.getSerInfos()) { + //标准服务 + if (Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.bzfw.getId()) { + patient.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); + patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + }else if(Integer.parseInt(serInfo.get("serType")) == PatientSerEnums.SerTypeEnums.yqjzzd.getId()){//增值服务：修改为孕期精准指导 + patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + break; + } + } + } patient.setDueDate(DateUtil.parseYMD(yunRequest.getDueDate())); patient.setFileCode(yunRequest.getFileCode()); patient.setBookbuildingDoctor(yunRequest.getBookbuildingDoctor()); patient.setBookbuildingDate(DateUtil.parseYMD(yunRequest.getBookbuildingDate())); - patient.setServiceType(yunRequest.getServiceType()); patient.setVcCardNo(yunRequest.getVcCardNo()); patient.setHospitalId(yunRequest.getHospitalId()); patient.setYn(YnEnums.YES.getId()); @@ -1238,17 +1261,17 @@ public class BookbuildingFacade { * @param id * @return */ - public BaseObjectResponse queryPregnantBuildById(String id) { + public BaseObjectResponse queryPregnantBuildById(String id, Integer userId) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(id); patientsQuery.setYn(YnEnums.YES.getId()); PregnantInfoResult result = new PregnantInfoResult(); + List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (patients != null && patients.size() > 0) { Patients p = patients.get(0); result = getResult(p); - result.setLastMenstrualPeriodBasis(p.getLastMenstrualPeriodBasis()); /** 末次月经和纠正末次月经反起来返回 */ if(p.getFuckLastMens() != null) { result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getLastMenses())); @@ -1261,6 +1284,9 @@ public class BookbuildingFacade { result.setLastMenstrualPeriodBasisDoctorId(couponMapper.getUserName(p.getLastMenstrualPeriodBasisDoctorId())); } + BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id,userId); + List patientSerResults = (List) baseResponse.getObject(); + result.setPatientSerResults(patientSerResults); BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(result); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -1272,8 +1298,6 @@ public class BookbuildingFacade { public PregnantInfoResult getResult(Patients p) { PregnantInfoResult result = new PregnantInfoResult(); - result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther()); - result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getFuckLastMens())); result.setLastMenstrualPeriodBasis(BasisEnums.getName(p.getLastMenstrualPeriodBasis())); result.setLastMenstrualPeriodBasisId(p.getLastMenstrualPeriodBasis()); @@ -1434,7 +1458,7 @@ public class BookbuildingFacade { */ public BaseResponse deletePregnantById(String id, Integer userId) { - if(org.apache.commons.lang.StringUtils.isNotEmpty(id)){ + if (org.apache.commons.lang.StringUtils.isNotEmpty(id)) { //获取初诊记录 String hospital = autoMatchFacade.getHospitalId(userId); Patients patients = yunBookbuildingService.findOneById(id); @@ -1451,13 +1475,13 @@ public class BookbuildingFacade { sieveQuery.setParentId(id); sieveService.deleteById(sieveQuery); - PatientCheckTicketQuery patientCheckTicketQuery=new PatientCheckTicketQuery(); + PatientCheckTicketQuery patientCheckTicketQuery = new PatientCheckTicketQuery(); patientCheckTicketQuery.setPatientId(id); patientCheckTicketQuery.setStatus(1); - PatientCheckTicket patientCheckTicket=new PatientCheckTicket(); + PatientCheckTicket patientCheckTicket = new PatientCheckTicket(); patientCheckTicket.setStatus(3); patientCheckTicket.setPatientId(id); - patientCheckTicketService.findAndModify(patientCheckTicketQuery,patientCheckTicket); + patientCheckTicketService.findAndModify(patientCheckTicketQuery, patientCheckTicket); /** 删除建档应该是把全部未使用的优惠券状态更新为3【已作废】 */ @@ -1930,8 +1954,7 @@ public class BookbuildingFacade { patientResult.setHusbandPhone(result.getHusbandPhone()); } // 增加初诊信息，桓台医院打印使用 - if (StringUtils.isNotEmpty(patientResult.getId())) - { + if (StringUtils.isNotEmpty(patientResult.getId())) { AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setParentId(patientResult.getId()); antExChuQuery.setYn(YnEnums.YES.getId()); @@ -1963,6 +1986,4 @@ public class BookbuildingFacade { } - - } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java index 94e2b5b..cac2936 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java @@ -62,7 +62,7 @@ public class PatientServiceSysFacade implements SysBaseFacade { patientService.setId(UUID.randomUUID().toString().replace("-", "")); int serType = patientService.getSerType(); // 1高危精准指导、5-专家咨询默认已经领取 - if(serType == PatientSerEnums.SerTypeEnums.gwjzzd.getId()||serType == PatientSerEnums.SerTypeEnums.zjzx.getId()){ + if(serType == PatientSerEnums.SerTypeEnums.yqjzzd.getId()||serType == PatientSerEnums.SerTypeEnums.zjzx.getId()){ //默认已领取 patientService.setStatus(2); }else{ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 4f58759..3af133a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -4,6 +4,9 @@ import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.core.annotation.form.FormParam; import org.hibernate.validator.constraints.NotEmpty; +import java.util.List; +import java.util.Map; + /** * Created by lqy on 2016/6/15. */ @@ -80,6 +83,11 @@ public class YunBookbuildingAddRequest { this.lastMenstrualPeriodBasisDate = lastMenstrualPeriodBasisDate; } + /** + * 服务信息 + */ + private List> serInfos; + /***********孕妇基本信息***********/ // 月经周期开始天数 private String mensStartDay; @@ -87,6 +95,14 @@ public class YunBookbuildingAddRequest { // 月经周期开始天数 private String mensEndDay; + public List> getSerInfos() { + return serInfos; + } + + public void setSerInfos(List> serInfos) { + this.serInfos = serInfos; + } + public String getMensEndDay() { return mensEndDay; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 26b09dd..05d8a92 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.result; +import java.util.List; import java.util.Map; /** @@ -18,6 +19,30 @@ public class PregnantInfoResult { private String lastMenstrualPeriodBasisDoctorId; private String lastMenstrualPeriodBasisDoctorName; + /** + * 编辑时服务信息 + */ + private List> serInfos; + //显示服务信息 + private List patientSerResults; + + + public List getPatientSerResults() { + return patientSerResults; + } + + public void setPatientSerResults(List patientSerResults) { + this.patientSerResults = patientSerResults; + } + + public List> getSerInfos() { + return serInfos; + } + + public void setSerInfos(List> serInfos) { + this.serInfos = serInfos; + } + public String getLastMenstrualPeriodBasisDoctorName() { return lastMenstrualPeriodBasisDoctorName; }