From e354382c267b9f18bac53eedca307c097f70ab4c Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 9 Mar 2018 15:17:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E6=A6=82=E5=86=B5=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E5=88=86=E5=A8=A9=E6=96=B9=E5=BC=8F=E6=9C=AA=E5=8F=96?= =?UTF-8?q?=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/TrackDownServiceImpl.java | 49 ++++++++++++++++++---- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index d0e19a9..83101ac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -51,6 +51,9 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS @Autowired private PostReviewService postReviewService; + @Autowired + private MatDeliverService matDeliverService; + /** * @param buildStart * @param buildEnd @@ -146,7 +149,21 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 } else if (patients.getType() == 3) { temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 - temp.put("fmType", patients.getFmType()); // 分娩方式 1： 顺产，2：剖宫产 + if (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1) { + /** 生产方式 */ + temp.put("fmType", "自动分娩"); + } else { + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setParentId(patients.getId()); + matDeliverQuery.setYn(YnEnums.YES.getId()); + //查询分娩记录 + List list2 = matDeliverService.query(matDeliverQuery); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) { + MaternalDeliverModel maternalDeliverModel = list2.get(0); + /** 生产方式 */ + temp.put("fmType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType())); + } + } } //孕检次数 @@ -179,9 +196,9 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } else { if (patients.getType() == 3) {//已经分娩，就是X temp.put("cqsc", 2);//产前筛查){ - }else{//未分娩， - int week = DateUtil.getWeek2(patients.getLastMenses(),new Date()); - if(week>20){//不能做产前筛查追访，产前检查追访 + } else {//未分娩， + int week = DateUtil.getWeek2(patients.getLastMenses(), new Date()); + if (week > 20) {//不能做产前筛查追访，产前检查追访 temp.put("cqsc", 2);//未做产筛 } } @@ -265,8 +282,22 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if (patient.getDueStatus() == 1 || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩 temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 } else if (patient.getType() == 3) { //本院已分娩 - temp.put("fm", 1); // 孕期建档 1=勾勾 2=叉叉 - temp.put("fmType", patient.getFmType()); // 分娩方式 1： 顺产，2：剖宫产 + temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 + if (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1) { + /** 生产方式 */ + temp.put("fmType", "自动分娩"); + } else { + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setParentId(patient.getId()); + matDeliverQuery.setYn(YnEnums.YES.getId()); + //查询分娩记录 + List list2 = matDeliverService.query(matDeliverQuery); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) { + MaternalDeliverModel maternalDeliverModel = list2.get(0); + /** 生产方式 */ + temp.put("fmType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType())); + } + } } //孕检次数 @@ -300,9 +331,9 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } else { if (patient.getType() == 3) {//已经分娩，就是X temp.put("cqsc", 2);//产前筛查){ - }else{//未分娩， - int week = DateUtil.getWeek2(patient.getLastMenses(),new Date()); - if(week>20){//不能做产前筛查追访，产前检查追访 + } else {//未分娩， + int week = DateUtil.getWeek2(patient.getLastMenses(), new Date()); + if (week > 20) {//不能做产前筛查追访，产前检查追访 temp.put("cqsc", 2);//未做产筛 } } -- 1.8.3.1