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 14:27:09 +08:00
parent 8df584d5e9
commit 9ac00fe203
4 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java
View File

@ -6,6 +6,7 @@ import com.syjiaer.clinic.server.common.vo.Result;
import com.syjiaer.clinic.server.controller.BaseController;
import com.syjiaer.clinic.server.entity.charge.dto.ChargeQuery;
import com.syjiaer.clinic.server.entity.organization.OrganizationMember;
import com.syjiaer.clinic.server.entity.organization.OrganizationSection;
import com.syjiaer.clinic.server.entity.organization.dto.DockerSearchQuery;
import com.syjiaer.clinic.server.entity.organization.dto.OrganizationMemberSaveDto;
import com.syjiaer.clinic.server.entity.organization.vo.MemberVo;
@ -59,4 +60,19 @@ public class OrganizationMemberController extends BaseController {
return success(organizationMemberService.doctorList(dockerSearchQuery));
}
/**
* 获取当前科室的所有医生
* @return
*/
@RequestMapping("/listBySectionId")
public Result<List<OrganizationMember>> listBySectionId() {
Integer sectionId = parmsUtil.getInteger("sectionId");
if(sectionId == null){
throw new MessageException("sectionId参数为空");
}
return success(organizationMemberService.listBySectionId(sectionId));
}
}

5
src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java
View File

@ -127,10 +127,9 @@ public class RegistrationController extends BaseController {
* @return
*/
@RequestMapping("/changeStatus")
public Result<Object> changeStatus(){
public Result<PatientRegistration> changeStatus(){
Integer regisId= parmsUtil.getInteger("id","挂号单不能为空");
Integer status= parmsUtil.getInteger("status","目标状态");
patientRegistrationService.changeStatus(regisId,status);
return success();
return success( patientRegistrationService.changeStatus(regisId,status));
}
}

19
src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java
View File

@ -116,7 +116,7 @@ public class OrganizationMemberService extends BaseService {
sectionList.add(memberSection);
}
organizationMember.setSectionNames(String.join("-", sectionNameList));
organizationMember.setSectionNames(String.join("/", sectionNameList));
organizationMemberMapper.insertOrUpdate(organizationMember);
organizationMemberSectionMapper.insert(sectionList);
@ -197,4 +197,21 @@ public class OrganizationMemberService extends BaseService {
return organizationMemberMapper.selectList(queryWrapper);
}
/**
* 获取当前科室的所有医生
* @param sectionId
* @return
*/
public List<OrganizationMember> listBySectionId(Integer sectionId) {
QueryWrapper<OrganizationMemberSection> msWrapper = new QueryWrapper<>();
msWrapper.select("organization_member_id");
msWrapper.eq("organization_section_id", sectionId);
List<Integer> dockerIds = organizationMemberSectionMapper.selectObjs(msWrapper);
QueryWrapper<OrganizationMember> memberWrapper = new QueryWrapper<>();
memberWrapper.in("id", dockerIds);
return organizationMemberMapper.selectList(memberWrapper);
}
}

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

@ -285,7 +285,7 @@ public class PatientRegistrationService extends BaseService {
* @param status
* @return
*/
public void changeStatus(Integer regisId, Integer status) {
public PatientRegistration changeStatus(Integer regisId, Integer status) {
RegistrationStatusEnum statusEnum = RegistrationStatusEnum.getByType(status);
PatientRegistration patientRegistration = patientRegistrationMapper.selectById(regisId);
@ -302,5 +302,6 @@ public class PatientRegistrationService extends BaseService {
updateRegistration.setId(regisId);
updateRegistration.setStatus(status);
patientRegistrationMapper.updateById(updateRegistration);
return patientRegistrationMapper.selectById(regisId);
}
}