fangcheng / regional-platform

Download as
Browse Code »

Commit 9b682947adfbb7c0dde9a2f9dd79b4c1643a311f

Authored by jiangjiazhi
1 parent 9d33e5ff15
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 2 changed files with 40 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 9b68294
... ... @@ -17,6 +17,7 @@
17 17 import com.lyms.platform.permission.service.UsersService;
18 18 import com.lyms.platform.pojo.*;
19 19 import com.lyms.platform.query.*;
  20 +import com.sun.tools.corba.se.idl.constExpr.And;
20 21 import org.apache.commons.collections.CollectionUtils;
21 22 import org.apache.commons.lang.StringUtils;
22 23 import org.apache.commons.lang.math.NumberUtils;
23 24  
... ... @@ -563,9 +564,7 @@
563 564 }
564 565 }
565 566 }
566   -
567 567 }
568   -
569 568 } catch (Exception e) {
570 569 }
571 570 return highScoreResult;
... ... @@ -682,6 +681,7 @@
682 681 listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate()));
683 682 }
684 683 }
  684 + updateEditEnable(listData, sortList);
685 685 sortList.add(listData);
686 686 listData = new ArrayList();
687 687 }
... ... @@ -729,6 +729,7 @@
729 729 }
730 730 if (!listData.isEmpty()) {
731 731 sort(listData);
  732 + updateEditEnable(listData, sortList);
732 733 sortList.add(listData);
733 734 Collections.reverse(sortList);
734 735 }
... ... @@ -756,6 +757,7 @@
756 757 List l = buildPatientList(new Date(), patientsList, list1, min, false);
757 758 if (!l.isEmpty()) {
758 759 sort(l);
  760 + updateEditEnable(l,sortList);
759 761 sortList.add(l);
760 762 }
761 763 }
762 764  
... ... @@ -775,12 +777,37 @@
775 777 List l = buildPatientList(dueDate, list, list1, min, true);
776 778 if (!l.isEmpty()) {
777 779 sort(l);
  780 + updateEditEnable(l,sortList);
778 781 sortList.add(l);
779 782 }
780 783 }
781 784 }
782 785 antexListResult.setData(sortList);
783 786 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
  787 + }
  788 +
  789 + /**
  790 + *
  791 + * 修改按钮控制
  792 + *
  793 + *
  794 + * @param list 同一产程记录
  795 + * @param sortList 排序的结果
  796 + */
  797 + private void updateEditEnable(List<AntData> list,List<List<AntData>> sortList){
  798 + //如果上个产程有数据，并且本产程有记录就设置上个产程不可编辑
  799 + if(CollectionUtils.isNotEmpty(sortList) &&CollectionUtils.isNotEmpty(list)){
  800 + List<AntData> l = sortList.get(sortList.size() - 1);
  801 + for(AntData antData:l){
  802 + antData.setEnableEdit("0");
  803 + }
  804 + }
  805 + //如果最后一条是复查 4 5 6 分娩 复查 终止妊娠
  806 + if("456".indexOf(list.get(list.size()-1).getType())>-1){
  807 + for(int i=0;i<list.size()-1;i++){
  808 + list.get(i).setEnableEdit("0");
  809 + }
  810 + }
784 811 }
785 812  
786 813 private void sort(List<AntData> listData) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java View file @ 9b68294
... ... @@ -14,13 +14,23 @@
14 14 private String id;
15 15 private String checkTime;
16 16 private String title;
17   - //1 建档 2初诊 3 复诊 4 产后分娩 5 产后复查
  17 + //1 建档 2初诊 3 复诊 4 产后分娩 5 产后复查 6 终止妊娠
18 18 private String type;
19 19  
20 20 private String hospitalName;
21 21 private String hospitalId;
22 22 @JsonIgnore
23 23 private Date created;
  24 + //enableEdit 字段 1 可编辑 0 不可编辑
  25 + private String enableEdit="1";
  26 +
  27 + public String getEnableEdit() {
  28 + return enableEdit;
  29 + }
  30 +
  31 + public void setEnableEdit(String enableEdit) {
  32 + this.enableEdit = enableEdit;
  33 + }
24 34  
25 35 public Date getCreated() {
26 36 return created;