jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 858f80fa7493c4cd0432c8512c5a1225387ed953

Authored by hujiaqi
2 parents af952e5c54 e6cf8c40a3
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java View file @ 858f80f
... ... @@ -341,7 +341,7 @@
341 341 //指导意见
342 342 private String zhiDaoYiJian;
343 343 //婚检医生
344   - private DoctorModel hunJianDoctor;
  344 + private String hunJianDoctor;
345 345  
346 346 public Integer getSexType() {
347 347 return sexType;
348 348  
... ... @@ -1519,11 +1519,11 @@
1519 1519 this.zhiDaoYiJian = zhiDaoYiJian;
1520 1520 }
1521 1521  
1522   - public DoctorModel getHunJianDoctor() {
  1522 + public String getHunJianDoctor() {
1523 1523 return hunJianDoctor;
1524 1524 }
1525 1525  
1526   - public void setHunJianDoctor(DoctorModel hunJianDoctor) {
  1526 + public void setHunJianDoctor(String hunJianDoctor) {
1527 1527 this.hunJianDoctor = hunJianDoctor;
1528 1528 }
1529 1529 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 858f80f
... ... @@ -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 @ 858f80f
... ... @@ -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);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 858f80f
... ... @@ -21,7 +21,9 @@
21 21 import com.lyms.platform.operate.web.utils.CommonsHelper;
22 22 import com.lyms.platform.operate.web.utils.FunvCommonUtil;
23 23 import com.lyms.platform.permission.model.Organization;
  24 +import com.lyms.platform.permission.model.Users;
24 25 import com.lyms.platform.permission.service.OrganizationService;
  26 +import com.lyms.platform.permission.service.UsersService;
25 27 import com.lyms.platform.pojo.BasicConfig;
26 28 import com.lyms.platform.pojo.DoctorModel;
27 29 import com.lyms.platform.pojo.PremaritalCheckup;
... ... @@ -55,6 +57,8 @@
55 57 private OrganizationService organizationService;
56 58 @Autowired
57 59 private AutoMatchFacade autoMatchFacade;
  60 + @Autowired
  61 + private UsersService usersService;
58 62  
59 63 /**
60 64 * 查询单个(男/女)婚前检查
... ... @@ -344,7 +348,15 @@
344 348 checkupResult.setYiXueYiJian(result.getYiXueYiJian());
345 349 checkupResult.setYiJianQiTaDetails(result.getYiJianQiTaDetails());
346 350 checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian());
347   - checkupResult.setHunJianDoctor(result.getHunJianDoctor());
  351 + String hunJianDoctor = "";
  352 + if (result.getHunJianDoctor()!=null){
  353 + Users users = usersService.getUsers(Integer.parseInt(result.getHunJianDoctor()));
  354 + if (users!=null && users.getYn()==YnEnums.YES.getId()){
  355 + hunJianDoctor = users.getName();
  356 + }
  357 + }
  358 +// checkupResult.setHunJianDoctor(result.getHunJianDoctor());
  359 + checkupResult.setHunJianDoctor(hunJianDoctor);
348 360 return checkupResult;
349 361 }
350 362  
351 363  
352 364  
... ... @@ -428,12 +440,14 @@
428 440 map.put("yiXueYiJian", checkup.getYiXueYiJian() == null ? "" : MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle());
429 441 map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(),
430 442 model.getAddress(), basicConfigService));
  443 +
431 444 String hunJianDoctor = "";
432 445 if (checkup.getHunJianDoctor()!=null){
433   - DoctorModel doctorModel = checkup.getHunJianDoctor();
434   - hunJianDoctor = doctorModel.getName();
  446 + Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor()));
  447 + if (users!=null && users.getYn()==YnEnums.YES.getId()){
  448 + hunJianDoctor = users.getName();
  449 + }
435 450 }
436   -
437 451 map.put("hunJianDoctor", hunJianDoctor);
438 452 map.put("id", checkup.getId());
439 453 list.add(map);
440 454  
... ... @@ -1037,10 +1051,11 @@
1037 1051 map.put("zhiDaoYiJian", checkup.getZhiDaoYiJian());
1038 1052 String hunJianDoctor = "";
1039 1053 if (checkup.getHunJianDoctor()!=null){
1040   - DoctorModel doctorModel = checkup.getHunJianDoctor();
1041   - hunJianDoctor = doctorModel.getName();
  1054 + Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor()));
  1055 + if (users!=null && users.getYn()==YnEnums.YES.getId()){
  1056 + hunJianDoctor = users.getName();
  1057 + }
1042 1058 }
1043   -
1044 1059 map.put("hunJianDoctor", hunJianDoctor);
1045 1060 list.add(map);
1046 1061 }
1047 1062  
... ... @@ -1448,10 +1463,11 @@
1448 1463 map.put("zhiDaoYiJian", checkup.getZhiDaoYiJian());
1449 1464 String hunJianDoctor = "";
1450 1465 if (checkup.getHunJianDoctor()!=null){
1451   - DoctorModel doctorModel = checkup.getHunJianDoctor();
1452   - hunJianDoctor = doctorModel.getName();
  1466 + Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor()));
  1467 + if (users!=null && users.getYn()==YnEnums.YES.getId()){
  1468 + hunJianDoctor = users.getName();
  1469 + }
1453 1470 }
1454   -
1455 1471 map.put("hunJianDoctor", hunJianDoctor);
1456 1472 list.add(map);
1457 1473 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java View file @ 858f80f
... ... @@ -325,7 +325,7 @@
325 325 //指导意见
326 326 private String zhiDaoYiJian;
327 327 //婚检医生
328   - private DoctorModel hunJianDoctor;
  328 + private String hunJianDoctor;
329 329  
330 330 private Integer sexType;
331 331  
332 332  
... ... @@ -1474,11 +1474,11 @@
1474 1474 this.zhiDaoYiJian = zhiDaoYiJian;
1475 1475 }
1476 1476  
1477   - public DoctorModel getHunJianDoctor() {
  1477 + public String getHunJianDoctor() {
1478 1478 return hunJianDoctor;
1479 1479 }
1480 1480  
1481   - public void setHunJianDoctor(DoctorModel hunJianDoctor) {
  1481 + public void setHunJianDoctor(String hunJianDoctor) {
1482 1482 this.hunJianDoctor = hunJianDoctor;
1483 1483 }
1484 1484 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java View file @ 858f80f
... ... @@ -328,7 +328,7 @@
328 328 //指导意见
329 329 private String zhiDaoYiJian;
330 330 //婚检医生
331   - private DoctorModel hunJianDoctor;
  331 + private String hunJianDoctor;
332 332  
333 333 public String getId() {
334 334 return id;
335 335  
... ... @@ -1482,11 +1482,11 @@
1482 1482 this.zhiDaoYiJian = zhiDaoYiJian;
1483 1483 }
1484 1484  
1485   - public DoctorModel getHunJianDoctor() {
  1485 + public String getHunJianDoctor() {
1486 1486 return hunJianDoctor;
1487 1487 }
1488 1488  
1489   - public void setHunJianDoctor(DoctorModel hunJianDoctor) {
  1489 + public void setHunJianDoctor(String hunJianDoctor) {
1490 1490 this.hunJianDoctor = hunJianDoctor;
1491 1491 }
1492 1492 }