Просмотр исходного кода

Merge branch 'dev' of chenweida/patient-co-management into dev

chenweida 8 лет назад
Родитель
Сommit
a67a48537f

+ 7 - 3
patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/team/AdminTeamController.java

@ -3,10 +3,12 @@ package com.yihu.wlyy.web.doctor.team;
import com.yihu.wlyy.entity.dict.Disease;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.entity.doctor.team.sign.SignPatientLabelInfo;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.PatientDisease;
import com.yihu.wlyy.repository.patient.PatientDiseaseDao;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.label.SignPatientLabelInfoService;
import com.yihu.wlyy.service.app.team.AdminTeamService;
import com.yihu.wlyy.util.IdCardUtil;
import com.yihu.wlyy.web.BaseController;
@ -31,11 +33,12 @@ import java.util.stream.Collectors;
public class AdminTeamController extends BaseController {
    @Autowired
    private PatientDiseaseDao patientDiseaseDao;
    @Autowired
    private AdminTeamService teamService;
    @Autowired
    private AdminTeamService memberService;
    @Autowired
    private SignPatientLabelInfoService signPatientLabelInfoService;
    @RequestMapping(value = "/count", method = RequestMethod.GET)
    @ApiOperation(value = "团队数量")
@ -277,8 +280,9 @@ public class AdminTeamController extends BaseController {
                simplified.put("photo", patient.getPhoto());
                simplified.put("age", IdCardUtil.getAgeForIdcard(patient.getIdcard()));
                List<PatientDisease> diseases = patientDiseaseDao.findByPatient(patient.getCode());
                List<String> simplifiedDisease = diseases.stream().map(PatientDisease::getDiseaseName).collect(Collectors.toList());
                List<SignPatientLabelInfo>  diseases = signPatientLabelInfoService.getPatientLabelByLabelType(patient.getCode(),"3");
                List<String> simplifiedDisease = diseases.stream().map(SignPatientLabelInfo::getLabelName).collect(Collectors.toList());
                simplified.put("disease", simplifiedDisease);