From dafc12239b2124d3732dc7b8af7d1706df045047 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 9 Mar 2018 10:29:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=BF=BD?= =?UTF-8?q?=E8=AE=BF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/TrackDownServiceImpl.java | 65 +++++++++++++++------- 1 file changed, 44 insertions(+), 21 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 38ba655..d7d9822 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 @@ -143,7 +143,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉 temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); - if (patients.getDueStatus() == 1 || (patients.getIsAutoFm()!=null&& patients.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩 + if (patients.getDueStatus() == 1 || (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩 temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 } else if (patients.getType() == 3) { temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 @@ -258,7 +258,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉 - if (patient.getDueStatus() == 1 || (patient.getIsAutoFm()!=null&&patient.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩 + 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=叉叉 @@ -323,39 +323,62 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS */ private void isExitTrackDown(TrackDownRecord trackDownRecord, Map map) { if (trackDownRecord != null) { - if ((int) map.get("bookbuild") == 3) {//孕期建档 - //如果当前流程已经结束流程，则显示X - if (trackDownRecord.getTrackType() <= TrackDownDateEnums.B.getId()) { + if (trackDownRecord.getStatus() == 0) {//已经终止流程 + if ((int) map.get("bookbuild") == 3) {//孕期建档 map.put("bookbuild", 2); } - } - if ((int) map.get("cqsc") == 3) {//产前筛查 - //如果当前流程已经结束流程，则显示X - if (trackDownRecord.getTrackType() <= TrackDownDateEnums.C.getId()) { + if ((int) map.get("cqsc") == 3) {//产前筛查 map.put("cqsc", 2); } - } - if ((int) map.get("fm") == 3) {//分娩 - //如果当前流程已经结束流程，则显示X - if (trackDownRecord.getTrackType() <= TrackDownDateEnums.E.getId()) { + if ((int) map.get("fm") == 3) {//分娩 map.put("fm", 2); } - } - if ((int) map.get("chfc") == 3) {//产后复查 - //如果当前流程已经结束流程，则显示X - if (trackDownRecord.getTrackType() <= TrackDownDateEnums.F.getId()) { + if ((int) map.get("chfc") == 3) {//产后复查 map.put("chfc", 2); } - } - if ((int) map.get("check") == 3) {//婚检 - //如果当前流程已经结束流程，则显示X - if (trackDownRecord.getTrackType() <= TrackDownDateEnums.A.getId()) { + if ((int) map.get("check") == 3) {//婚检 map.put("check", 2); } + } else { + if ((int) map.get("bookbuild") == 3) {//孕期建档 + + //如果当前流程已经结束流程，则显示X + if (trackDownRecord.getTrackType() <= TrackDownDateEnums.B.getId()) { + map.put("bookbuild", 2); + } + } + + if ((int) map.get("cqsc") == 3) {//产前筛查 + //如果当前流程已经结束流程，则显示X + if (trackDownRecord.getTrackType() <= TrackDownDateEnums.C.getId()) { + map.put("cqsc", 2); + } + } + + if ((int) map.get("fm") == 3) {//分娩 + //如果当前流程已经结束流程，则显示X + if (trackDownRecord.getTrackType() <= TrackDownDateEnums.E.getId()) { + map.put("fm", 2); + } + } + + if ((int) map.get("chfc") == 3) {//产后复查 + //如果当前流程已经结束流程，则显示X + if (trackDownRecord.getTrackType() <= TrackDownDateEnums.F.getId()) { + map.put("chfc", 2); + } + } + + if ((int) map.get("check") == 3) {//婚检 + //如果当前流程已经结束流程，则显示X + if (trackDownRecord.getTrackType() <= TrackDownDateEnums.A.getId()) { + map.put("check", 2); + } + } } } } -- 1.8.3.1