From a5a4da596d76cb4fa529d41a736bcc44e66e93d1 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Sun, 13 Jan 2019 15:47:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E4=BA=A7=E5=90=8E=E8=A7=82?= =?UTF-8?q?=E5=AF=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/PostpartumRecords.java | 23 ++- .../platform/query/PostpartumRecordsQuery.java | 38 +++++ .../web/facade/PostpartumRecordsFacade.java | 118 ++++++++++++++- .../web/request/PostpartumRecordsAddRequest.java | 167 ++++++++++++++++----- .../web/result/PostpartumRecordsResult.java | 57 ++++++- .../web/worker/PostpartumRecordsWorker.java | 125 +++++++++++++++ 6 files changed, 487 insertions(+), 41 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/PostpartumRecordsWorker.java diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumRecords.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumRecords.java index 0caa3af..6c84078 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumRecords.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumRecords.java @@ -20,12 +20,13 @@ public class PostpartumRecords extends BaseModel { private String maternalDeliverId;//分娩ID private String created;//创建时间 private String modified;//修改时间 - //private List records;//记录列表 + private List records;//记录列表 private String hospitalId;//医院ID private String doctor;//操作医生 private String oneCxl;//产后一小时出血量 private String twoCxl;//产后两小时出血量 private String gcStatus;//观察状态（0:正在观察；1:观察结束） + private String isDelete;//是否有效(0:无效；1:有效) /*public static class Records implements Serializable { private static final long serialVersionUID = SerialIdEnum.Records.getCid(); @@ -193,13 +194,13 @@ public class PostpartumRecords extends BaseModel { this.modified = modified; } - /*public List getRecords() { + public List getRecords() { return records; } public void setRecords(List records) { this.records = records; - }*/ + } public String getHospitalId() { return hospitalId; @@ -232,4 +233,20 @@ public class PostpartumRecords extends BaseModel { public void setTwoCxl(String twoCxl) { this.twoCxl = twoCxl; } + + public String getGcStatus() { + return gcStatus; + } + + public void setGcStatus(String gcStatus) { + this.gcStatus = gcStatus; + } + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostpartumRecordsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostpartumRecordsQuery.java index c02bbce..4872f2a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PostpartumRecordsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PostpartumRecordsQuery.java @@ -6,6 +6,8 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import java.util.List; + /** * 产后观察查询模型 * Created by Administrator on 2019/1/9. @@ -14,6 +16,9 @@ public class PostpartumRecordsQuery extends BaseQuery implements IConvertToNativ private String parentId;//孕妇ID private String hospitalId;//医院ID + private List idList;//孕妇ID集合 + private String gcStatus;//观察状态 + private String isDelete;//是否有效 public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -23,6 +28,15 @@ public class PostpartumRecordsQuery extends BaseQuery implements IConvertToNativ if(null !=hospitalId){ condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } + if(null != idList){ + condition = condition.and("parentId", idList, MongoOper.IN); + } + if(null != gcStatus){ + condition = condition.and("gcStatus", gcStatus, MongoOper.IS); + } + if(null != isDelete){ + condition = condition.and("isDelete", isDelete, MongoOper.IS); + } return condition.toMongoQuery(); } @@ -41,4 +55,28 @@ public class PostpartumRecordsQuery extends BaseQuery implements IConvertToNativ public void setHospitalId(String hospitalId) { this.hospitalId = hospitalId; } + + public List getIdList() { + return idList; + } + + public void setIdList(List idList) { + this.idList = idList; + } + + public String getGcStatus() { + return gcStatus; + } + + public void setGcStatus(String gcStatus) { + this.gcStatus = gcStatus; + } + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java index 4cbe94c..846c7f8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java @@ -1,14 +1,19 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; +import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.operate.web.request.PostpartumRecordsAddRequest; import com.lyms.platform.operate.web.request.PostpartumRecordsQueryRequest; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.PostpartumRecordsResult; +import com.lyms.platform.operate.web.worker.PostpartumRecordsWorker; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; @@ -25,6 +30,8 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.Future; /** * Created by Administrator on 2019/1/9. @@ -82,7 +89,7 @@ public class PostpartumRecordsFacade { parentId = list.get(0).getId(); Patients patients = list.get(0); MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setPid(list.get(0).getPid()); + matDeliverQuery.setParentId(parentId); matDeliverQuery.setYn(YnEnums.YES.getId()); //查询分娩 List mdList = matDeliverService.query(matDeliverQuery); @@ -143,7 +150,7 @@ public class PostpartumRecordsFacade { List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); - String tTireNumber = ""; + /*String tTireNumber = ""; if (CollectionUtils.isNotEmpty(examinationModel)) { if (null != examinationModel && StringUtils.isNotEmpty(examinationModel.get(0).getRiskFactor())) { tTireNumber = examinationModel.get(0).getTireNumber(); @@ -152,12 +159,14 @@ public class PostpartumRecordsFacade { if (CollectionUtils.isNotEmpty(antExChuModels)) { tTireNumber = antExChuModels.get(0).getTireNumber(); } - } + }*/ postpartumRecordsResult.setGwys(highScoreResult.getHighRisk()); postpartumRecordsResult.setGwpf(highScoreResult.getScoreStr()); postpartumRecordsResult.setBz(patients.getMremark()); postpartumRecordsResult.setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth())); postpartumRecordsResult.setAge(String.valueOf(DateUtil.getAge(patients.getBirth()))); + postpartumRecordsResult.setFmDate(maternalDeliverModel.getDueDate()); + postpartumRecordsResult.setFmyz(maternalDeliverModel.getDueWeek()); if(null != maternalDeliverModel.getParity()){ postpartumRecordsResult.setTc(String.valueOf(maternalDeliverModel.getParity())); } @@ -211,4 +220,107 @@ public class PostpartumRecordsFacade { return new BaseObjectResponse().setErrormsg("成功！").setErrorcode(ErrorCodeConstants.SUCCESS).setData(postpartumRecordsResult); } + + + /** + * 产后观察管理 + * @param prAddRequest + * @param userId + * @return + */ + public BaseListResponse getRecordsList(PostpartumRecordsAddRequest prAddRequest,Integer userId){ + BaseListResponse baseListResponse = new BaseListResponse(); + List resultList = null; + List patientsList = null; + List parentIdList = null; + List maternalDeliverModelList = null; + List mList = null; + PostpartumRecordsQuery prQuery = new PostpartumRecordsQuery(); + if(StringUtils.isNotEmpty(prAddRequest.getQueryNo()) || StringUtils.isNotEmpty(prAddRequest.getFmDate())){ + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setQueryNo(prAddRequest.getQueryNo()); + patientsQuery.setType(3); + if(StringUtils.isNotEmpty(prAddRequest.getFmDate())){ + try{ + patientsQuery.setFmDateStart(DateUtil.getSNDate(prAddRequest.getFmDate())[0]); + patientsQuery.setFmDateEnd(DateUtil.getSNDate(prAddRequest.getFmDate())[1]); + }catch (Exception e){ + e.printStackTrace(); + } + } + patientsList = patientsService.queryPatient(patientsQuery); + for(Patients p : patientsList){ + parentIdList.add(p.getId()); + } + } + if(StringUtils.isNotEmpty(prAddRequest.getFmfs())){ + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + String deliveryModeQueryJson = "fmfs\\\":\\\"" + prAddRequest.getFmfs(); + matDeliverQuery.setParentIdList(parentIdList); + matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setDeliveryModeQueryJson(StringUtils.isEmpty(prAddRequest.getFmfs()) ? null : deliveryModeQueryJson); + maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); + for(MaternalDeliverModel m : maternalDeliverModelList){ + mList.add(m.getParentId()); + } + } + if(CollectionUtils.isNotEmpty(parentIdList)){ + parentIdList.retainAll(mList); + prQuery.setIdList(parentIdList); + }else if(CollectionUtils.isNotEmpty(mList)){ + mList.retainAll(parentIdList); + prQuery.setIdList(mList); + } + if(StringUtils.isNotEmpty(prAddRequest.getGcStatus())){ + prQuery.setGcStatus(prAddRequest.getGcStatus()); + } + prQuery.setLimit(prAddRequest.getLimit()); + prQuery.setPage(prAddRequest.getPage()); + prQuery.setIsDelete("1"); + prQuery.setNeed("need"); + List postList = postpartumRecordsService.getBabySieveQuery(prQuery); + if(CollectionUtils.isNotEmpty(postList)){ + int batchSize = 3; + int end = 0; + List futures = new ArrayList<>(); + for(int i = 0; i < postList.size(); i += batchSize){ + end += end + batchSize; + if(end > postList.size()){ + end = postList.size(); + } + List mlist = postList.subList(i, end); + Callable c = new PostpartumRecordsWorker(organizationService,usersService,patientsService, + mlist,matDeliverService,recordsService); + Future f = commonThreadPool.submit(c); + if (f != null) + { + futures.add(f); + } + } + if (CollectionUtils.isNotEmpty(futures)) { + for (Future f : futures) { + try { + + resultList.addAll((List) f.get()); + } catch (Exception e) { + ExceptionUtils.catchException(e, "chgc list error."); + } + } + } + /*for(PostpartumRecords pRecord : postList){ + RecordsQuery recordsQuery = new RecordsQuery(); + recordsQuery.setIsDelete("1"); + recordsQuery.setPostId(pRecord.getId()); + List rList = recordsService.getRecordsListQuery(recordsQuery); + }*/ + baseListResponse.setPageInfo(prQuery.getPageInfo()); + baseListResponse.setData(resultList); + baseListResponse.setErrormsg("成功"); + baseListResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + }else{ + return baseListResponse.setData(resultList).setPageInfo(new PageInfo()).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); + } + return baseListResponse; + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsAddRequest.java index d54e8df..849adc9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostpartumRecordsAddRequest.java @@ -1,7 +1,9 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; +import com.lyms.platform.pojo.BabySieveModel; import com.lyms.platform.pojo.PostpartumRecords; +import com.lyms.platform.pojo.Records; import java.io.Serializable; import java.util.List; @@ -10,12 +12,141 @@ import java.util.List; * Created by Administrator on 2019/1/11. * 产后观察增加或修改模型 */ -public class PostpartumRecordsAddRequest { +public class PostpartumRecordsAddRequest implements IBasicRequestConvert{ + + + + // 是否分页 + private String need; + // 当前页起始行数 + private Integer offset = 0; + // 页面行数 + private Integer limit = 15; + // 当前页 + private int page = 1; + + public String getNeed() { + return need; + } + + public void setNeed(String need) { + this.need = need; + } + + public Integer getOffset() { + return offset; + } + + public void setOffset(Integer offset) { + this.offset = offset; + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } private String id; + private String parentId;//孕妇ID private String oneCxl; private String twoCxl; - //private List records; + private List records; + + private String gcStatus;//观察状态 + private String fmDate;//分娩时间 + private String fmfs;//分娩方式 + private String queryNo;//查询号 + + public String getGcStatus() { + return gcStatus; + } + + public void setGcStatus(String gcStatus) { + this.gcStatus = gcStatus; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getFmDate() { + return fmDate; + } + + public void setFmDate(String fmDate) { + this.fmDate = fmDate; + } + + public String getFmfs() { + return fmfs; + } + + public void setFmfs(String fmfs) { + this.fmfs = fmfs; + } + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getOneCxl() { + return oneCxl; + } + + public void setOneCxl(String oneCxl) { + this.oneCxl = oneCxl; + } + + public String getTwoCxl() { + return twoCxl; + } + + public void setTwoCxl(String twoCxl) { + this.twoCxl = twoCxl; + } + + public List getRecords() { + return records; + } + + public void setRecords(List records) { + this.records = records; + } + @Override + public PostpartumRecords convertToDataModel(){ + PostpartumRecords postpartumRecords = new PostpartumRecords(); + + return postpartumRecords; + } + + /*public class Records implements IBasicRequestConvert { @@ -161,36 +292,4 @@ public class PostpartumRecordsAddRequest { this.qm = qm; } }*/ - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getOneCxl() { - return oneCxl; - } - - public void setOneCxl(String oneCxl) { - this.oneCxl = oneCxl; - } - - public String getTwoCxl() { - return twoCxl; - } - - public void setTwoCxl(String twoCxl) { - this.twoCxl = twoCxl; - } - - /*public List getRecords() { - return records; - } - - public void setRecords(List records) { - this.records = records; - }*/ } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostpartumRecordsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostpartumRecordsResult.java index 5a6e34e..20ce0cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostpartumRecordsResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostpartumRecordsResult.java @@ -13,7 +13,7 @@ import java.util.List; */ public class PostpartumRecordsResult { - private String id; + private String id;//产后观察主键ID private String parentId;//孕妇ID private String maternalDeliverId;//分娩ID private String created;//创建时间 @@ -43,6 +43,13 @@ public class PostpartumRecordsResult { private String fmHospital;//分娩医院 private String jsys;//接生医生 + private String recordsNum;//记录条数 + private String gcStatus;//观察状态（0:正在观察；1:观察结束） + private String zjh;//证件号 + private String fmfs;//分娩方式 + private String ts;//胎数 + private String livingNumber;//活产数 + public String getId() { return id; @@ -268,6 +275,54 @@ public class PostpartumRecordsResult { this.jsys = jsys; } + public String getRecordsNum() { + return recordsNum; + } + + public void setRecordsNum(String recordsNum) { + this.recordsNum = recordsNum; + } + + public String getGcStatus() { + return gcStatus; + } + + public void setGcStatus(String gcStatus) { + this.gcStatus = gcStatus; + } + + public String getZjh() { + return zjh; + } + + public void setZjh(String zjh) { + this.zjh = zjh; + } + + public String getFmfs() { + return fmfs; + } + + public void setFmfs(String fmfs) { + this.fmfs = fmfs; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getLivingNumber() { + return livingNumber; + } + + public void setLivingNumber(String livingNumber) { + this.livingNumber = livingNumber; + } + public PostpartumRecordsResult convertToResult(PostpartumRecords postpartumRecords){ setId(postpartumRecords.getId()); setHospitalId(postpartumRecords.getHospitalId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/PostpartumRecordsWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/PostpartumRecordsWorker.java new file mode 100644 index 0000000..83a22a7 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/PostpartumRecordsWorker.java @@ -0,0 +1,125 @@ +package com.lyms.platform.operate.web.worker; + +import com.lyms.platform.biz.service.MatDeliverService; +import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.RecordsService; +import com.lyms.platform.common.enums.FmTypeEnums; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.operate.web.result.ChildbirthManagerQueryModel; +import com.lyms.platform.operate.web.result.PostpartumRecordsResult; +import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.MaternalDeliverModel; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.PostpartumRecords; +import com.lyms.platform.pojo.Records; +import com.lyms.platform.query.MatDeliverQuery; +import com.lyms.platform.query.PatientsQuery; +import com.lyms.platform.query.RecordsQuery; +import org.apache.commons.collections.MapUtils; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.ArrayList; +import java.util.Map; +import java.util.concurrent.Callable; + + +import java.util.List; + +/** + * Created by Administrator on 2019/1/11. + */ +public class PostpartumRecordsWorker implements Callable> { + + private OrganizationService organizationService; + private UsersService usersService; + private PatientsService patientsService; + private List prList; + private MatDeliverService matDeliverService; + private RecordsService recordsService; + + public PostpartumRecordsWorker(OrganizationService organizationService,UsersService usersService,PatientsService patientsService, + List prList,MatDeliverService matDeliverService,RecordsService recordsService){ + this.organizationService = organizationService; + this.usersService = usersService; + this.patientsService = patientsService; + this.prList = prList; + this.matDeliverService = matDeliverService; + this.recordsService = recordsService; + } + + @Override + public List call() { + List rList = new ArrayList(); + if(CollectionUtils.isNotEmpty(prList)){ + for(PostpartumRecords r : prList){ + //封装返回的数据类 + PostpartumRecordsResult psResult = new PostpartumRecordsResult(); + //查询孕妇 + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setType(3); + patientsQuery.setId(r.getParentId()); + Patients patient = patientsService.queryPatient(patientsQuery).get(0); + //查询分娩 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setParentId(r.getParentId()); + matDeliverQuery.setYn(YnEnums.YES.getId()); + MaternalDeliverModel maternalDeliverModel = matDeliverService.query(matDeliverQuery).get(0); + //开始封装 + psResult.setFmDate(maternalDeliverModel.getDueDate());//分娩时间 + psResult.setName(patient.getUsername());//姓名 + psResult.setAge(String.valueOf(DateUtil.getAge(patient.getBirth())));//年龄 + psResult.setZjh(patient.getCardNo());//证件号 + psResult.setFmyz(maternalDeliverModel.getDueWeek()); + + String deliveryModeJson = maternalDeliverModel.getDeliveryMode(); + Map deliveryModeMap = JsonUtil.getMap(deliveryModeJson); + if (MapUtils.isNotEmpty(deliveryModeMap) && org.apache.commons.lang.StringUtils.isNotEmpty(deliveryModeMap.get("fmfs"))) { + for (FmTypeEnums fmTypeEnums : FmTypeEnums.values()) { + if (fmTypeEnums.getId().equals(deliveryModeMap.get("fmfs"))) { + psResult.setFmfs(fmTypeEnums.getName()); + break; + } + } + if(deliveryModeMap.get("scfs") != null){ + String scfs = deliveryModeMap.get("scfs").toString(); + psResult.setFmfs(FmTypeEnums.getFmScNameById(scfs)); + } + } else { + psResult.setFmfs(""); + }//分娩方式 + if(null != maternalDeliverModel.getTireNumber()){ + psResult.setTs(String.valueOf(maternalDeliverModel.getTireNumber()));//胎数 + } + psResult.setLivingNumber(String.valueOf(maternalDeliverModel.getBaby().size()));//活产数 + psResult.setPhone(patient.getPhone()); + //查询记录详情 + RecordsQuery recordsQuery = new RecordsQuery(); + recordsQuery.setIsDelete("1"); + recordsQuery.setPostId(r.getId()); + List recordsList = recordsService.getRecordsListQuery(recordsQuery); + if(CollectionUtils.isNotEmpty(recordsList)){ + psResult.setRecordsNum(String.valueOf(recordsList.size()));//记录条数 + }else{ + psResult.setRecordsNum("0"); + } + psResult.setGcStatus(r.getGcStatus());//观察状态（0:正在观察；1:观察结束） + + //各种ID + psResult.setId(r.getId());//产后查看主键ID + psResult.setParentId(patient.getId());//孕妇ID + psResult.setMaternalDeliverId(maternalDeliverModel.getId());//分娩ID + + rList.add(psResult); + } + } + + + + return rList; + } + +} -- 1.8.3.1