优化报表明细中的作废条件

src/main/java/cn/hnthyy/thmz/mapper/his/mz/ChargeFeeVoMapper.java

@@ -1157,7 +1157,7 @@ public interface ChargeFeeVoMapper {
                     "patient_id=rtrim(b.patient_id), " +
                     "amount=b.amount " +
                     "from mz_patient_mi a WITH(NOLOCK) , mz_deposit_file b WITH(NOLOCK) " +
-                    "where b.op_id=#{userIdCode} and b.patient_id=a.patient_id " +
+                    "where b.op_id=#{userIdCode} and b.patient_id=a.patient_id  and b.pay_mark <![CDATA[<>]]> '2'" +
                     "<when test='dcountDate!=null'>",
             " and dcount_date=#{dcountDate,jdbcType=TIMESTAMP} ",
             "</when>",

src/main/resources/static/js/menu.js

@@ -5,6 +5,8 @@ var countReceiot = 0;
 var clipboard = null;
 //跨页面传递患者id参数核酸检测
 var patientIdFullForNucleicAcid=null;
+//挂号读取身份证定时任务
+var readIcCardTimerForRegistration=null;
 $(function () {
     if (localStorage.getItem("token") == undefined) {
         window.location.href = '/thmz/login/view'
@@ -327,6 +329,13 @@ function changeContent(url) {
     if (clipboard != null) {
         clipboard.destroy();
     }
+    try {
+        if(readIcCardTimerForRegistration!=null){
+            clearInterval(readIcCardTimerForRegistration);
+        }
+    }catch (e) {
+        console.log("消除挂号身份证读取定时任务失败！");
+    }
     //如果门诊工作站的辅助框打开，关闭它
     if($('#box-arrow-left').length>0){
         if($("#smartAssistPopoverContent").parent().parent().hasClass("in")){

src/main/resources/static/js/mz/registration.js

@@ -220,6 +220,12 @@ $(function () {
     });
 
 
+    //每隔三秒读一次身份证
+    readIcCard();
+    // setInterval(function () {
+    //     new Device().startFun();
+    // }, 3000);
+
     /**
      * 患者信息修改
      */
@@ -237,10 +243,7 @@ $(function () {
     //     $("#editPrintModal").modal();
     // });
 
-    //每隔三秒读一次身份证
-    setInterval(function () {
-        new Device().startFun();
-    }, 3000);
+
 
 
     // $("#birthDay").keypress(function () {   // keypress：输入框每获取一个字符，就触发一次该事件。
@@ -306,6 +309,19 @@ $(function () {
 });
 
 
+
+/**
+ * 刷新列表,解决越来越快的问题
+ */
+function readIcCard() {
+    //clearInterval要放在方法开始，不然的话，下面的代码还没运行到clearInterval，又开始了循环了。
+    clearInterval(readIcCardTimerForRegistration);
+    new Device().startFun();
+    readIcCardTimerForRegistration = setInterval(()=>{
+        readIcCard()
+    },3000);
+}
+
 // function CreatePageList() {
 //     LODOP = getLodop();
 //     LODOP.PRINT_INITA(6, 0, "92mm", "120mm", "泰和门诊发票打印");