From 73c68e4fc29a2a30c589ab015ec2d1fc8e019faa Mon Sep 17 00:00:00 2001 From: ALW <850658129@qq.com> Date: Tue, 20 Sep 2022 10:15:42 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=81=B5=E4=B9=89=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E8=B7=B3=E8=BD=AC=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FontShowRecordController.java | 13 +++---- src/main/java/com/emr/dao/CommomMapper.java | 5 +++ .../java/com/emr/vo/FontVo/FontCommom.java | 10 ++++++ src/main/resources/mapper/CommomMapper.xml | 35 +++++++++++++++++++ .../webapp/WEB-INF/views/font/recordList.jsp | 1 + .../commomSearch/commomListqf.jsp | 17 +++++++-- src/main/webapp/static/js/font/recordList.js | 1 + .../recordManage/commomSearch/commomListqf.js | 5 +++ 8 files changed, 78 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/emr/controller/FontShowRecordController.java b/src/main/java/com/emr/controller/FontShowRecordController.java index 51d7490..4c2e24a 100644 --- a/src/main/java/com/emr/controller/FontShowRecordController.java +++ b/src/main/java/com/emr/controller/FontShowRecordController.java @@ -79,17 +79,17 @@ public class FontShowRecordController { * @Version: 1.0 */ @RequestMapping(value = "recordList") - public String showRecord(String inpatientNo, Model model, HttpServletRequest request) { + public String showRecord(String inpatientNo,String idCard,Model model, HttpServletRequest request) { try{ //根据病案号查看病案是否存在 - if(StringUtils.isNotBlank(inpatientNo)){ - int commom = commomMapper.isExistInpatientOrAdmissId(inpatientNo, null, null); + if(StringUtils.isNotBlank(inpatientNo)||StringUtils.isNotBlank(idCard)){ + int commom = commomMapper.isExistInpatientOrAdmissIdOridCard(inpatientNo,idCard, null, null); if(commom == 0){ model.addAttribute("msg","病案不存在!"); return "font/msg"; } }else{ - model.addAttribute("msg","参数病案号不能为空!"); + model.addAttribute("msg","参数病案号与参数身份证号不能全部为空!"); return "font/msg"; } //虚假登陆 @@ -105,6 +105,7 @@ public class FontShowRecordController { subject.login(userToken); request.getSession().setAttribute("CURRENT_USER", user); model.addAttribute("inpatientNo",inpatientNo); + model.addAttribute("idCard",idCard); }catch (Exception e){ ExceptionPrintUtil.printException(e); e.printStackTrace(); @@ -280,12 +281,12 @@ public class FontShowRecordController { @RequestMapping("getRecordListByInpatientNo") @ResponseBody - public String getRecordListByInpatientNo(Integer page, Integer limit,String inpatientNo){ + public String getRecordListByInpatientNo(Integer page, Integer limit,String inpatientNo,String idCard){ if(null != page && null != limit){ PageHelper.startPage(page, limit); } try{ - List list = commomMapper.selectCommomByInpatientNo(inpatientNo); + List list = commomMapper.selectCommomByInpatientNo2(inpatientNo,idCard); PageInfo pageInfo = new PageInfo<>(list); return JSON.toJSONString(pageInfo); }catch (Exception e){ diff --git a/src/main/java/com/emr/dao/CommomMapper.java b/src/main/java/com/emr/dao/CommomMapper.java index 5570943..9fdb959 100644 --- a/src/main/java/com/emr/dao/CommomMapper.java +++ b/src/main/java/com/emr/dao/CommomMapper.java @@ -56,6 +56,7 @@ public interface CommomMapper { /** * isExistInpatientOrAdmissId 根据病案号或住院号查询该病案是否存在 * */ + int isExistInpatientOrAdmissIdOridCard(@Param("inpatientNo")String inpatientNo,@Param("idCard")String idCard,@Param("admissId")String admissId,@Param("patientId")String patientId); int isExistInpatientOrAdmissId(@Param("inpatientNo")String inpatientNo,@Param("admissId")String admissId,@Param("patientId")String patientId); /** * isExistInpatient 根据条件查询该病案是否存在 @@ -87,6 +88,10 @@ public interface CommomMapper { * 按病案号查询patientId,name,admissId * */ List selectCommomByInpatientNo(@Param("inpatientNo")String inpatientNo); + /** + * 按病案号查询patientId,name,admissId + * */ + List selectCommomByInpatientNo2(@Param("inpatientNo")String inpatientNo,@Param("idCard")String idCard); /** * 查询病案信息的病案号和病人名称 diff --git a/src/main/java/com/emr/vo/FontVo/FontCommom.java b/src/main/java/com/emr/vo/FontVo/FontCommom.java index 2f74f78..5bdbb68 100644 --- a/src/main/java/com/emr/vo/FontVo/FontCommom.java +++ b/src/main/java/com/emr/vo/FontVo/FontCommom.java @@ -21,6 +21,16 @@ public class FontCommom { private String admissId; + private String checkedDatetime; + + public String getCheckedDatetime() { + return checkedDatetime; + } + + public void setCheckedDatetime(String checkedDatetime) { + this.checkedDatetime = checkedDatetime; + } + private Short admissTimes; private String disDate; diff --git a/src/main/resources/mapper/CommomMapper.xml b/src/main/resources/mapper/CommomMapper.xml index 427b759..4718558 100644 --- a/src/main/resources/mapper/CommomMapper.xml +++ b/src/main/resources/mapper/CommomMapper.xml @@ -1204,6 +1204,27 @@ + + + + +
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 ef46f56..d59731b 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp @@ -213,13 +213,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,memo"> + value="inpatientNo,admissId,admissTimes,name,sex,age,ageMonth,admissDate,disDate,disDept,homeAddr,mainDiagCode,mainDiagName,mainDisThing,admissDays,attending,otherDiagName,pathologyName,poisoningName,isOper,memo"> @@ -609,6 +609,17 @@
+
+
+
+ +
+
+ +
+
+
diff --git a/src/main/webapp/static/js/font/recordList.js b/src/main/webapp/static/js/font/recordList.js index f78965a..29f0d98 100644 --- a/src/main/webapp/static/js/font/recordList.js +++ b/src/main/webapp/static/js/font/recordList.js @@ -82,6 +82,7 @@ $('#mytab').bootstrapTable({ offset : params.offset, // SQL语句起始索引 page : (params.offset / params.limit) + 1, //当前页码, inpatientNo:$("#inpatientNo").val(), + idCard:$("#idCard").val(), } }, responseHandler:function(res){ diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js index 93cd33c..b7317e3 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js @@ -531,6 +531,11 @@ function getSql() { name = 'attending'; whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND "; } + //拼接主治医生 + if ($("#memo").val() != '') { + name = 'memo'; + whereNames += commomtable + "." + name + " LIKE '%" + $("#" + name).val() + "%' AND "; + } //限手术 var isOper = $("#isOper").val(); if (isOper != '' && isOper == 1) {