From 9b682947adfbb7c0dde9a2f9dd79b4c1643a311f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 6 Sep 2016 10:34:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 31 ++++++++++++++++++++-- .../lyms/platform/operate/web/result/AntData.java | 12 ++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index e588892..50cfef4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -17,6 +17,7 @@ import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; +import com.sun.tools.corba.se.idl.constExpr.And; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -563,9 +564,7 @@ public class AntenatalExaminationFacade { } } } - } - } catch (Exception e) { } return highScoreResult; @@ -682,6 +681,7 @@ public class AntenatalExaminationFacade { listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate())); } } + updateEditEnable(listData, sortList); sortList.add(listData); listData = new ArrayList(); } @@ -729,6 +729,7 @@ public class AntenatalExaminationFacade { } if (!listData.isEmpty()) { sort(listData); + updateEditEnable(listData, sortList); sortList.add(listData); Collections.reverse(sortList); } @@ -756,6 +757,7 @@ public class AntenatalExaminationFacade { List l = buildPatientList(new Date(), patientsList, list1, min, false); if (!l.isEmpty()) { sort(l); + updateEditEnable(l,sortList); sortList.add(l); } } @@ -775,6 +777,7 @@ public class AntenatalExaminationFacade { List l = buildPatientList(dueDate, list, list1, min, true); if (!l.isEmpty()) { sort(l); + updateEditEnable(l,sortList); sortList.add(l); } } @@ -783,6 +786,30 @@ public class AntenatalExaminationFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); } + /** + * + * 修改按钮控制 + * + * + * @param list 同一产程记录 + * @param sortList 排序的结果 + */ + private void updateEditEnable(List list,List> sortList){ + //如果上个产程有数据,并且本产程有记录就设置上个产程不可编辑 + if(CollectionUtils.isNotEmpty(sortList) &&CollectionUtils.isNotEmpty(list)){ + List l = sortList.get(sortList.size() - 1); + for(AntData antData:l){ + antData.setEnableEdit("0"); + } + } + //如果最后一条是复查 4 5 6 分娩 复查 终止妊娠 + if("456".indexOf(list.get(list.size()-1).getType())>-1){ + for(int i=0;i listData) { Collections.sort(listData, new Comparator() { @Override diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java index c04eb05..4956bb0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java @@ -14,13 +14,23 @@ public class AntData { private String id; private String checkTime; private String title; - //1 建档 2初诊 3 复诊 4 产后分娩 5 产后复查 + //1 建档 2初诊 3 复诊 4 产后分娩 5 产后复查 6 终止妊娠 private String type; private String hospitalName; private String hospitalId; @JsonIgnore private Date created; + //enableEdit 字段 1 可编辑 0 不可编辑 + private String enableEdit="1"; + + public String getEnableEdit() { + return enableEdit; + } + + public void setEnableEdit(String enableEdit) { + this.enableEdit = enableEdit; + } public Date getCreated() { return created; -- 1.8.3.1