|
@ -501,10 +501,12 @@ public class PatientController extends WeixinBaseController {
|
|
|
try {
|
|
|
Map<String, String> teamDoctors = new HashMap<>();
|
|
|
Map<String, String> familyDoctors = new HashMap<>();
|
|
|
Map<String,String> signDoctors = new HashMap<>();
|
|
|
String id = getUID();
|
|
|
JSONObject json = new JSONObject();
|
|
|
//查询家庭签约
|
|
|
SignFamily jt = familyContractService.findByPatientYes(id);
|
|
|
|
|
|
if (jt != null) {
|
|
|
List<Doctor> doctors = doctorTeamService.findJiatingTeamDoctors(id);
|
|
|
if (doctors != null) {
|
|
@ -517,6 +519,11 @@ public class PatientController extends WeixinBaseController {
|
|
|
}
|
|
|
json.put("teamCode_"+2,jt.getTeamCode());
|
|
|
json.put("signCode_"+2,jt.getCode());
|
|
|
signDoctors.put(jt.getDoctor(), jt.getDoctorName());
|
|
|
if(StringUtils.isNotBlank(jt.getDoctorHealth())&&StringUtils.isNotBlank(jt.getDoctorHealthName())){
|
|
|
signDoctors.put(jt.getDoctorHealth(), jt.getDoctorHealthName());
|
|
|
}
|
|
|
|
|
|
}
|
|
|
// 查询三师医生
|
|
|
SignFamily ss = familyContractService.findBySanshiPatientYes(id);
|
|
@ -550,7 +557,8 @@ public class PatientController extends WeixinBaseController {
|
|
|
json.put("msg", "获取签约状态成功!");
|
|
|
json.put("data", sign);
|
|
|
json.put("teamDoctors", teamDoctors.size() > 0 ? new JSONArray(teamDoctors.values()) : new JSONArray());
|
|
|
json.put("familyDoctors", familyDoctors.size() > 0 ? new JSONArray(familyDoctors.values()) : new JSONArray());
|
|
|
//json.put("familyDoctors", familyDoctors.size() > 0 ? new JSONArray(familyDoctors.values()) : new JSONArray());
|
|
|
json.put("familyDoctors",signDoctors.size()>0? new JSONArray(signDoctors.values()) : new JSONArray());
|
|
|
return json.toString();
|
|
|
} catch (Exception e) {
|
|
|
error(e);
|