clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev

This commit is contained in:
LiJianZhao 2025-05-08 11:59:28 +08:00
parent 10dcebcac6
commit 8df584d5e9
2 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java
View File

@ -384,10 +384,10 @@ public class MedicalRecordService extends BaseService {
OrganizationMember docker = organizationMemberMapper.selectById(registration.getOrganizationDoctorId()); OrganizationMember docker = organizationMemberMapper.selectById(registration.getOrganizationDoctorId());
vo.setDockerId(docker.getId()); vo.setDockerId(docker.getId());
vo.setDockerName(docker.getName()); vo.setDockerName(docker.getName());
// if (docker.getSectionId() != null) { if (registration.getOrganizationSectionId() != null) {
// OrganizationSection section = organizationSectionMapper.selectById(docker.getSectionId()); OrganizationSection section = organizationSectionMapper.selectById(registration.getOrganizationSectionId());
// vo.setSectionName(section.getName()); vo.setSectionName(section.getName());
// } }
QueryWrapper<Diagnosis> diagnosisQueryWrapper = new QueryWrapper<>(); QueryWrapper<Diagnosis> diagnosisQueryWrapper = new QueryWrapper<>();
diagnosisQueryWrapper.eq("patient_id", vo.getPatientInfo().getId()); diagnosisQueryWrapper.eq("patient_id", vo.getPatientInfo().getId());
diagnosisQueryWrapper.orderByDesc("create_time"); diagnosisQueryWrapper.orderByDesc("create_time");

35
src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java
View File

@ -98,9 +98,9 @@ public class PatientRegistrationService extends BaseService {
registration.setType(1); registration.setType(1);
registration.setStatus(1); registration.setStatus(1);
OrganizationMember docker = organizationMemberMapper.selectById(registration.getOrganizationDoctorId()); OrganizationMember docker = organizationMemberMapper.selectById(registration.getOrganizationDoctorId());
// OrganizationSection section = organizationSectionMapper.selectById(docker.getSectionId()); OrganizationSection section = organizationSectionMapper.selectById(registration.getOrganizationSectionId());
registration.setOrganizationDoctorId(docker.getId()); registration.setOrganizationDoctorId(docker.getId());
// registration.setOrganizationSectionId(section.getId()); registration.setOrganizationSectionId(section.getId());
patientRegistrationMapper.insert(registration); patientRegistrationMapper.insert(registration);
//医保挂号 //医保挂号
if (mdtrtCertType == null || mdtrtCertNo == null || mdtrtCertType.isEmpty() || mdtrtCertNo.isEmpty()){ if (mdtrtCertType == null || mdtrtCertNo == null || mdtrtCertType.isEmpty() || mdtrtCertNo.isEmpty()){
@ -116,9 +116,9 @@ public class PatientRegistrationService extends BaseService {
im2201.setIptOtpNo(fstNo); im2201.setIptOtpNo(fstNo);
im2201.setAtddrNo(docker.getSocialMemberCode()); im2201.setAtddrNo(docker.getSocialMemberCode());
im2201.setDrName(docker.getName()); im2201.setDrName(docker.getName());
// im2201.setDeptCode(section.getCode()); im2201.setDeptCode(section.getCode());
// im2201.setDeptName(section.getName()); im2201.setDeptName(section.getName());
// im2201.setCaty(section.getCaty()); im2201.setCaty(section.getCaty());
JSONObject jsonObject = socialRequest.call2201(im2201); JSONObject jsonObject = socialRequest.call2201(im2201);
UpdateWrapper<PatientRegistration> regisWrapper = new UpdateWrapper<>(); UpdateWrapper<PatientRegistration> regisWrapper = new UpdateWrapper<>();
regisWrapper.set("mdtrt_id",((JSONObject)jsonObject.get("data")).get("mdtrt_id")); regisWrapper.set("mdtrt_id",((JSONObject)jsonObject.get("data")).get("mdtrt_id"));
@ -128,27 +128,6 @@ public class PatientRegistrationService extends BaseService {
return registration; return registration;
} }
public PatientRegistration regisByDockerAndPatient(OrganizationMember docker, PatientInfo patient, Short type, Integer status){
RegistrationSaveDto registration = new RegistrationSaveDto();
//病人信息
registration.setPatientInfoId(patient.getId());
registration.setName(patient.getName());
registration.setGender(patient.getSex());
registration.setAge(patient.getAge());
registration.setPhone(patient.getPhone());
//医生信息
// registration.setOrganizationSectionId(docker.getSectionId());
registration.setOrganizationDoctorId(docker.getId());
//挂号信息
registration.setVisitType(type);
registration.setCreateDatetime(LocalDateTime.now());
registration.setRegistrationMoney(BigDecimal.valueOf(0));
registration.setDelFlag(0);
return patientRegistrationService.registration(registration,null,null);
}
/* /*
* 挂号列表 * 挂号列表
@ -285,8 +264,8 @@ public class PatientRegistrationService extends BaseService {
OrganizationMember docker = organizationMemberMapper.selectById(registration.getOrganizationDoctorId()); OrganizationMember docker = organizationMemberMapper.selectById(registration.getOrganizationDoctorId());
vo.setDoctorName(docker.getName()); vo.setDoctorName(docker.getName());
// OrganizationSection section = organizationSectionMapper.selectById(docker.getSectionId()); OrganizationSection section = organizationSectionMapper.selectById(registration.getOrganizationSectionId());
// vo.setDoctorSection(section.getName()); vo.setDoctorSection(section.getName());
QueryWrapper<PatientRegistration> queryWrapper = new QueryWrapper<>(); QueryWrapper<PatientRegistration> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("patient_info_id",registration.getPatientInfoId()); queryWrapper.eq("patient_info_id",registration.getPatientInfoId());