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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/concern/ConcernDao.java

@@ -1,6 +1,7 @@
package com.yihu.wlyy.repository.concern;
import com.yihu.wlyy.entity.concern.ConcernDO;
import com.yihu.wlyy.entity.concern.ConcernDo;
import com.yihu.wlyy.entity.concern.ConcernDo;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.patient.Patient;
import io.vavr.collection.List;
@@ -13,12 +14,12 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * Created by Administrator on 2018/4/4 0004.
 */
public interface ConcernDao extends
        PagingAndSortingRepository<ConcernDO, Long>,
        JpaSpecificationExecutor<ConcernDO> {
        PagingAndSortingRepository<ConcernDo, Long>,
        JpaSpecificationExecutor<ConcernDo> {
    @Query(" from  ConcernDO where code=?1 ")
    ConcernDO findByCode(String concernCode);
    ConcernDo findByCode(String concernCode);
    /**
     * 目前是1个团队一个医生的 所以先这么做
@@ -26,7 +27,7 @@ public interface ConcernDao extends
     * @param patientCode
     * @return
     */
    @Query("select d from  ConcernDO c,Doctor d where c.concernDoctorCode=d.code and  c.status=1  and  c.patient=?1  ")
    @Query("select d from  ConcernDo c,Doctor d where c.concernDoctorCode=d.code and  c.status=1  and  c.patient=?1  ")
    List<Doctor> listDoctorsByPatientCode(String patientCode);
    /**
@@ -35,9 +36,9 @@ public interface ConcernDao extends
     * @param doctorCode
     * @return
     */
    @Query("select p from  ConcernDO c,Patient p where c.patient=p.code and  c.status=1  and  c.concernDoctorCode=?1")
    @Query("select p from  ConcernDo c,Patient p where c.patient=p.code and  c.status=1  and  c.concernDoctorCode=?1")
    List<Patient> listPatientsByDoctorCode(String doctorCode);
    @Query(" from  ConcernDO c where  c.status=1  and  c.patient=?1  and  c.concernDoctorCode=?2")
    ConcernDO findByPatientAndDoctor(String patientCode, String doctorCode);
    @Query(" from  ConcernDo c where  c.status=1  and  c.patient=?1  and  c.concernDoctorCode=?2")
    ConcernDo findByPatientAndDoctor(String patientCode, String doctorCode);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/concern/ConcernService.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.service.app.concern;
import com.yihu.wlyy.entity.concern.ConcernDO;
import com.yihu.wlyy.entity.concern.ConcernDo;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorTeam;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorTeamMember;
@@ -52,7 +52,7 @@ public class ConcernService extends BaseService {
        Doctor doctor = doctorDao.findByCode(doctorCode);
        //新增关注
        ConcernDO concern = new ConcernDO();
        ConcernDo concern = new ConcernDo();
        //新增关注的服务团队
        //建立团队
        DoctorTeam doctorTeam = new DoctorTeam();
@@ -100,7 +100,7 @@ public class ConcernService extends BaseService {
     */
    @Transactional
    public boolean deleteConcern(String concernCode) {
        ConcernDO concern = concernDao.findByCode(concernCode);
        ConcernDo concern = concernDao.findByCode(concernCode);
        //删除关注
        concern.setStatus(-1);
        //删除团队
@@ -119,7 +119,7 @@ public class ConcernService extends BaseService {
     */
    @Transactional
    public void deleteConcern(String patientCode, String doctorCode) {
        ConcernDO concern = concernDao.findByPatientAndDoctor(patientCode, doctorCode);
        ConcernDo concern = concernDao.findByPatientAndDoctor(patientCode, doctorCode);
        //删除关注
        concern.setStatus(-1);
        //删除团队