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

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

@@ -427,7 +427,7 @@ public class WechatController extends WeixinBaseController {
                //判断d登录密码是否正确
                if (loginPassword.equals(p.getPassword())) {
                    // 绑定用户手机号和openid
                    if (!StringUtils.equals(p.getOpenid(), openid)) {
                    if (!StringUtils.equals(p.getOpenid(), openid)&&!"undefined".equals(openid)) {//undefined不更新数据库
                        //patient.setOpenid(openid);
                        patientService.updatePatient(p, openid);
                    }

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

@@ -1169,11 +1169,16 @@ public class DoctorPatientGroupController extends BaseController {
//                //健管查询
//                doctors = drHealthTeamService.findTeamDoctorsByPatient(patient);
//            }
            Map<String,String> map = new HashMap<>();
            if (doctors != null && doctors.size() > 0) {
                for (Doctor doctor : doctors) {
                    if (doctor == null) {
                        continue;
                    }
                    if(map.containsKey(doctor.getCode())){//去重
                        continue;
                    }
                    map.put(doctor.getCode(),doctor.getCode());
                    JSONObject json = new JSONObject();
                    json.put("code", doctor.getCode());
                    json.put("name", doctor.getName());
@@ -1208,6 +1213,10 @@ public class DoctorPatientGroupController extends BaseController {
                    if (doctor == null) {
                        continue;
                    }
                    if(map.containsKey(doctor.getCode())){
                        continue;
                    }
                    map.put(doctor.getCode(),doctor.getCode());
                    JSONObject json = new JSONObject();
                    json.put("code", doctor.getCode());
                    json.put("name", doctor.getName());