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

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

@@ -1961,4 +1961,51 @@ public class FamilyContractService extends BaseService {
        return result;
    }
    /**
     * 查询患者对应医生
     *
     * @param patient
     * @return
     */
    public JSONObject getPatientSignDoctors(String patient) {
        JSONObject result = new JSONObject();
        Map<String, JSONObject> docMap = new HashMap<>();
        SignFamily ssSign = signFamilyDao.findSignByPatient(patient, 1);
        SignFamily jtSign = signFamilyDao.findSignByPatient(patient, 2);
        JSONArray ssArray = new JSONArray();
        JSONArray jtArray = new JSONArray();
        if (ssSign != null) {
            JSONObject qkDoc = new JSONObject();
            qkDoc.put("doctor",ssSign.getDoctor());
            qkDoc.put("doctorName",ssSign.getDoctorName());
            ssArray.put(qkDoc);
            JSONObject jgDoc = new JSONObject();
            jgDoc.put("doctorHealth",ssSign.getDoctorHealth());
            jgDoc.put("doctorHealthName",ssSign.getDoctorHealthName());
            ssArray.put(qkDoc);
        }
        if (jtSign != null) {
            JSONObject qkDoc = new JSONObject();
            qkDoc.put("doctor",jtSign.getDoctor());
            qkDoc.put("doctorName",jtSign.getDoctorName());
            jtArray.put(qkDoc);
            JSONObject jgDoc = new JSONObject();
            jgDoc.put("doctorHealth",jtSign.getDoctorHealth());
            jgDoc.put("doctorHealthName",jtSign.getDoctorHealthName());
            jtArray.put(qkDoc);
        }
        result.put("ssSign",ssArray);
        result.put("jtSign",ssArray);
        return result;
    }
}

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

@@ -976,8 +976,8 @@ public class DoctorFamilyContractController extends WeixinBaseController {
    @ResponseBody
    public String getPatientDoctor(@RequestParam String patient) {
        try {
            if(StringUtils.isEmpty(patient)){
                return error(-1,"居民不能为空");
            if (StringUtils.isEmpty(patient)) {
                return error(-1, "居民不能为空");
            }
            JSONObject result = familyContractService.getPatientDoctors(patient, getUID());
            return write(200, "查询成功", "data", result);
@@ -986,4 +986,22 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            return error(-1, "查询失败");
        }
    }
    /**
     * 查询患者签约医生
     *
     * @param patient 患者
     * @return
     */
    @RequestMapping(value = "/patient_sign_doctors", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getPatientSignDoctors(String patient) {
        try {
            JSONObject result = familyContractService.getPatientSignDoctors(patient);
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");
        }
    }
}