From d8a8a67ad56b605f4b052f274de7594663d16f79 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 8 Aug 2024 15:51:39 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E5=BB=BA=E6=A1=A3?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BD=8F=E9=99=A2=E7=97=85=E4=BE=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/pojo/Patients.java | 10 ++++++++++ .../main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java | 2 ++ .../lyms/platform/operate/web/facade/BookbuildingFacade.java | 1 + .../com/lyms/platform/operate/web/facade/CourseFacade.java | 5 +++-- .../platform/operate/web/result/PatientManagerQueryModel.java | 10 ++++++++++ .../lyms/platform/operate/web/result/PregnantInfoResult.java | 10 ++++++++++ 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 6cbec6d..139e7b9 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -522,6 +522,16 @@ public class Patients extends BaseModel { //大同审核建档 0为待审核 1为正常 private Integer isArchive; + //病历号(住院号) + private String blNo; + + public String getBlNo() { + return blNo; + } + + public void setBlNo(String blNo) { + this.blNo = blNo; + } public Integer getIsArchive() { return isArchive; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java index 143f0a2..c4752ec 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java @@ -117,6 +117,7 @@ public class DtdyrmFmService implements IdtdyrmFmService { patient.setType(3); patient.setBuildType(2); patient.setDueStatus(0); + patient.setBlNo(allFm.getBhnum()); patient.setDeliverDoctor(String.valueOf(users.get(0).getId())); patient.setModified(new Date()); patientsService.updatePatientOne(patient,patient.getId()); @@ -154,6 +155,7 @@ public class DtdyrmFmService implements IdtdyrmFmService { patient.setDeliverDoctor(String.valueOf(users.get(0).getId())); patient.setCreated(new Date()); patient.setModified(new Date()); + patient.setBlNo(allFm.getBhnum()); patient=patientsService.addPatient(patient); }else { System.out.println("no idCardNo in database："+ allFm.toString()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 6e2f2d9..bac8887 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -3101,6 +3101,7 @@ public class BookbuildingFacade { result.setUserType(p.getUserType()); result.setDept(p.getDept()); result.setLowerHairOgr(p.getLowerHairOgr()); + result.setBlNo(p.getBlNo()); return result; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index e52965f..ca9ade1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -323,9 +323,10 @@ public class CourseFacade { Date endDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 23:59:59"); CourseQuery query = new CourseQuery(); List stringList=new ArrayList<>(); - // 目前把南和及龙源美生（用来测试正式推送） - stringList.add("245"); + // 目前把南和及大同 + // stringList.add("245"); stringList.add("1000000115"); + stringList.add("2100002419"); query.setHospitalIds(stringList); query.setPublishTimeStart(startDate); query.setPublishTimeEnd(endDate); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java index 8156738..ada9c1d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java @@ -140,6 +140,16 @@ public class PatientManagerQueryModel { //服务状态 private Integer serviceStatus; private Integer serviceType; + //病历号(住院号) + private String blNo; + + public String getBlNo() { + return blNo; + } + + public void setBlNo(String blNo) { + this.blNo = blNo; + } public String getDept() { return dept; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index d35601a..3aadb3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -59,6 +59,16 @@ public class PregnantInfoResult { private Integer userType; private String dept; private String lowerHairOgr; + //病历号(住院号) + private String blNo; + + public String getBlNo() { + return blNo; + } + + public void setBlNo(String blNo) { + this.blNo = blNo; + } public String getLowerHairOgr() { return lowerHairOgr; -- 1.8.3.1