挂号调整
This commit is contained in:
@@ -211,11 +211,13 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
|
|||||||
EncounterLocation encounterLocation = new EncounterLocation();
|
EncounterLocation encounterLocation = new EncounterLocation();
|
||||||
BeanUtils.copyProperties(encounterLocationFormData, encounterLocation);
|
BeanUtils.copyProperties(encounterLocationFormData, encounterLocation);
|
||||||
iEncounterLocationService.saveEncounterLocationByRegister(encounterLocation);
|
iEncounterLocationService.saveEncounterLocationByRegister(encounterLocation);
|
||||||
// 保存就诊参数者信息
|
// 保存就诊参数者信息 , 选了参与这才保存
|
||||||
|
if (encounterParticipantFormData.getPractitionerId() != null) {
|
||||||
encounterParticipantFormData.setEncounterId(encounterId);
|
encounterParticipantFormData.setEncounterId(encounterId);
|
||||||
EncounterParticipant encounterParticipant = new EncounterParticipant();
|
EncounterParticipant encounterParticipant = new EncounterParticipant();
|
||||||
BeanUtils.copyProperties(encounterParticipantFormData, encounterParticipant);
|
BeanUtils.copyProperties(encounterParticipantFormData, encounterParticipant);
|
||||||
iEncounterParticipantService.saveEncounterParticipantByRegister(encounterParticipant);
|
iEncounterParticipantService.saveEncounterParticipantByRegister(encounterParticipant);
|
||||||
|
}
|
||||||
// 保存就诊账户信息
|
// 保存就诊账户信息
|
||||||
accountFormData.setEncounterId(encounterId);
|
accountFormData.setEncounterId(encounterId);
|
||||||
Account account = new Account();
|
Account account = new Account();
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package com.openhis.web.chargemanage.dto;
|
package com.openhis.web.chargemanage.dto;
|
||||||
|
|
||||||
import javax.validation.constraints.NotBlank;
|
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||||
@@ -27,7 +26,6 @@ public class EncounterParticipantFormData {
|
|||||||
private String typeCode;
|
private String typeCode;
|
||||||
|
|
||||||
/** 参与者ID */
|
/** 参与者ID */
|
||||||
@NotNull(message = "参与者ID不能为空")
|
|
||||||
@JsonSerialize(using = ToStringSerializer.class)
|
@JsonSerialize(using = ToStringSerializer.class)
|
||||||
private Long practitionerId;
|
private Long practitionerId;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user