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

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

@@ -158,4 +158,7 @@ public interface DoctorDao extends PagingAndSortingRepository<Doctor, Long>, Jpa
    @Modifying
    @Query("update Doctor set checkPassword = ?2 ,checkSalt = ?3  where code = ?1")
    int updateCheckPassword(String code, String checkPassword, String checkSalt);
    @Query("select count(1) from Doctor where code=?1 and certificateNum=?2 ")
    Integer checkCertificate(String doctorCode,String certificateNum);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -1408,6 +1408,15 @@ public class DoctorInfoService extends BaseService {
        return false;
    }
    /**
     * 请求 实名软证书并进行数字签名
     * @param strUserIdcardNum
     * @param strRealNameSoftCertCalledPasswd
     * @param strOriginalData
     * @param srcBusinessStreamNO
     * @return
     * @throws Exception
     */
    public boolean requestRealNameSoftCertAndSign(String strUserIdcardNum,String strRealNameSoftCertCalledPasswd,String strOriginalData, String srcBusinessStreamNO) throws Exception{
        String url = jwUrl+"/third/prescription/RequestRealNameSoftCertAndSign";
@@ -1474,8 +1483,14 @@ public class DoctorInfoService extends BaseService {
        return false;
    }
//    //判断线上是否已经认证过（即是否设置过密码）
//    public boolean  iscertifiedAuthentication(S){
//
//    }
    //校验医师输入的CA证书是否正确
    public boolean  checkCertificate(String doctorCode,String certificateNum){
        List<NameValuePair> params = new ArrayList<>();
        String response = HttpClientUtil.post("http://120.77.209.211:5000/yueren/phonekey", params, "UTF-8");
        int count = doctorDao.checkCertificate(doctorCode,certificateNum);
        if(count>0){
            return true;
        }
        return false;
    }
}

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

@@ -1925,5 +1925,23 @@ public class DoctorController extends BaseController {
            return error(-1, "认证失败！");
        }
    }
    /**
     * 校验医师输入的CA证书是否正确
     * @return
     */
    @ObserverRequired
    @ResponseBody
    @RequestMapping(value = "/checkCertificate", method = RequestMethod.GET)
    public String checkCertificate(@RequestParam(value = "certificateNum",required = true) String certificateNum){
        try {
            boolean b = doctorInfoService.checkCertificate(getRepUID(),certificateNum);
            return write(200, "获取信息成功！", "data", b);
        }catch (Exception e) {
            error(e);
            return error(-1, "获取信息失败！");
        }
    }
}