Commit d8a8a67ad56b605f4b052f274de7594663d16f79
1 parent
d2b5d2269a
Exists in
dev
#fix:新增建档管理住院病例字段
Showing 6 changed files with 36 additions and 2 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
View file @
d8a8a67
| ... | ... | @@ -522,6 +522,16 @@ |
| 522 | 522 | |
| 523 | 523 | //大同审核建档 0为待审核 1为正常 |
| 524 | 524 | private Integer isArchive; |
| 525 | + //病历号(住院号) | |
| 526 | + private String blNo; | |
| 527 | + | |
| 528 | + public String getBlNo() { | |
| 529 | + return blNo; | |
| 530 | + } | |
| 531 | + | |
| 532 | + public void setBlNo(String blNo) { | |
| 533 | + this.blNo = blNo; | |
| 534 | + } | |
| 525 | 535 | |
| 526 | 536 | public Integer getIsArchive() { |
| 527 | 537 | return isArchive; |
platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java
View file @
d8a8a67
| ... | ... | @@ -117,6 +117,7 @@ |
| 117 | 117 | patient.setType(3); |
| 118 | 118 | patient.setBuildType(2); |
| 119 | 119 | patient.setDueStatus(0); |
| 120 | + patient.setBlNo(allFm.getBhnum()); | |
| 120 | 121 | patient.setDeliverDoctor(String.valueOf(users.get(0).getId())); |
| 121 | 122 | patient.setModified(new Date()); |
| 122 | 123 | patientsService.updatePatientOne(patient,patient.getId()); |
| ... | ... | @@ -154,6 +155,7 @@ |
| 154 | 155 | patient.setDeliverDoctor(String.valueOf(users.get(0).getId())); |
| 155 | 156 | patient.setCreated(new Date()); |
| 156 | 157 | patient.setModified(new Date()); |
| 158 | + patient.setBlNo(allFm.getBhnum()); | |
| 157 | 159 | patient=patientsService.addPatient(patient); |
| 158 | 160 | }else { |
| 159 | 161 | System.out.println("no idCardNo in database:"+ allFm.toString()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
d8a8a67
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
View file @
d8a8a67
| ... | ... | @@ -323,9 +323,10 @@ |
| 323 | 323 | Date endDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 23:59:59"); |
| 324 | 324 | CourseQuery query = new CourseQuery(); |
| 325 | 325 | List<String> stringList=new ArrayList<>(); |
| 326 | - // 目前把南和及龙源美生(用来测试正式推送) | |
| 327 | - stringList.add("245"); | |
| 326 | + // 目前把南和及大同 | |
| 327 | + // stringList.add("245"); | |
| 328 | 328 | stringList.add("1000000115"); |
| 329 | + stringList.add("2100002419"); | |
| 329 | 330 | query.setHospitalIds(stringList); |
| 330 | 331 | query.setPublishTimeStart(startDate); |
| 331 | 332 | query.setPublishTimeEnd(endDate); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java
View file @
d8a8a67
| ... | ... | @@ -140,6 +140,16 @@ |
| 140 | 140 | //服务状态 |
| 141 | 141 | private Integer serviceStatus; |
| 142 | 142 | private Integer serviceType; |
| 143 | + //病历号(住院号) | |
| 144 | + private String blNo; | |
| 145 | + | |
| 146 | + public String getBlNo() { | |
| 147 | + return blNo; | |
| 148 | + } | |
| 149 | + | |
| 150 | + public void setBlNo(String blNo) { | |
| 151 | + this.blNo = blNo; | |
| 152 | + } | |
| 143 | 153 | |
| 144 | 154 | public String getDept() { |
| 145 | 155 | return dept; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
View file @
d8a8a67
| ... | ... | @@ -59,6 +59,16 @@ |
| 59 | 59 | private Integer userType; |
| 60 | 60 | private String dept; |
| 61 | 61 | private String lowerHairOgr; |
| 62 | + //病历号(住院号) | |
| 63 | + private String blNo; | |
| 64 | + | |
| 65 | + public String getBlNo() { | |
| 66 | + return blNo; | |
| 67 | + } | |
| 68 | + | |
| 69 | + public void setBlNo(String blNo) { | |
| 70 | + this.blNo = blNo; | |
| 71 | + } | |
| 62 | 72 | |
| 63 | 73 | public String getLowerHairOgr() { |
| 64 | 74 | return lowerHairOgr; |