Commit d4a328e3ed7b76e0eadd4f9cce9403d7e912145f

Authored by changpengfei
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java View file @ d4a328e
... ... @@ -362,13 +362,13 @@
362 362 PatientPcaseResult result = new PatientPcaseResult();
363 363 result.setPid(destModel.getPid());
364 364 result.setDepartName(destModel.getDname());
365   - result.setDoctorName(destModel.getDtname());
366 365 result.setCardNo(patient.getIdno());
367 366 result.setPatientName(patient.getPname());
368 367 result.setCcnt(patient.getCcnt());
369 368 result.setPhxid(patient.getHxid());
370 369 LymsDoctor doctor = lymsDoctorService.getById(destModel.getDtid());
371 370 //获得医生职位
  371 + result.setDoctorName(doctor.getDname());
372 372 LambdaQueryWrapper<LymsDict> wrapperLymsDict = new QueryWrapper().lambda();
373 373 wrapperLymsDict.eq(LymsDict::getVtype, 4);
374 374 wrapperLymsDict.eq(LymsDict::getCode, doctor.getLvl());
... ... @@ -392,6 +392,8 @@
392 392 result.setDhxid(doctor.getHxid());
393 393 result.setDtid(destModel.getDtid());
394 394 result.setCreatedby(DateUtil.getYyyyMmDdHhMmSs(destModel.getCreatedtime()));
  395 + //病例id
  396 + result.setPcid(destModel.getPcid());
395 397 pcases.add(result);
396 398 });
397 399 }
talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/PatientPcaseResult.java View file @ d4a328e
... ... @@ -45,9 +45,11 @@
45 45 private String iname;
46 46 //就诊时间
47 47 private String createdby;
48   -
49 48 //问诊卡数量
50 49 private Integer ccnt;
  50 + //病例id
  51 + private Integer pcid;
  52 +
51 53  
52 54  
53 55 }