Browse Source

修改首页签约总数统计量,如果医生为团队长,签约总数只显示实际有签约关系的数量,如果为全科或健管,显示所有有服务关系的数量

chenweida 7 năm trước cách đây
mục cha
commit
3e268fb7cb

+ 3 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/SignFamilyDao.java

@ -415,4 +415,7 @@ public interface SignFamilyDao extends PagingAndSortingRepository<SignFamily, Lo
    @Query(" select a from SignFamily a where a.patient = ?1 ")
    @Query(" select a from SignFamily a where a.patient = ?1 ")
    SignFamily findPatientExpensesStatus(String patient);
    SignFamily findPatientExpensesStatus(String patient);
    // 查询团队已签约的总数
    @Query("select count(1) from SignFamily a where  a.adminTeamId = ?1 and (a.status = 1 or a.status = 2) and a.type = 2")
    int countAmountSignedByAdminTeam(Long id);
}
}

+ 11 - 4
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@ -1719,7 +1719,14 @@ public class FamilyContractService extends BaseService {
     * @return
     * @return
     */
     */
    public int countAmountSigned(String doctor) {
    public int countAmountSigned(String doctor) {
        return signFamilyDao.countAmountSignedByDoctor(doctor);
        AdminTeam adminTeam = doctorAdminTeamDao.findByLeaderCode(doctor);
        if(adminTeam!=null){
            //团队长只显示实际有签约关系的数量
            return signFamilyDao.countAmountSignedByAdminTeam(adminTeam.getId());
        }else{
            //不是团队长显示所有有服务关系的数量
            return signFamilyDao.countAmountSignedByDoctor(doctor);
        }
    }
    }
    /**
    /**
@ -4051,7 +4058,7 @@ public class FamilyContractService extends BaseService {
                "  a.patient=p.`code` " +
                "  a.patient=p.`code` " +
                " AND a.`status` IN (1, 2) ");
                " AND a.`status` IN (1, 2) ");
        List params = new ArrayList<>();
        List params = new ArrayList<>();
        if (teamCode!=null&&teamCode>0) {
        if (teamCode != null && teamCode > 0) {
            sb.append(" AND a.admin_team_code =?  ");
            sb.append(" AND a.admin_team_code =?  ");
            params.add(teamCode);
            params.add(teamCode);
        }
        }
@ -4064,12 +4071,12 @@ public class FamilyContractService extends BaseService {
        return patients;
        return patients;
    }
    }
    public String getSickArchiveFlag(String patient)throws Exception{
    public String getSickArchiveFlag(String patient) throws Exception {
        Patient p = patientDao.findByCode(patient);
        Patient p = patientDao.findByCode(patient);
        String rs = jwArchivesService.getSickArchiveFlag(p.getIdcard());
        String rs = jwArchivesService.getSickArchiveFlag(p.getIdcard());
        return rs ;
        return rs;
    }
    }
}
}

+ 3 - 3
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@ -576,11 +576,11 @@ public class DoctorController extends BaseController {
                // 二维码地址
                // 二维码地址
                json.put("qrcode", temp.getQrcode());
                json.put("qrcode", temp.getQrcode());
                // 审核总数
                // 审核总数
                json.put("signed_amount", familyContractService.countAmountSigned(getUID()));
                json.put("signed_amount", familyContractService.countAmountSigned(code));
                // 等审核总数
                // 等审核总数
                json.put("unsign_amount", familyContractService.countAmountUnsign(getUID()));
                json.put("unsign_amount", familyContractService.countAmountUnsign(code));
                // 咨询统计
                // 咨询统计
                Map<String, Long> consultCount = consultTeamService.getAllCount(getUID());
                Map<String, Long> consultCount = consultTeamService.getAllCount(code);
                // 咨询总数
                // 咨询总数
                json.put("consultAmount", consultCount.get("all"));
                json.put("consultAmount", consultCount.get("all"));
                // 当天咨询数
                // 当天咨询数