Merge branch 'dev-1.3.7' of http://192.168.1.220:10080/Amoy/patient-co-management into dev-1.3.7

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/util/RSAUtils.java

@@ -376,4 +376,8 @@ public class RSAUtils {
            e.printStackTrace();
        }
    }
    public void setBaseService(BaseService baseService) {
        this.baseService = baseService;
    }
}

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/web/common/account/LoginController.java

@@ -312,7 +312,8 @@ public class LoginController extends BaseController {
            if (type == 2) {
                // 医生端
                Doctor doctor = doctorService.findDoctorByMobile(mobile);
                String password = RSAUtils.getInstance(doctorService).decryptString(newpwd);
                rsaUtils.setBaseService(doctorService);
                String password = rsaUtils.decryptString(newpwd);
                password = StringUtils.reverse(password);
                password = MD5.GetMD5Code(password + doctor.getSalt());
                doctor.setPassword(password);

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

@@ -321,7 +321,8 @@ public class LoginController extends BaseController {
                if (patientTemp == null) {
                    return error(-1, "操作失败：此用户未注册");
                } else {
                    String password = RSAUtils.getInstance(doctorService).decryptString(newpwd);
                    rsaUtils.setBaseService(doctorService);
                    String password = rsaUtils.decryptString(newpwd);
                    password = StringUtils.reverse(password);
                    password = MD5.GetMD5Code(password + patientTemp.getSalt());
                    patientTemp.setPassword(password);

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

@@ -475,11 +475,11 @@ public class DoctorController extends BaseController {
            int page,
            int pagesize) {
        try {
            JSONArray array = new JSONArray();
            com.alibaba.fastjson.JSONArray array = new com.alibaba.fastjson.JSONArray();
            List<Doctor> list = doctorInfoService.findFamousDoctorList(key, type, page, pagesize, level);
            if (list != null) {
                for (Doctor doctor : list) {
                    JSONObject json = new JSONObject();
                    com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
                    json.put("id", doctor.getId());
                    json.put("code", doctor.getCode());
                    json.put("name", doctor.getName());
@@ -503,7 +503,7 @@ public class DoctorController extends BaseController {
                    json.put("deptName", doctor.getDeptName());
                    json.put("expertise", doctor.getExpertise());
                    json.put("isworking", 1);
                    array.put(json);
                    array.add(json);
                }
            }
            return write(200, "获取名医列表成功！", "list", array);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/controller/GcLoginController.java

@@ -63,8 +63,9 @@ public class GcLoginController extends WeixinBaseController {
    @ApiOperation("获取公钥")
    public ResultOneModel publicKey() {
        try {
            String modulus = RSAUtils.getInstance(smsService).getModulus();
            String exponent = RSAUtils.getInstance(smsService).getExponent();
            rsaUtils.setBaseService(smsService);
            String modulus = rsaUtils.getModulus();
            String exponent = rsaUtils.getExponent();
            if (StringUtils.isEmpty(modulus) || StringUtils.isEmpty(exponent)) {
                return new ResultOneModel(BaseResultModel.statusEm.login_publickey_error.getCode(), BaseResultModel.statusEm.login_publickey_error.getMessage());
            } else {