1、遵义新增身份证跳转接口

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)){
+            if(StringUtils.isNotBlank(inpatientNo)||StringUtils.isNotBlank(idCard)){
-                int commom = commomMapper.isExistInpatientOrAdmissId(inpatientNo, null, null);
+                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<CommomVo> list = commomMapper.selectCommomByInpatientNo(inpatientNo);
+            List<CommomVo> list = commomMapper.selectCommomByInpatientNo2(inpatientNo,idCard);
             PageInfo pageInfo = new PageInfo<>(list);
             return JSON.toJSONString(pageInfo);
         }catch (Exception e){

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<CommomVo> selectCommomByInpatientNo(@Param("inpatientNo")String inpatientNo);
+    /**
+     * 按病案号查询patientId,name,admissId
+     * */
+    List<CommomVo> selectCommomByInpatientNo2(@Param("inpatientNo")String inpatientNo,@Param("idCard")String idCard);
 
     /**
      * 查询病案信息的病案号和病人名称

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;

src/main/resources/mapper/CommomMapper.xml

@@ -1204,6 +1204,27 @@
             </if>
         </where>
     </select>
+
+    <select id="isExistInpatientOrAdmissIdOridCard" resultType="java.lang.Integer">
+        SELECT
+        count(1)
+        FROM
+        commomtable
+        <where>
+            <if test="inpatientNo != null and inpatientNo != ''">
+                AND inpatient_no like '%${inpatientNo}%'
+            </if>
+            <if test="admissId != null and admissId != ''">
+                AND admiss_id = #{admissId}
+            </if>
+            <if test="patientId != null and patientId != ''">
+                AND patient_id = #{patientId}
+            </if>
+            <if test="idCard != null and idCard != ''">
+                AND id_card = #{idCard}
+            </if>
+        </where>
+    </select>
     <!--根据条件查询该病案是否存在-->
     <select id="isExistInpatient" resultMap="BaseResultMap2">
         SELECT
@@ -1266,6 +1287,20 @@
         where inpatient_no like '%${inpatientNo}%'
         order by admiss_times desc
     </select>
+    <!--根据病案号查询-->
+    <select id="selectCommomByInpatientNo2" resultMap="BaseResultMap">
+        select patient_id,inpatient_no,name,admiss_id,admiss_times,dis_date,dis_dept
+        from commomtable
+        <where>
+            <if test="inpatientNo != null and inpatientNo != ''">
+                AND inpatient_no like '%${inpatientNo}%'
+            </if>
+            <if test="idCard != null and idCard != ''">
+                AND id_card = #{idCard}
+            </if>
+        </where>
+        order by admiss_times desc
+    </select>
     <select id="selectCommomCount" resultType="java.lang.Integer">
         SELECT
         COUNT(1)

src/main/webapp/WEB-INF/views/font/recordList.jsp

@@ -47,6 +47,7 @@
 </head>
 <body>
 <input type="hidden" id="inpatientNo" value="${inpatientNo}">
+<input type="hidden" id="idCard" value="${idCard}">
 <input type="hidden" id="userName" value="${userName}">
 <div class="main">
     <div class="headDiv">

src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp

@@ -213,13 +213,13 @@
                         </div>
                         <!--表格头-->
                         <input type="hidden" id="tableThNames"
-                               value="病案号,ID号,住院次数,姓名,性别,年龄_岁,年龄_月,入院日期,出院日期,出院科室,联系地址,主诊ICD码,主诊名称,主诊转归,住院天数,主治医生,其他诊断,病理诊断,损伤中毒,是否有手术">
+                               value="病案号,ID号,住院次数,姓名,性别,年龄_岁,年龄_月,入院日期,出院日期,出院科室,联系地址,主诊ICD码,主诊名称,主诊转归,住院天数,主治医生,其他诊断,病理诊断,损伤中毒,是否有手术,病案备注">
                         <!--查询字段-->
                         <input type="hidden" id="englishFields"
-                               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="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">
                         <!--数据字段-->
                         <input type="hidden" id="fields"
-                               value="inpatientNo,admissId,admissTimes,name,sex,age,ageMonth,admissDate,disDate,disDept,homeAddr,mainDiagCode,mainDiagName,mainDisThing,admissDays,attending,otherDiagName,pathologyName,poisoningName,isOper">
+                               value="inpatientNo,admissId,admissTimes,name,sex,age,ageMonth,admissDate,disDate,disDept,homeAddr,mainDiagCode,mainDiagName,mainDisThing,admissDays,attending,otherDiagName,pathologyName,poisoningName,isOper,memo">
                         <!--显示字段-->
                         <input type="hidden" id="fieldCns">
                         <!--查询总行数-->
@@ -609,6 +609,17 @@
                             </div>
                         </div>
                         <div class="row">
+                            <div class="col-sm-4">
+                                <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="memo" maxlength="100">
+                                    </div>
+                                </div>
+                            </div>
                             <div class="col-sm-4">
                                 <div class="form-group">
                                     <div class="col-sm-4 labelDiv"></div>

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){

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) {