linjj
/
emr_record_czry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加放疗菜单展示功能

Browse Source
master
jian.wang 2 years ago
parent 9ff31332cc
commit d6b1d2494a
11 changed files with 283 additions and 5 deletions
Show Stats Download Patch File Download Diff File

34
src/main/java/com/emr/controller/LogAopAction.java
Unescape Escape View File

@ -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();
}
}
}
}

1
src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
Unescape Escape View File

@ -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);

2
src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
Unescape Escape View File

@ -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;
}

31
src/main/java/com/emr/vo/commomSearch/CommomVo.java
Unescape Escape View File

@ -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;
}

9
src/main/resources/mapper/CommomMapper.xml
Unescape Escape View File

@ -654,6 +654,15 @@
<if test="applicant != null">
applicant = #{applicant},
</if>
<if test="hemodialysisId != null">
hemodialysis_id = #{hemodialysisId},
</if>
<if test="hemodialysisDate != null">
hemodialysis_date = #{hemodialysisDate},
</if>
<if test="radiotherapyNo != null">
radiotherapy_no = #{radiotherapyNo},
</if>
</set>
where patient_id = #{patientId,jdbcType=VARCHAR}
</update>

2
src/main/webapp/WEB-INF/jspf/common.jspf
Unescape Escape View File

@ -32,6 +32,8 @@
<script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
<!-- datepicker -->
<script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script>
<script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-datepicker/dist/locales/bootstrap-datepicker.zh-CN.min.js"></script>
<!-- AdminLTE App -->
<script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/dist/js/adminlte.min.js"></script>
<script type="text/javascript" src="${basePath}/static/js/toastr.js"></script>

81
src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
Unescape Escape View File

@ -778,6 +778,61 @@
</div>
</div>
</div>
<!-- 血透 -->
<div class="col-sm-4 hideDiv" id="hemodialysisIdDiv">
<div class="form-group">
<div class="col-sm-3 labelDiv">
<label class="control-label">血透id：</label>
</div>
<div class="col-sm-9 inputDiv">
<input type="text" class="form-control input-sm diagTable inputValue"
id="hemodialysis_id" maxlength="6">
</div>
</div>
</div>
<div class="col-sm-4 hideDiv" id="idCardDiv">
<div class="form-group">
<div class="col-sm-3 labelDiv">
<label class="control-label">身份证号码：</label>
</div>
<div class="col-sm-9 inputDiv">
<input type="text" class="form-control input-sm diagTable inputValue"
id="id_card" maxlength="6">
</div>
</div>
</div>
<div class="col-sm-4 hideDiv" id="hemodialysisDateDiv">
<div class="form-group">
<div class="col-sm-3 labelDiv">
<label class="control-label">血透时间：</label>
</div>
<div class="col-sm-4 inputDiv">
<input type="text" class="form-control input-sm inputValue" id="startTime5"
style="margin-left: 15px" autocomplete="off">
</div>
<div class="col-sm-1" style="padding-top:2%">
<div style="margin-left: 50%">
至
</div>
</div>
<div class="col-sm-4 inputDiv">
<input type="text" class="form-control input-sm inputValue" id="endTime5"
autocomplete="off">
</div>
</div>
</div>
<!-- 放疗 -->
<div class="col-sm-4 hideDiv" id="radiotherapyNoDiv">
<div class="form-group">
<div class="col-sm-3 labelDiv">
<label class="control-label">放疗号：</label>
</div>
<div class="col-sm-9 inputDiv">
<input type="text" class="form-control input-sm diagTable inputValue"
id="radiotherapy_no" maxlength="6">
</div>
</div>
</div>
</div>
</form>
</div>
@ -1066,6 +1121,32 @@
</div>
<div class="col-sm-1"></div>
</div>
<!-- 血透 -->
<div class="form-group hideDiv" id="hemodialysisIdEditDiv">
<label class="col-sm-3 control-label">血透id：</label>
<div class="col-sm-7">
<input type="text" class="form-control input-sm input" id="hemodialysisId"
name="hemodialysisId">
</div>
<div class="col-sm-1"></div>
</div>
<div class="form-group hideDiv" id="hemodialysisDateEditDiv">
<label class="col-sm-3 control-label">血透时间：</label>
<div class="col-sm-7">
<input type="text" class="form-control input-sm input" id="hemodialysisDate"
name="hemodialysisDate">
</div>
<div class="col-sm-1"></div>
</div>
<!-- 放疗 -->
<div class="form-group hideDiv" id="radiotherapyNoEditDiv">
<label class="col-sm-3 control-label">放疗号：</label>
<div class="col-sm-7">
<input type="text" class="form-control input-sm input" id="radiotherapyNo"
name="radiotherapyNo">
</div>
<div class="col-sm-1"></div>
</div>
</form>
</div>
<div class="modal-footer">

57
src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp
Unescape Escape View File

@ -369,6 +369,34 @@
</div>
</div>
<!-- 血透 -->
<div class="col-sm-3 inputDiv" id="hemodialysisIdDiv">
<div class="form-group">
<label class="col-sm-5 control-label labelDiv">血透id：</label>
<div class="col-sm-7">
<input type="text" readonly class="form-control input-sm input" id="hemodialysisId">
</div>
</div>
</div>
<div class="col-sm-3 inputDiv" id="hemodialysisDateDiv">
<div class="form-group">
<label class="col-sm-5 control-label labelDiv">血透时间：</label>
<div class="col-sm-7">
<input type="text" readonly class="form-control input-sm input" id="hemodialysisDate">
</div>
</div>
</div>
<!-- 放疗 -->
<div class="col-sm-3 inputDiv" id="radiotherapyNoDiv">
<div class="form-group">
<label class="col-sm-5 control-label labelDiv">放疗号：</label>
<div class="col-sm-7">
<input type="text" readonly class="form-control input-sm input" id="radiotherapyNo">
</div>
</div>
</div>
<!-- 按钮 -->
<div class="col-sm-3">
<div class="form-group">
@ -1000,6 +1028,35 @@
<div class="col-sm-1"></div>
</div>
</div>
<!-- 血透 -->
<div class="row collectDiv" id="hemodialysisIdCollDiv">
<div class="form-group">
<label class="col-sm-4 control-label collectLabel">血透id：</label>
<div class="col-sm-7">
<input type="text" class="form-control input-sm input" readonly id="hemodialysisIdColl">
</div>
<div class="col-sm-1"></div>
</div>
</div>
<div class="row collectDiv" id="hemodialysisDateCollDiv">
<div class="form-group">
<label class="col-sm-4 control-label collectLabel">血透时间：</label>
<div class="col-sm-7">
<input type="text" class="form-control input-sm input" readonly id="hemodialysisDateColl">
</div>
<div class="col-sm-1"></div>
</div>
</div>
<!-- 放疗 -->
<div class="row collectDiv" id="radiotherapyNoCollDiv">
<div class="form-group">
<label class="col-sm-4 control-label collectLabel">放疗号：</label>
<div class="col-sm-7">
<input type="text" class="form-control input-sm input" readonly id="radiotherapyNoColl">
</div>
<div class="col-sm-1"></div>
</div>
</div>
</div>
</div>
</div>

48
src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js
Unescape Escape View File

@ -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;

18
src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
Unescape Escape View File

@ -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;
//不为空，有已删除的图片，显示恢复图片按钮

5
src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
Unescape Escape View File

@ -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);
}
}
})

Write Preview
Loading…
Cancel
Save