diff --git a/src/main/java/com/emr/controller/LogAopAction.java b/src/main/java/com/emr/controller/LogAopAction.java
index 1163733..01bbb90 100644
--- a/src/main/java/com/emr/controller/LogAopAction.java
+++ b/src/main/java/com/emr/controller/LogAopAction.java
@@ -17,6 +17,7 @@ import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.core.DefaultParameterNameDiscoverer;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -65,9 +66,16 @@ public class LogAopAction {
ExceptionPrintUtil.printException(e1);
e1.printStackTrace();
}
+ //针对常用查询页面查看预览时 获取病案号
+ String patientId = request.getParameter("patientId");
if (null != method) {
//插入表操作
- insertLog(method,pjp);
+ if(ObjectUtils.isEmpty(patientId)){
+ insertLog(method,pjp);
+ }else{
+ insertLog(method,pjp,patientId);
+ }
+
}
object = pjp.proceed();
@@ -184,4 +192,28 @@ public class LogAopAction {
}
}
}
+
+ private void insertLog(Method method,ProceedingJoinPoint pjp, String patientId) {
+ //日志实体对象
+ Emr_Log logBo = new Emr_Log();
+ // 获取方法（此为自定义注解）
+ OptionalLog op = method.getAnnotation(OptionalLog.class);
+ String module = op.module();
+ // 拦截的方法参数
+ //判断操作类型
+ if (StringUtils.isNoneBlank(module)) {
+ try {
+ // 获取注解的modules 设为操作模块
+ logBo.setLogTitle(module);
+ // 获取注解的methods 设为执行方法
+ logBo.setLogContent(op.methods());
+ logBo.setRemark(patientId);
+ // 添加到数据库
+ logService.insert(logBo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException();
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
index 0a21a5c..66f297b 100644
--- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
+++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
@@ -275,6 +275,7 @@ public class CommomSearchController {
* @UpdateRemark: 更新说明
* @Version: 1.0
*/
+ @OptionalLog(module = "病案浏览",methods = "常用查询页面")
@RequestMapping("showRecord174")
public String showRecord174(String patientId, String dataSource, Model model, HttpServletRequest request) {
model.addAttribute("patientId", patientId);
diff --git a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
index 7f13ea5..ecbef32 100644
--- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
+++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
@@ -968,7 +968,7 @@ public class TemplateSearchController {
private String getSql(String selectSql, String fromTableSql, String whereSql, String orderBys, Power_User user) {
String userName = user.getUserName();
- String initSelectSql = "select commomtable.patient_id,commomtable.data_source,CASE WHEN emr_apply_approve.id is null THEN 0 ELSE 1 END isShowDetail,CASE WHEN emr_apply_approve1.id IS NULL THEN 0 ELSE 1 END isDownload,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus";
+ String initSelectSql = "select commomtable.patient_id,CASE WHEN emr_apply_approve.id is null THEN 0 ELSE 1 END isShowDetail,CASE WHEN emr_apply_approve1.id IS NULL THEN 0 ELSE 1 END isDownload,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus";
if(StringUtils.isNotBlank(selectSql)){
initSelectSql += "," + selectSql;
}
diff --git a/src/main/java/com/emr/vo/commomSearch/CommomVo.java b/src/main/java/com/emr/vo/commomSearch/CommomVo.java
index 5c25827..262468e 100644
--- a/src/main/java/com/emr/vo/commomSearch/CommomVo.java
+++ b/src/main/java/com/emr/vo/commomSearch/CommomVo.java
@@ -460,8 +460,39 @@ public class CommomVo {
private String fileType;
private String subjectNo;
+
+ private String hemodialysisId;
+
+ private String hemodialysisDate;
+
+ private String radiotherapyNo;
+
private String dataSource;
+
+ public String getRadiotherapyNo() {
+ return radiotherapyNo;
+ }
+
+ public void setRadiotherapyNo(String radiotherapyNo) {
+ this.radiotherapyNo = radiotherapyNo;
+ }
+ public String getHemodialysisId() {
+ return hemodialysisId;
+ }
+
+ public void setHemodialysisId(String hemodialysisId) {
+ this.hemodialysisId = hemodialysisId;
+ }
+
+ public String getHemodialysisDate() {
+ return hemodialysisDate;
+ }
+
+ public void setHemodialysisDate(String hemodialysisDate) {
+ this.hemodialysisDate = hemodialysisDate;
+ }
+
public String getProNo() {
return proNo;
}
diff --git a/src/main/resources/mapper/CommomMapper.xml b/src/main/resources/mapper/CommomMapper.xml
index a745043..ea39e8c 100644
--- a/src/main/resources/mapper/CommomMapper.xml
+++ b/src/main/resources/mapper/CommomMapper.xml
@@ -654,6 +654,15 @@
applicant = #{applicant},
+
+ hemodialysis_id = #{hemodialysisId},
+
+
+ hemodialysis_date = #{hemodialysisDate},
+
+
+ radiotherapy_no = #{radiotherapyNo},
+
where patient_id = #{patientId,jdbcType=VARCHAR}
diff --git a/src/main/webapp/WEB-INF/jspf/common.jspf b/src/main/webapp/WEB-INF/jspf/common.jspf
index f9a930a..29a798d 100644
--- a/src/main/webapp/WEB-INF/jspf/common.jspf
+++ b/src/main/webapp/WEB-INF/jspf/common.jspf
@@ -32,6 +32,8 @@
+
+
diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
index e13645c..556e438 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
@@ -778,6 +778,61 @@
+
+
+
+
+
+
@@ -1066,6 +1121,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
index 2965308..f1448e6 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
@@ -24,6 +24,8 @@ function initDatePicker() {
initDateInput(3);
}else if(dataSource == '2'){
initDateInput(4);
+ }else if(dataSource == '4'){
+ initDateInput(5);
}else{
initDateInput(1);
initDateInput(2);
@@ -66,7 +68,21 @@ function initQueryCondition(){
$("#proNoDiv,#proNameDiv,#applicantDiv,#fileTypeDiv,#subjectNoDiv").css('display','');
$("#proNoEditDiv,#proNameEditDiv,#applicantEditDiv").css('display','');;
- } else{
+ } else if(dataSource == '4'){
+ //血透
+ $(".col-sm-4.hideDiv").css('display','none');//查询条件框
+ $(".form-group.hideDiv").css('display','none');//修改信息框
+
+ $("#nameDiv,#idCardDiv,#hemodialysisIdDiv,#hemodialysisDateDiv").css('display','');
+ $("#nameEditDiv,#hemodialysisIdEditDiv,#hemodialysisDateEditDiv").css('display','');
+ } else if(dataSource == '5'){
+ //放疗
+ $(".col-sm-4.hideDiv").css('display','none');//查询条件框
+ $(".form-group.hideDiv").css('display','none');//修改信息框
+
+ $("#nameDiv,#radiotherapyNoDiv").css('display','');
+ $("#nameEditDiv,#radiotherapyNoEditDiv").css('display','');
+ }else{
$(".col-sm-4.hideDiv").css('display','none');//查询条件框
$(".form-group.hideDiv").css('display','none');//修改信息框
@@ -692,6 +708,30 @@ function getSql() {
whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
}
+ /** 血透查询条件 **/
+ //身份证号码
+ if(!isEmpty($("#id_card").val())){
+ name = 'id_card';
+ whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
+ }
+ //血透id
+ if(!isEmpty($("#hemodialysis_id").val())){
+ name = 'hemodialysis_id';
+ whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
+ }
+ //血透时间
+ if (!isEmpty($("#startTime5").val()) && !isEmpty($("#endTime5").val())) {
+ name = 'hemodialysis_date';
+ whereNames += commomtable + "." + name + " BETWEEN '" + $("#startTime5").val() + " 00:00:00' AND '" + $("#endTime5").val() + " 23:59:59' AND ";
+ }
+
+ /** 放疗查询条件 **/
+ //放疗号
+ if(!isEmpty($("#radiotherapy_no").val())){
+ name = 'radiotherapy_no';
+ whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND ";
+ }
+
if (whereNames != ' where ') {
whereNames = whereNames.substring(0, whereNames.length - 4);
$("#whereSql").val(whereNames);
@@ -710,6 +750,8 @@ function search() {
var endTime3 = $("#endTime3").val();
var startTime4 = $("#startTime4").val();
var endTime4 = $("#endTime4").val();
+ var startTime5 = $("#startTime5").val();
+ var endTime5 = $("#endTime5").val();
var age1 = $("#age1").val();
var age2 = $("#age2").val();
var diag_code1 = $("#diag_code1").val();
@@ -738,6 +780,10 @@ function search() {
toastr.warning("请输入完整的就诊日期时间段!");
return false;
}
+ if ((startTime5 != '' && endTime5 == '') || (startTime5 == '' && endTime5 != '')) {
+ toastr.warning("请输入完整的血透日期时间段!");
+ return false;
+ }
if ((diag_code1 != '' && diag_code2 == '') || (diag_code1 == '' && diag_code2 != '')) {
toastr.warning("请输入完整的主诊编码范围!");
return false;
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
index c72b820..ae0048d 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
@@ -52,6 +52,20 @@ function loadHtml(){
$("#proNoDiv,#proNameDiv,#subjectNoDiv").css("display","");
$("#proNoCollDiv,#proNameCollDiv").css("display","");
+ }else if(dataSource == '4'){
+ //血透
+ $(".inputDiv").css("display","none");//预览基本信息
+ $(".row.collectDiv").css("display","none");//收藏基本信息
+
+ $("#nameDiv,#hemodialysisIdDiv,#hemodialysisDateDiv").css("display","");
+ $("#hemodialysisIdCollDiv,#hemodialysisDateCollDiv").css("display","");
+ }else if(dataSource == '5'){
+ //放疗
+ $(".inputDiv").css("display","none");//预览基本信息
+ $(".row.collectDiv").css("display","none");//收藏基本信息
+
+ $("#nameDiv,#radiotherapyNoDiv").css("display","");
+ $("#nameCollDiv,#radiotherapyNoCollDiv").css("display","");
}else{
$(".inputDiv").css("display","none");//预览基本信息
$(".row.collectDiv").css("display","none");//收藏基本信息
@@ -89,7 +103,9 @@ function loadRecord(){
$("#proNo,#proNoColl").val(data.proNo);
$("#proName,#proNameColl").val(data.proName);
$("#subjectNo").val(data.subjectNo);
-
+ $("#hemodialysisId,#hemodialysisIdColl").val(data.hemodialysisId);
+ $("#hemodialysisDate,#hemodialysisDateColl").val(data.hemodialysisDate);
+ $("#radiotherapyNo,#radiotherapyNoColl").val(data.radiotherapyNo);
var delCount = data.delCount;
//不为空，有已删除的图片，显示恢复图片按钮
diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
index 298c6d4..dfc1fca 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
@@ -13,7 +13,7 @@ function returnShowDetailUrl(patientId,fileSource,name,disDate,dataSource){
}
}
//TODO 添加需要格式化日期格式的字段
-var dateFields = 'disDate,admissDate,birthday,affirmDate';
+var dateFields = 'disDate,admissDate,birthday,affirmDate,operationTime,visitTime,hemodialysisDate';
var pageNumber = 1;
$(function(){
//根据窗口调整表格高度
@@ -517,6 +517,9 @@ function getUpdateCommomInfo(patientId) {
$("#proNo").val(data.proNo);
$("#proName").val(data.proName);
$("#updateApplicant").val(data.applicant);
+ $("#hemodialysisId").val(data.hemodialysisId);
+ $("#hemodialysisDate").val(data.hemodialysisDate);
+ $("#radiotherapyNo").val(data.radiotherapyNo);
}
}
})