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 60a1dad..dc43426 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 @@ -322,6 +322,14 @@ public class Patients extends BaseModel { //条码号 private String numberCode; + public String getNumberCode() { + return numberCode; + } + + public void setNumberCode(String numberCode) { + this.numberCode = numberCode; + } + public String getLowerHairOgrId() { return lowerHairOgrId; } 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 9510a16..5ffb48e 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 @@ -339,6 +339,9 @@ public class BookbuildingFacade { patient.setModified(new Date()); patient.setOperator(userId); + //生成条形码 + getNumberCode(patient); + //孕妇档案 Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); @@ -507,6 +510,26 @@ public class BookbuildingFacade { return br; } + + private void getNumberCode(Patients patients) + { + String numberCode = ""; + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + while (true) + { + numberCode = patients.getHospitalId()+DateUtil.getyyyy_MM_dd(new Date()) +new Random().nextInt(9999); + patientsQuery.setNumberCode(numberCode); + List patientses = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + if (!CollectionUtils.isNotEmpty(patientses)) + { + break; + } + } + patients.setNumberCode(numberCode); + } + + /** * 添加或更新追访信息 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 7019ca4..e53922b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -506,6 +506,7 @@ public class ViewFacade { map.put("filePath", filePath); map.put("townOrgName", getBasicConfig(data.getTownOrgId())); + map.put("numberCode", data.getNumberCode() == null ? "" : data.getNumberCode()); return map; }