jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b8a5bba0ad3d611e64336c591e0c290214a633c9

Authored by jiangjiazhi
1 parent 99dfd29a68
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

修改产检劵生成按区域生成

Showing 2 changed files with 5 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ b8a5bba
... ... @@ -274,9 +274,9 @@
274 274 if (CollectionUtils.isNotEmpty(code)) {
275 275 areaCode = code.get(0);
276 276 }
277   - if (null != areaCode) {
  277 + if (null != areaCode&&StringUtils.isNotEmpty(areaCode.getAreaCode())) {
278 278 // 建档成功后，给孕妇造五个条形码
279   - String ticketPid = autoIncermentService.nextPatientTicketId(p.getHospitalId());
  279 + String ticketPid = autoIncermentService.nextPatientTicketId(areaCode.getAreaCode());
280 280 for (Integer i = 1; i <= 5; i++) {
281 281 PatientCheckTicket ticket = new PatientCheckTicket();
282 282 ticket.setStatus(1);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java View file @ b8a5bba
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.common.enums.YnEnums;
9 9 import com.lyms.platform.common.result.BaseResponse;
10 10 import com.lyms.platform.common.utils.ExceptionUtils;
  11 +import com.lyms.platform.common.utils.StringUtils;
11 12 import com.lyms.platform.operate.web.worker.WorkHR;
12 13 import com.lyms.platform.permission.model.Organization;
13 14 import com.lyms.platform.permission.service.OrganizationService;
14 15  
... ... @@ -109,9 +110,9 @@
109 110 if (CollectionUtils.isNotEmpty(code)) {
110 111 areaCode = code.get(0);
111 112 }
112   - if (null != areaCode) {
  113 + if (null != areaCode&& StringUtils.isNotEmpty(areaCode.getAreaCode())) {
113 114 // 建档成功后，给孕妇造五个条形码
114   - String ticketPid = autoIncermentService.nextPatientTicketId(p.getHospitalId());
  115 + String ticketPid = autoIncermentService.nextPatientTicketId(areaCode.getAreaCode());
115 116 for (Integer i = 1; i <= 5; i++) {
116 117 PatientCheckTicket ticket = new PatientCheckTicket();
117 118 ticket.setStatus(1);