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

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/DoctorPatientDao.java

@@ -33,6 +33,10 @@ public interface DoctorPatientDao extends PagingAndSortingRepository<DoctorPatie
	@Query("select a from Doctor a, DoctorTeamMember b where b.team = ?1 and a.code = b.memberCode and b.type <> 5 and b.del='1'")
	List<Doctor> findTeamDoctors(String team);
	//根据患者查询团队下所有的医生信息
	@Query("select a from Doctor a, DoctorTeamMember b, DoctorTeamMember t2 where b.team = t2.team and t2.memberCode = ?1 and t2.del = '1' and a.code = b.memberCode and b.type <> 5 and b.del='1'")
	List<Doctor> findTeamDoctorsByPatient(String patient);
	// 更新家庭医生与患者关系为无效
	@Modifying
	@Query("update DoctorPatient a set a.status = 0 where a.patient = ?1 and a.teamType = 2")

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/reservation/PatientReservationService.java

@@ -123,6 +123,7 @@ public class PatientReservationService extends BaseService {
    public void patientCancelOrder(Long id,String patient) {
        PatientReservation obj = patientReservationDao.findOne(id);
        if (obj.getStatus()!=0) {
            obj.setStatus(0);
            obj.setCanceler(patient);
            obj.setCancelerName(obj.getName());
            obj.setCancelerType(5);

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/team/DrHealthTeamService.java

@@ -7,7 +7,6 @@ package com.yihu.wlyy.service.app.team;
import com.yihu.wlyy.entity.discussion.WlyyTalkGroupMember;
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.DoctorPatient;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorTeam;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorTeamMember;
@@ -80,6 +79,17 @@ public class DrHealthTeamService extends BaseService {
        return doctorPatientDao.findTeamDoctors(team);
    }
    /**
     * 查询团队医生
     *
     * @param patient
     * @return
     */
    public List<Doctor> findTeamDoctorsByPatient(String patient) {
        return doctorPatientDao.findTeamDoctorsByPatient(patient);
    }
    /**
     * 查询某个医生的团队健康管理师或全科医生
     *

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/DoctorPatientGroupController.java

@@ -1,15 +1,18 @@
package com.yihu.wlyy.web.doctor.patient;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorPatientGroup;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorPatientGroupInfo;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.account.DoctorPatientGroupService;
import com.yihu.wlyy.service.app.account.PatientInfoService;
import com.yihu.wlyy.service.app.team.DrHealthTeamService;
import com.yihu.wlyy.util.CommonUtil;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
@@ -20,16 +23,11 @@ import org.springframework.http.MediaType;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.account.DoctorPatientGroupService;
import com.yihu.wlyy.service.app.account.PatientInfoService;
import com.yihu.wlyy.service.app.team.DrHealthTeamService;
import com.yihu.wlyy.util.CommonUtil;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.BaseController;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
/**
 * 医生端：患者分组管理
@@ -1150,6 +1148,9 @@ public class DoctorPatientGroupController extends BaseController {
            if (signFamily != null) {
                // 查询家庭医生团队
                doctors = drHealthTeamService.findTeamDoctors(signFamily.getTeamCode());
            }else{
                //健管查询
                doctors = drHealthTeamService.findTeamDoctorsByPatient(patient);
            }
            if (doctors != null && doctors.size() > 0) {
                for (Doctor doctor : doctors) {