1.对接ca登录认证,实现使用CA电子签名完成登录认证

2.归档病历召回时增加弹框提醒(“提醒患方及第三方已申请使用过病历”)
3.锁定状态病历,常用查询页面无法借阅,申请列表借阅后无法直接查看
master
51976 3 years ago
parent 5ea74f08ce
commit 4feeef310f

@ -1,6 +1,7 @@
package com.manage.controller;
import com.alibaba.fastjson.JSONObject;
import com.manage.encrypt.Base64;
import com.manage.encrypt.MD5;
import com.manage.entity.Power_Dept;
@ -17,6 +18,13 @@ import com.manage.vo.User_Dept_Menu;
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
import org.apache.http.HttpEntity;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@ -27,6 +35,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
/**
@ -88,6 +97,106 @@ public class methodForEmrMedical {
}
}
// @RequestMapping(value = "getErweima")
// @ResponseBody
// public JSONObject getErweima(String responseType, String clientId, HttpServletRequest request){
// // 获得Http客户端
// CloseableHttpClient httpClient = HttpClientBuilder.create().build();
// // 创建Get请求
// HttpGet httpGet = new HttpGet("https://test.51trust.com/gateway/oauth/authorize?responseType=code&clientId=2017070411003376");
// // 请求头
// httpGet.setHeader("Content-Type", "application/json;charset=utf8");
// // 响应模型
// CloseableHttpResponse response = null;
// HttpEntity responseEntity=null;
// JSONObject jsonObject = null;
// try {
// // 由客户端执行(发送)Get请求
// response = httpClient.execute(httpGet);
// // 从响应模型中获取响应实体
// responseEntity = response.getEntity();
// System.out.println("responseEntity::::"+responseEntity);
// System.out.println("响应状态为:" + response.getStatusLine());
// if (responseEntity != null) {
// jsonObject = JSONObject.parseObject(EntityUtils.toString(responseEntity));
// String contents = jsonObject.getString("contents");
// JSONObject contentsObject = JSONObject.parseObject(contents);
// String userToken = contentsObject.getString("userToken");
// String verifyStatus = contentsObject.getString("verifyStatus");
//
// }
// } catch (ClientProtocolException e) {
// e.printStackTrace();
// } catch (IOException e) {
// e.printStackTrace();
// } finally {
// try {
// // 释放资源
// if (httpClient != null) {
// httpClient.close();
// }
// if (response != null) {
// response.close();
// }
// } catch (IOException e) {
// e.printStackTrace();
// }
// return jsonObject;
// }
//
// //return jsonObject;
// }
//
// @RequestMapping(value = "getUser")
// @ResponseBody
// public JSONObject getUser(String requestId, HttpServletRequest request){
// // 获得Http客户端
// CloseableHttpClient httpClient = HttpClientBuilder.create().build();
// // 创建Get请求
// HttpGet httpGet = new HttpGet("https://test.51trust.com/gateway/oauth/tokeninfo?clientId=2017070411003376&requestId=" + requestId);
// // 请求头
// httpGet.setHeader("Content-Type", "application/json;charset=utf8");
// // 响应模型
// CloseableHttpResponse response = null;
// HttpEntity responseEntity=null;
// JSONObject jsonObject = null;
// try {
// // 由客户端执行(发送)Get请求
// response = httpClient.execute(httpGet);
// // 从响应模型中获取响应实体
// responseEntity = response.getEntity();
// System.out.println("responseEntity::::"+responseEntity);
// System.out.println("响应状态为:" + response.getStatusLine());
// if (responseEntity != null) {
// jsonObject = JSONObject.parseObject(EntityUtils.toString(responseEntity));
// String contents = jsonObject.getString("contents");
// JSONObject contentsObject = JSONObject.parseObject(contents);
// String userToken = contentsObject.getString("userToken");
// String verifyStatus = contentsObject.getString("verifyStatus");
//
// }
// } catch (ClientProtocolException e) {
// e.printStackTrace();
// } catch (IOException e) {
// e.printStackTrace();
// } finally {
// try {
// // 释放资源
// if (httpClient != null) {
// httpClient.close();
// }
// if (response != null) {
// response.close();
// }
// } catch (IOException e) {
// e.printStackTrace();
// }
// return jsonObject;
// }
//
// //return jsonObject;
// }
/*
*

@ -50,8 +50,11 @@
</div>
</div>
<div class="content_login left">
<form method="post" action="${path}/login">
<div class="login_div" style="background:url('${path}/static/img/login/登录框.png') no-repeat">
<form method="post" action="${path}/login" id="fid">
<div class="inputDiv" id="erweimadiv" hidden="hidden">
<img id="erweima" src=""/>
</div>
<div id="zhdl" class="login_div" style="background:url('${path}/static/img/login/登录框.png') no-repeat">
<div class="login_title">
<h3 style="text-align: center">账号登录</h3>
</div>
@ -63,6 +66,7 @@
</div>
<div class="inputDiv">
<label><input type="checkbox" name="rememberMe" id="rememberMe" value="yes" style="vertical-align:middle; margin-top:0;" <%=checked%>>记住密码</label>
<%-- <a href="#" id="smdl" style="float: right; margin-right: 10px">扫码登录</a>--%>
</div>
<%--<a href="#" id="forgetPwd" style="float: right;">忘记密码了?</a>--%>
<div class="inputDiv">

@ -29,6 +29,43 @@ $(function(){
alert("请联系管理员进行修改密码!");
});
// $("#smdl").on("click", function (){
// $.ajax({
// type: "post",
// url : "methodForEmrMedical/getErweima",
// data: {responseType:"code", clientId:"2017070411003376"},
// success : function(data) {
// $.each(data,function (index, obj){
// //获取二维码
// var imgBase64 = obj.imgBase64;
// var zhdl = document.getElementById("zhdl");
// var erweima = document.getElementById("erweima");
// var erweimadiv = document.getElementById("erweimadiv");
// //给img标签src属性赋值
// erweima.setAttribute("src", "data:image/jpg;base64," + imgBase64);
// getUser(obj.requestId);
// erweimadiv.style.display = "block";
// zhdl.style.display = "none";
// return false;
// });
// },
// })
// });
//
// function getUser(requestId) {
// $.ajax({
// type: "post",
// url : "methodForEmrMedical/getUser",
// data: {requestId: requestId },
// success : function(data) {
// $.each(data,function (index, obj){
//
// return false;
// });
// },
// })
// }
});

@ -41,7 +41,7 @@ $(function() {
reg = /^(?![\d]+$)(?![a-z]+$)(?![A-Z]+$)(?![!#$@%^&*()\[{}\]:;'",<.>/ ]+$)[\da-zA-z!#$%@^&*()\[{}\]:;'",<.>/ ]{8,}$/;
var mm = $("#newUserPwd").val();
if (!reg.test($("#newUserPwd").val())) {
toastr.warning("密码格式必须包含数字、字母、特殊符号任意两种组合!")
toastr.warning("密码格式必须包含数字、字母、特殊符号跟空格任意两种组合!")
return false;
}

Loading…
Cancel
Save