Commit bf0de43a21ce2ac201cdb4ca7c5937792a3d8e28
1 parent
0f51e66aa7
Exists in
dev
#fix:优化大同医生建档开单待审核逻辑
Showing 3 changed files with 24 additions and 1 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/ArchiveData.java
View file @
bf0de43
| ... | ... | @@ -26,10 +26,20 @@ |
| 26 | 26 | private Integer userType; |
| 27 | 27 | //大同特殊处理 1为不展示 0为正常逻辑 |
| 28 | 28 | private String type; |
| 29 | + //0为待审核 1为已经审核 | |
| 30 | + private Integer isArchive; | |
| 29 | 31 | |
| 30 | 32 | //建档成功时间 |
| 31 | 33 | private Date buildDate; |
| 32 | 34 | |
| 35 | + | |
| 36 | + public Integer getIsArchive() { | |
| 37 | + return isArchive; | |
| 38 | + } | |
| 39 | + | |
| 40 | + public void setIsArchive(Integer isArchive) { | |
| 41 | + this.isArchive = isArchive; | |
| 42 | + } | |
| 33 | 43 | |
| 34 | 44 | public String getType() { |
| 35 | 45 | return type; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
View file @
bf0de43
| ... | ... | @@ -589,7 +589,7 @@ |
| 589 | 589 | new Thread(new Runnable() { |
| 590 | 590 | @Override |
| 591 | 591 | public void run() { |
| 592 | - System.out.println("start auto generate antexc......"); | |
| 592 | + //System.out.println("start auto generate antexc......"); | |
| 593 | 593 | try { |
| 594 | 594 | //查询预约建档信息 |
| 595 | 595 | ArchiveDataQuery query = new ArchiveDataQuery(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
bf0de43
| ... | ... | @@ -593,6 +593,7 @@ |
| 593 | 593 | ArchiveData archiveData = new ArchiveData(); |
| 594 | 594 | |
| 595 | 595 | archiveData.setBuildDate(new Date()); |
| 596 | + archiveData.setIsArchive(tempP.getIsArchive()); | |
| 596 | 597 | |
| 597 | 598 | archiveData.setId(tempP.getHospitalId() + ":" + tempP.getCardNo()); |
| 598 | 599 | |
| ... | ... | @@ -2089,6 +2090,18 @@ |
| 2089 | 2090 | model.setStreetPostRestId(patient.getProvincePostRestId()); |
| 2090 | 2091 | model.setAddressPostRest(patient.getAddressPostRest()); |
| 2091 | 2092 | matDeliverService.updateOne(model, model.getId()); |
| 2093 | + } | |
| 2094 | + if (patient.getIsArchive()!=null&&patient.getIsArchive()==1){ | |
| 2095 | + ArchiveDataQuery query = new ArchiveDataQuery(); | |
| 2096 | + query.setIdCard(patient.getCardNo()); | |
| 2097 | + List<ArchiveData> list = archiveDataServicer.query(query, Sort.Direction.DESC, "created"); | |
| 2098 | + if (CollectionUtils.isNotEmpty(list)) { | |
| 2099 | + ArchiveData archiveData = new ArchiveData(); | |
| 2100 | + archiveData.setBuildDate(new Date()); | |
| 2101 | + archiveData.setIsArchive(1); | |
| 2102 | + archiveData.setId(patient.getHospitalId() + ":" + patient.getCardNo()); | |
| 2103 | + archiveDataServicer.update(archiveData); | |
| 2104 | + } | |
| 2092 | 2105 | } |
| 2093 | 2106 | } |
| 2094 | 2107 |