shihan11/medical_training
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:cms relation hospital bug fix

Browse Source
This commit is contained in:
shihan11
2026-06-17 10:22:51 +08:00
parent 2bb9ff50d8
commit 89ab844343
5 changed files with 274 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/user/cms_relation.py
+51 -18
View File
@@ -13,7 +13,7 @@ from apps.common.excel import xlsx_response, rows_from_xlsx
from .models import User, TeacherStudentRelation
REL_STATUS_LABEL = {0: '已结束', 1: '进行中'}
REL_IMPORT_HEADERS = ['带教医生手机号', '学生手机号']
REL_IMPORT_HEADERS = ['带教医生姓名', '带教医生手机号', '学生姓名', '学生手机号']
REL_EXPORT_HEADERS = ['ID', '带教医生', '带教医生手机号', '学生', '学生手机号', '状态']
@@ -33,36 +33,48 @@ class CmsRelationSerializer(serializers.ModelSerializer):
]
def _resolve_rel_user(name, phone, role, label, code):
"""按 姓名 + 手机号 + 角色 解析用户；不匹配抛 400。"""
u = User.objects.filter(phone=phone, real_name=name, role_type=role).first()
if u is None:
raise AppError(code, f'{label}不存在或姓名与手机号不符：{name} / {phone}', status_code=400)
return u
class CmsRelationWriteSerializer(serializers.ModelSerializer):
"""新增 / 编辑：入参用**带教老师手机号 / 学生手机号**；按手机号解析为用户
"""新增 / 编辑：入参用**带教老师姓名+手机号 / 学生姓名+手机号**；按姓名+手机号解析为用户
（带教老师须 doctor、学生须 student）；医院管理员限本院。"""
teacher_name = serializers.CharField(write_only=True, required=False, help_text='带教老师姓名（新增必填）')
teacher_phone = serializers.CharField(write_only=True, required=False, help_text='带教老师手机号（新增必填）')
student_name = serializers.CharField(write_only=True, required=False, help_text='学生姓名（新增必填）')
student_phone = serializers.CharField(write_only=True, required=False, help_text='学生手机号（新增必填）')
class Meta:
model = TeacherStudentRelation
fields = ['teacher_phone', 'student_phone', 'relation_type', 'status']
fields = ['teacher_name', 'teacher_phone', 'student_name', 'student_phone', 'relation_type', 'status']
def validate(self, attrs):
actor = self.context['request'].user
creating = self.instance is None
t_name = (attrs.pop('teacher_name', None) or '').strip()
t_phone = (attrs.pop('teacher_phone', None) or '').strip()
s_name = (attrs.pop('student_name', None) or '').strip()
s_phone = (attrs.pop('student_phone', None) or '').strip()
if creating and (not t_phone or not s_phone):
raise AppError('CMS_VALIDATION_ERROR', '带教老师手机号和学生手机号均必填', status_code=400)
if creating and not (t_name and t_phone and s_name and s_phone):
raise AppError('CMS_VALIDATION_ERROR', '带教老师姓名/手机号、学生姓名/手机号均必填', status_code=400)
# 按手机号解析（带教老师须 doctor、学生须 student）；编辑时未传则沿用原值
# 解析（编辑时该方未传任何字段则沿用原值；传了则姓名与手机号需成对）
teacher = self.instance.teacher if self.instance else None
if t_name or t_phone:
if not (t_name and t_phone):
raise AppError('CMS_VALIDATION_ERROR', '带教老师姓名与手机号需同时提供', status_code=400)
teacher = _resolve_rel_user(t_name, t_phone, 'doctor', '带教老师', 'CMS_REL_TEACHER_NOT_FOUND')
student = self.instance.student if self.instance else None
if t_phone:
teacher = User.objects.filter(phone=t_phone, role_type='doctor').first()
if teacher is None:
raise AppError('CMS_REL_TEACHER_NOT_FOUND', f'带教老师不存在或非医生：{t_phone}', status_code=400)
if s_phone:
student = User.objects.filter(phone=s_phone, role_type='student').first()
if student is None:
raise AppError('CMS_REL_STUDENT_NOT_FOUND', f'学生不存在或非学生：{s_phone}', status_code=400)
if s_name or s_phone:
if not (s_name and s_phone):
raise AppError('CMS_VALIDATION_ERROR', '学生姓名与手机号需同时提供', status_code=400)
student = _resolve_rel_user(s_name, s_phone, 'student', '学生', 'CMS_REL_STUDENT_NOT_FOUND')
if teacher is None or student is None:
raise AppError('CMS_VALIDATION_ERROR', '带教老师和学生均必填', status_code=400)
@@ -136,6 +148,25 @@ class CmsTeacherStudentRelationViewSet(viewsets.ModelViewSet):
self.get_object().delete()
return Response({'message': '已停用'})
# ── 下拉数据源（医院管理员本院 / 超管全平台；姓名+手机号一并返回）──────────
def _role_users(self, role):
qs = User.objects.filter(role_type=role).order_by('real_name', 'id')
if not is_super(self.request.user):
qs = qs.filter(institution_id=self.request.user.institution_id)
return [{'id': u.id, 'real_name': u.real_name, 'phone': u.phone} for u in qs]
@extend_schema(summary='CMS-REL-6 带教医生下拉（姓名+手机号）', tags=['CMS-师生关系'])
@action(detail=False, methods=['get'], url_path='doctors')
def doctors(self, request):
"""新增/编辑师生关系的「带教医生」下拉数据源，返回 [{id, real_name, phone}]。"""
return Response(self._role_users('doctor'))
@extend_schema(summary='CMS-REL-7 学生下拉（姓名+手机号）', tags=['CMS-师生关系'])
@action(detail=False, methods=['get'], url_path='students')
def students(self, request):
"""新增/编辑师生关系的「学生」下拉数据源，返回 [{id, real_name, phone}]。"""
return Response(self._role_users('student'))
@extend_schema(summary='CMS-REL-4 下载师生关系导入模板', tags=['CMS-师生关系'])
@action(detail=False, methods=['get'], url_path='import-template')
def import_template(self, request):
@@ -174,14 +205,16 @@ class CmsTeacherStudentRelationViewSet(viewsets.ModelViewSet):
success, errors = 0, []
for idx, row in enumerate(rows, start=2):
t_name = (row.get('带教医生姓名') or '').strip()
t_phone = (row.get('带教医生手机号') or '').strip()
s_name = (row.get('学生姓名') or '').strip()
s_phone = (row.get('学生手机号') or '').strip()
teacher = User.objects.filter(phone=t_phone, role_type='doctor').first()
teacher = User.objects.filter(phone=t_phone, real_name=t_name, role_type='doctor').first()
if teacher is None:
errors.append({'row': idx, 'reason': f'带教医生不存在或非医生：{t_phone}'}); continue
student = User.objects.filter(phone=s_phone, role_type='student').first()
errors.append({'row': idx, 'reason': f'带教医生不存在或姓名手机号不符：{t_name} / {t_phone}'}); continue
student = User.objects.filter(phone=s_phone, real_name=s_name, role_type='student').first()
if student is None:
errors.append({'row': idx, 'reason': f'学生不存在或非学生：{s_phone}'}); continue
errors.append({'row': idx, 'reason': f'学生不存在或姓名手机号不符：{s_name} / {s_phone}'}); continue
if not actor_is_super and (
teacher.institution_id != actor.institution_id
or student.institution_id != actor.institution_id