优化在院病人信息列表

src/main/java/cn/hnthyy/thmz/controller/zy/ZyDepositFileController.java

@@ -191,7 +191,11 @@ public class ZyDepositFileController {
             resultMap.put("receiptNo", zyDepositFile.getReceiptNo());
             resultMap.put("zyDepositFile", zyDepositFileService.queryZyDepositFileByReceiptNo(zyDepositFile.getReceiptNo()));
             return resultMap;
-        } catch (Exception e) {
+        }catch (MzException e){
+            resultMap.put("code", -1);
+            resultMap.put("message", e.getMessage());
+            return resultMap;
+        }catch (Exception e) {
             e.printStackTrace();
             resultMap.put("code", -1);
             resultMap.put("message", "保存住院收费或者退费记录出错，请联系管理员");

src/main/resources/static/js/zy/actpatient.js

@@ -1044,10 +1044,14 @@ function cancelTheSettlement(inpatientNo, admissTimes) {
 function queryParams(params) {
     var rePortRangeArr = getRePortRangeArr();
     var payMarkGroup = getIndex("pay_mark_group");
+    var patientId=$("#patientId").val();
+    if(patientId==null || patientId=="" || patientId=="null"){
+        patientId=$("#cardNo").val();
+    }
     var temp = {
         pageSize: params.limit,   //页面大小
         pageIndex: params.offset / params.limit,  //页码
-        mzNo: $("#cardNo").val(),
+        mzNo: patientId,
         name: $("#name").val(),
         ward: $("#deptNoParam").val(),
         smallDept: $("#smallDeptParam").val(),