Commit b2725323eed660bc44a29ad9cca86d753a67e565
1 parent
f4e46dfaa7
Exists in
master
and in
6 other branches
产检初诊复诊变更团队增加变更记录
Showing 3 changed files with 53 additions and 5 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/TeamRecordUpdateModel.java
View file @
b272532
... | ... | @@ -22,7 +22,7 @@ |
22 | 22 | private Integer patientAge;//患者年龄 |
23 | 23 | private String patientPhone;//患者电话 |
24 | 24 | private String patientGestation;//患者孕周 |
25 | - private String patientDueDate;//患者预产期 | |
25 | + private Date patientDueDate;//患者预产期 | |
26 | 26 | private String doctorName;//医生名称 |
27 | 27 | private String oldTeamName;//变更前团队名称 |
28 | 28 | private String teamName;//团队名称 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
b272532
... | ... | @@ -23,11 +23,9 @@ |
23 | 23 | import com.lyms.platform.operate.web.request.*; |
24 | 24 | import com.lyms.platform.operate.web.result.*; |
25 | 25 | import com.lyms.platform.operate.web.service.ITrackDownService; |
26 | +import com.lyms.platform.operate.web.service.TeamService; | |
26 | 27 | import com.lyms.platform.operate.web.utils.*; |
27 | -import com.lyms.platform.permission.model.Organization; | |
28 | -import com.lyms.platform.permission.model.PatientService; | |
29 | -import com.lyms.platform.permission.model.PatientServiceQuery; | |
30 | -import com.lyms.platform.permission.model.Users; | |
28 | +import com.lyms.platform.permission.model.*; | |
31 | 29 | import com.lyms.platform.permission.service.CouponService; |
32 | 30 | import com.lyms.platform.permission.service.OrganizationService; |
33 | 31 | import com.lyms.platform.permission.service.PatientServiceService; |
... | ... | @@ -344,6 +342,22 @@ |
344 | 342 | model.setHospitalId(hospitalId); |
345 | 343 | model.setOperator(userId); |
346 | 344 | antenatalExaminationService.updateOneAnt(model, antExAddRequest.getId()); |
345 | + //变更团队增加变更记录 | |
346 | + if(StringUtils.isNotEmpty(antExAddRequest.getReason())){ | |
347 | + Patients p = patientsService.findOnePatientById(antExAddRequest.getParentId()); | |
348 | + TeamRecordUpdateModel teamModel=new TeamRecordUpdateModel(); | |
349 | + teamModel.setPatientName(p.getUsername()); | |
350 | + teamModel.setPatientAge(p.getAge()); | |
351 | + teamModel.setPatientPhone(p.getPhone()); | |
352 | + teamModel.setPatientDueDate(p.getDueDate()); | |
353 | + teamModel.setPatientGestation(antExAddRequest.getCurrentDueDate()); | |
354 | + teamModel.setDoctorName(antExAddRequest.getCheckDoctor()); | |
355 | + teamModel.setOldTeamName(antExAddRequest.getOldTeamName()); | |
356 | + teamModel.setTeamName(antExAddRequest.getTeamName()); | |
357 | + teamModel.setCreated(new Date()); | |
358 | + teamModel.setUpdateCause(antExAddRequest.getReason()); | |
359 | + mongoTemplate.save(teamModel); | |
360 | + } | |
347 | 361 | AntExQuery antExQuery = new AntExQuery(); |
348 | 362 | antExQuery.setId(antExAddRequest.getId()); |
349 | 363 | List <AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); |
... | ... | @@ -418,6 +432,22 @@ |
418 | 432 | trackDownRecordService.updateTrackDownParent(trackDownRecord, antExAddRequest.getParentId()); |
419 | 433 | }*/ |
420 | 434 | antenatalExaminationService.addOneBabyAnt(model); |
435 | + //变更团队增加变更记录 | |
436 | + if(StringUtils.isNotEmpty(antExAddRequest.getReason())){ | |
437 | + Patients p = patientsService.findOnePatientById(antExAddRequest.getParentId()); | |
438 | + TeamRecordUpdateModel teamModel=new TeamRecordUpdateModel(); | |
439 | + teamModel.setPatientName(p.getUsername()); | |
440 | + teamModel.setPatientAge(p.getAge()); | |
441 | + teamModel.setPatientPhone(p.getPhone()); | |
442 | + teamModel.setPatientDueDate(p.getDueDate()); | |
443 | + teamModel.setPatientGestation(antExAddRequest.getCurrentDueDate()); | |
444 | + teamModel.setDoctorName(antExAddRequest.getCheckDoctor()); | |
445 | + teamModel.setOldTeamName(antExAddRequest.getOldTeamName()); | |
446 | + teamModel.setTeamName(antExAddRequest.getTeamName()); | |
447 | + teamModel.setCreated(new Date()); | |
448 | + teamModel.setUpdateCause(antExAddRequest.getReason()); | |
449 | + mongoTemplate.save(teamModel); | |
450 | + } | |
421 | 451 | antExAddRequest.setId(model.getId()); |
422 | 452 | //自动诊断高危 |
423 | 453 | autoExRisk(antExAddRequest, patients); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
View file @
b272532
... | ... | @@ -375,7 +375,25 @@ |
375 | 375 | private String sieveType; |
376 | 376 | |
377 | 377 | private String teamId;//医生团队 |
378 | + private String teamName;//医生团队名字 | |
379 | + private String oldTeamName;//变更前医生团队名字 | |
378 | 380 | private String reason;//换团队的原因 |
381 | + | |
382 | + public String getTeamName() { | |
383 | + return teamName; | |
384 | + } | |
385 | + | |
386 | + public void setTeamName(String teamName) { | |
387 | + this.teamName = teamName; | |
388 | + } | |
389 | + | |
390 | + public String getOldTeamName() { | |
391 | + return oldTeamName; | |
392 | + } | |
393 | + | |
394 | + public void setOldTeamName(String oldTeamName) { | |
395 | + this.oldTeamName = oldTeamName; | |
396 | + } | |
379 | 397 | |
380 | 398 | public String getTeamId() { |
381 | 399 | return teamId; |