From f595d846057f85bcf59ab838cddbaa2a15d945e1 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Mon, 6 Jul 2020 17:15:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E7=94=A8=E6=9F=A5=E8=AF=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=9A=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E8=AF=8A=E6=96=AD=E3=80=81=E5=85=B6=E4=BB=96=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E3=80=81=E7=97=85=E7=90=86=E8=AF=8A=E6=96=AD=E3=80=81?= =?UTF-8?q?=E6=8D=9F=E4=BC=A4=E4=B8=AD=E6=AF=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/controller/DelPrintPicQuartz.java | 4 +- .../commomSearch/CommomSearchController.java | 4 +- .../com/emr/vo/commomSearch/CommomVo.java | 10 ++ .../commomSearch/commomListqf.jsp | 110 +++++++++--------- .../recordManage/commomSearch/commomListqf.js | 49 ++++---- .../templateSearch/searchCommomMethodqf.js | 2 +- 6 files changed, 93 insertions(+), 86 deletions(-) diff --git a/src/main/java/com/emr/controller/DelPrintPicQuartz.java b/src/main/java/com/emr/controller/DelPrintPicQuartz.java index d7fb04c..462a204 100644 --- a/src/main/java/com/emr/controller/DelPrintPicQuartz.java +++ b/src/main/java/com/emr/controller/DelPrintPicQuartz.java @@ -28,8 +28,8 @@ public class DelPrintPicQuartz { FileUtils.deleteDirectory(new File(WATERPICPATH)); } - //13时与19时删除ie8接口页面预览病案缓存的pdf - @Scheduled(cron="0 0 13,19 * * ?") + //1小时一次删除ie8接口页面预览病案缓存的pdf + @Scheduled(cron="0 0 0/1 * * ?") public void clearShowPdf() throws Exception{ System.out.println(new Date()+":删除接口页面预览病案缓存的pdf"); String root = WATERPICPATH + "pdfTemp"; diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java index 0c7503a..5228469 100644 --- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java +++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java @@ -477,7 +477,7 @@ public class CommomSearchController { model.addAttribute("isDownload", isDownload); //查询是否有打印权限 Integer printFlag = 0; - Set menus = user.getMenus(); + /* Set menus = user.getMenus(); for (String menu : menus) { if (StringUtils.isNotBlank(menu)) { if ("/commom/printPdf".equals(menu)) { @@ -485,7 +485,7 @@ public class CommomSearchController { break; } } - } + }*/ model.addAttribute("printFlag", printFlag); model.addAttribute("flag", flag); return "recordManage/commomSearch/showRecordIframeBlood"; diff --git a/src/main/java/com/emr/vo/commomSearch/CommomVo.java b/src/main/java/com/emr/vo/commomSearch/CommomVo.java index 4446702..f7f28dc 100644 --- a/src/main/java/com/emr/vo/commomSearch/CommomVo.java +++ b/src/main/java/com/emr/vo/commomSearch/CommomVo.java @@ -151,6 +151,8 @@ public class CommomVo { private String diagName;//诊断名称 + private String poisoningName;//损伤中毒 + private String disThing;//转归情况 private String operateCode;//手术编码 @@ -1902,4 +1904,12 @@ public class CommomVo { public void setDelOper(Integer delOper) { this.delOper = delOper; } + + public String getPoisoningName() { + return poisoningName; + } + + public void setPoisoningName(String poisoningName) { + this.poisoningName = poisoningName; + } } \ No newline at end of file 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 eef4648..222b3fe 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp @@ -156,8 +156,9 @@ height: 30px !important; line-height: 30px !important; } - form{ - margin-bottom: 0!important; + + form { + margin-bottom: 0 !important; } @@ -214,13 +215,13 @@ + value="病案号,ID号,住院次数,姓名,性别,年龄_岁,年龄_月,入院日期,出院日期,出院科室,联系地址,主诊ICD码,主诊名称,主诊转归,住院天数,主治医生,其他诊断,病理诊断,损伤中毒,是否有手术"> + value="commomtable.inpatient_no,commomtable.admiss_id,commomtable.admiss_times,commomtable.name,commomtable.sex,commomtable.age,commomtable.age_month,commomtable.admiss_date,commomtable.dis_date,commomtable.dis_dept,commomtable.home_addr,commomtable.main_diag_code,commomtable.main_diag_name,commomtable.main_dis_thing,commomtable.admiss_days,commomtable.attending,commomtable.other_diag_name,commomtable.pathology_name,commomtable.poisoning_name,commomtable.is_oper"> + value="inpatientNo,admissId,admissTimes,name,sex,age,ageMonth,admissDate,disDate,disDept,homeAddr,mainDiagCode,mainDiagName,mainDisThing,admissDays,attending,otherDiagName,pathologyName,poisoningName,isOper"> @@ -371,9 +372,6 @@
- <%----%> 主诊名称：
- <%----%> 手术编码：
- <%----%> 手术名称：
- <%----%>
-
- +
+ +
+
+
- <%--
+
+
+
-
- +
+
-
- +
+
- +
- +
-
--%> -
- <%--
-
+
+
-
+
+
-
- 限手术 +
+
-
+ <%--
- +
-
+
--%> +
+
-
- -
-
- +
+
+
-
--%> +
@@ -673,7 +671,8 @@
- +
@@ -691,7 +690,8 @@
- +
@@ -700,7 +700,8 @@
- +
@@ -709,7 +710,8 @@
-
@@ -727,12 +729,12 @@ onkeyup="getDiagNameContents('main_diag_name')" onfocus="getDiagNameContents('main_diag_name')" maxlength="16"> -
- - -
-
+
+ + +
+
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js index 052c74b..2665c7f 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js @@ -130,13 +130,6 @@ function loadDeptDefault(defaultDeptName){ if(null != data){ $("#disDept").empty(); var html = ''; - /*for (var i = 0; i < data.length; i++) { - if(data[i].name != '' && data[i].name == defaultDeptName){ - html += ''; - } else { - html += ''; - } - }*/ for (var i = 0; i < data.length; i++) { if (data[i].name != '' && data[i].name == defaultDeptName) { var name = data[i].name; @@ -441,16 +434,26 @@ function getSql() { name = 'main_diag_code'; whereNames += commomtable + "." + name + " LIKE '%" + $("#diag_code").val() + "%' AND "; } - /*//病理诊断 - if($("#pathology_name").val() != ''){ + //全部诊断 + if($("#all_diag_name").val() != ''){ name = 'diag_name'; - whereNames += "t_diag.diag_type='3' AND t_diag."+name+" LIKE '%"+$("#pathology_name").val()+"%' AND "; + whereNames += "t_diag."+name+" LIKE '%"+$("#all_diag_name").val()+"%' AND "; + } + //其他诊断 + if($("#other_diag_name").val() != ''){ + name = 'other_diag_name'; + whereNames += commomtable + "." + name + " LIKE '%" + $("#other_diag_name").val() + "%' AND "; + } + //病理诊断 + if($("#pathology_name").val() != ''){ + name = 'pathology_name'; + whereNames += commomtable + "." + name + " LIKE '%" + $("#pathology_name").val() + "%' AND "; + } + //损伤中毒 + if($("#poisoning_name").val() != ''){ + name = 'poisoning_name'; + whereNames += commomtable + "." + name + " LIKE '%" + $("#poisoning_name").val() + "%' AND "; } - //伴随诊断 - if($("#follow_name").val() != ''){ - name = 'follow_name'; - whereNames += "t_diag.diag_type>'1' AND t_diag.diag_name LIKE '%"+$("#"+name).val()+"%' AND "; - }*/ //手术表 //手术编号 if ($("#operate_code").val() != '') { @@ -469,18 +472,10 @@ function getSql() { 'and emr_apply_approve1.approve_state = 1 and emr_apply_approve1.effe_time > GETDATE()-1 and emr_apply_approve1.applyer = ' + userName + ' and emr_apply_approve1.apply_type = 3' + ' left join emr_lock on ' + commomtable + '.patient_id = emr_lock.patient_id and emr_lock.lock_state = 1'; //拼接诊断表 - /*var diagFlag = false; - var otherTable = ""; - $(".diagTable").each(function () { - if($(this).val() != ''){ - diagFlag = true; - return false; - } - }) - if(diagFlag){ - otherTable = 't_diag'; - fromTableNames += ' left join '+otherTable+' on '+commomtable+'.patient_id='+otherTable+'.patient_id'; - }*/ + //全部诊断 + if($("#all_diag_name").val() != ''){ + fromTableNames += ' left join t_diag on '+commomtable+'.patient_id=t_diag.patient_id'; + } //拼接手术表 var operFlag = false; $(".operTable").each(function () { diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js index dd23fb0..0735230 100644 --- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js +++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js @@ -5,7 +5,7 @@ var initSql = "select commomtable.patient_id,CASE WHEN emr_apply_approve.id is "\t0\n" + "ELSE\n" + "\t1\n" + - "END isDownload,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,commomtable.inpatient_no,commomtable.admiss_id,commomtable.admiss_times,commomtable.name,commomtable.sex,commomtable.age,commomtable.age_month,commomtable.home_addr,commomtable.admiss_date,commomtable.dis_date,commomtable.dis_dept,commomtable.main_diag_code,commomtable.main_diag_name,commomtable.main_dis_thing,commomtable.admiss_days,commomtable.attending,commomtable.is_oper from commomtable left join emr_apply_approve on commomtable.patient_id = emr_apply_approve.patient_id and emr_apply_approve.approve_state = 1 and emr_apply_approve.effe_time > GETDATE()-1 and emr_apply_approve.applyer = " +userName+ " and emr_apply_approve.apply_type != 3 left join emr_apply_approve emr_apply_approve1 on commomtable.patient_id = emr_apply_approve1.patient_id and emr_apply_approve1.approve_state = 1 and emr_apply_approve1.effe_time > GETDATE()-1 and emr_apply_approve1.applyer = " +userName+ " and emr_apply_approve1.apply_type = 3 left join emr_lock on commomtable.patient_id = emr_lock.patient_id and emr_lock.lock_state = 1 "; + "END isDownload,CASE WHEN emr_lock.id is null THEN 0 ELSE 1 END lockStatus,commomtable.inpatient_no,commomtable.admiss_id,commomtable.admiss_times,commomtable.name,commomtable.sex,commomtable.age,commomtable.age_month,commomtable.home_addr,commomtable.admiss_date,commomtable.dis_date,commomtable.dis_dept,commomtable.main_diag_code,commomtable.main_diag_name,commomtable.main_dis_thing,commomtable.admiss_days,commomtable.attending,commomtable.other_diag_name,commomtable.pathology_name,commomtable.poisoning_name,commomtable.is_oper from commomtable left join emr_apply_approve on commomtable.patient_id = emr_apply_approve.patient_id and emr_apply_approve.approve_state = 1 and emr_apply_approve.effe_time > GETDATE()-1 and emr_apply_approve.applyer = " +userName+ " and emr_apply_approve.apply_type != 3 left join emr_apply_approve emr_apply_approve1 on commomtable.patient_id = emr_apply_approve1.patient_id and emr_apply_approve1.approve_state = 1 and emr_apply_approve1.effe_time > GETDATE()-1 and emr_apply_approve1.applyer = " +userName+ " and emr_apply_approve1.apply_type = 3 left join emr_lock on commomtable.patient_id = emr_lock.patient_id and emr_lock.lock_state = 1 "; //定义查看详情的请求地址url function returnShowDetailUrl(patientId){ return path + '/commom/showRecord174?patientId=' + patientId;