签约管理相关修改

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

@@ -77,7 +77,7 @@ public interface DoctorAdminTeamDao extends
     * @return
     */
    @Query("SELECT t.id, t.name, t.leaderCode, f.doctor, f.doctorName, f.doctorHealth, f.doctorHealthName " +
            "FROM SignFamily f, AdminTeam t WHERE f.patient = :patientCode AND f.status in (-3, 1) AND " +
            "FROM SignFamily f, AdminTeam t WHERE f.patient = :patientCode AND f.status in (-4, 1) AND " +
            "t.id=f.adminTeamId AND t.available = true ORDER BY f.czrq DESC")
    List<Object> findAdminTeamByPatientSignTeam(@Param("patientCode") String patientCode, Pageable pageable);

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

@@ -996,22 +996,21 @@ public class FamilyContractService extends BaseService {
            json.put("date", DateUtil.dateToStrShort(sf.getBegin()));
            json.put("content", content);
            json.put("remark", ""); //您好，您成功签约家庭医生
            if(StringUtils.isNotBlank(sf.getOpenid())){
                // 添加到发送队列
                PushMsgTask.getInstance().putWxMsg(access_token, 1, sf.getOpenid(), sf.getName(), json);
            }else{
                JSONObject j = weiXinOpenIdUtils.getFamilyOpenId(patient.getCode());
                Patient member = (Patient)j.get("member");
                if(StringUtils.isNotBlank(member.getOpenid())){
                    String first = (String)json.get("first");
                    json.remove("first");
                    json.put("first",weiXinOpenIdUtils.getTitleMes(patient,j.getInt("relation"),member.getName()));
                    PushMsgTask.getInstance().putWxMsg(access_token, 1, member.getOpenid(), member.getName(), json);
                if(j!=null){
                    Patient member = (Patient)j.get("member");
                    if(StringUtils.isNotBlank(member.getOpenid())){
                        String first = (String)json.get("first");
                        json.remove("first");
                        json.put("first",weiXinOpenIdUtils.getTitleMes(patient,j.getInt("relation"),member.getName()));
                        PushMsgTask.getInstance().putWxMsg(access_token, 1, member.getOpenid(), member.getName(), json);
                    }
                }
            }
            new Thread(new SignUploadTask(sf.getCode())).start();
            JSONObject participants = new JSONObject();
            participants.put(sf.getPatient(),0);
@@ -2470,12 +2469,7 @@ public class FamilyContractService extends BaseService {
        JSONObject result = new JSONObject();
        Map<String, JSONObject> docMap = new HashMap<>();
        SignFamily ssSign = signFamilyDao.findSignByPatient(patient, 1);
        SignFamily jtSign = null;
        if(checkPatient(patient)!=null){
            jtSign = signFamilyDao.findSignByPatient(patient, 2);
        }else{
            jtSign = signFamilyDao.findByTeamCode(infos[1]);
        }
        SignFamily jtSign = signFamilyDao.findByTeamCode(infos[1]);
        if (ssSign != null) {
            DoctorTeamMember member = doctorTeamDoctor.findSanshiByTeamAndType(ssSign.getTeamCode(), 1);
            if (member != null) {
@@ -2527,7 +2521,6 @@ public class FamilyContractService extends BaseService {
                }
            }
        }
        if (docMap.size() > 0) {
            result.put("teamDoctors", new JSONArray(docMap.values()));
        } else {
@@ -2538,6 +2531,39 @@ public class FamilyContractService extends BaseService {
    }
    public JSONObject getPatientSignDoctorsByTeam(String sessionId) {
        String infos[] =sessionId.split("_");
        JSONObject result = new JSONObject();
        Map<String, JSONObject> docMap = new HashMap<>();
        SignFamily ssSign = signFamilyDao.findSignByPatient(infos[0], 1);
        SignFamily jtSign = signFamilyDao.findByTeamCode(infos[1]);
        JSONObject ssArray = new JSONObject();
        JSONObject jtArray = new JSONObject();
        if (ssSign != null) {
            JSONObject qkDoc = new JSONObject();
            qkDoc.put("doctor", ssSign.getDoctor());
            qkDoc.put("doctorName", ssSign.getDoctorName());
            ssArray.put("doctor", qkDoc);
            JSONObject jgDoc = new JSONObject();
            jgDoc.put("doctor", ssSign.getDoctorHealth());
            jgDoc.put("doctorName", ssSign.getDoctorHealthName());
            ssArray.put("doctorHealth", jgDoc);
        }
        if (jtSign != null) {
            JSONObject qkDoc = new JSONObject();
            qkDoc.put("doctor", jtSign.getDoctor());
            qkDoc.put("doctorName", jtSign.getDoctorName());
            jtArray.put("doctor", qkDoc);
            JSONObject jgDoc = new JSONObject();
            jgDoc.put("doctor", jtSign.getDoctorHealth());
            jgDoc.put("doctorName", jtSign.getDoctorHealthName());
            jtArray.put("doctorHealth", jgDoc);
        }
        result.put("ssSign", ssArray);
        result.put("jtSign", jtArray);
        return result;
    }
    /**
     * 查询患者对应医生

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

@@ -95,8 +95,6 @@ public class AdminTeamService extends BaseService {
    public Map<String, Object> getPatientSigningTeam(String patientCode, String currentDoctor) {
        List<Object> results = teamDao.findAdminTeamByPatientSignTeam(patientCode, new PageRequest(0, 1));
        if (results == null || results.size() == 0) return null;
        Object[] result = (Object[]) results.get(0);
        Map<String, Object> team = new HashMap<>();
        team.put("teamId", result[0]);

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

@@ -1113,6 +1113,24 @@ public class DoctorFamilyContractController extends WeixinBaseController {
        }
    }
    /**
     * 查询患者签约医生
     *
     * @param sessionId 会话ID
     * @return
     */
    @RequestMapping(value = "/patient_team_doctors", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getPatientSignDoctorsByTeam(String sessionId) {
        try {
            JSONObject result = familyContractService.getPatientSignDoctorsByTeam(sessionId);
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");
        }
    }
    @RequestMapping(value = "/patient_doctor_teams", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    @ApiOperation(value = "查询医生与居民的团队")

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -502,6 +502,7 @@ public class PatientController extends WeixinBaseController {
            Map<String, String> teamDoctors = new HashMap<>();
            Map<String, String> familyDoctors = new HashMap<>();
            String id = getUID();
            JSONObject json = new JSONObject();
            //查询家庭签约
            SignFamily jt = familyContractService.findByPatientYes(id);
            if (jt != null) {
@@ -514,6 +515,7 @@ public class PatientController extends WeixinBaseController {
                        familyDoctors.put(doctor.getCode(), doctor.getName());
                    }
                }
                json.put("teamCode_"+2,jt.getTeamCode());
            }
            // 查询三师医生
            SignFamily ss = familyContractService.findBySanshiPatientYes(id);
@@ -527,6 +529,7 @@ public class PatientController extends WeixinBaseController {
                        teamDoctors.put(doctor.getCode(), doctor.getName());
                    }
                }
                json.put("teamCode_"+1,ss.getTeamCode());
            }
            // 未签约
            int sign = 0;
@@ -540,7 +543,7 @@ public class PatientController extends WeixinBaseController {
                // 三师签约
                sign = 1;
            }
            JSONObject json = new JSONObject();
            json.put("status", 200);
            json.put("msg", "获取签约状态成功！");
            json.put("data", sign);