收费列表默认初始化查询

src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -166,6 +166,7 @@ public class MzChargeDetailController {
             MzChargeDetail mzChargeDetail = mzChargeDetailPageDto.getMzChargeDetail();
             List<MzChargeDetail> mzChargeDetails = new ArrayList<>();
             if (PayMarkEnum.NO_CHARGE.code.equals(mzChargeDetail.getPayMark())) {
+                String name = "";
                 if (StringUtils.isNotBlank(mzChargeDetail.getPatientId())) {
                     // 查询病人信息
                     MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(mzChargeDetail.getPatientId());
@@ -174,9 +175,11 @@ public class MzChargeDetailController {
                         resultMap.put("message", "病人不存在！");
                         return resultMap;
                     }
-                    // 将未缴费的处方转成完整的收费明细
-                    mzChargeDetails.addAll(mzChargeDetailService.unPaidToFullChargeDetail(mzChargeDetail.getPatientId(), mzPatientMi.getName()));
+                    name = mzPatientMi.getName();
+
                 }
+                // 将未缴费的处方转成完整的收费明细
+                mzChargeDetails.addAll(mzChargeDetailService.unPaidToFullChargeDetail(mzChargeDetail.getPatientId(), name));
                 if (StringUtils.isNotBlank(mzChargeDetail.getName())) {
                     List<MzPatientMi> mzPatientMis = mzPatientMiService.queryByName(mzChargeDetail.getName());
                     if (mzPatientMis != null && mzPatientMis.size() > 0) {

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -845,11 +845,14 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
      */
     @Override
     public List<MzChargeDetail> unPaidToFullChargeDetail(String patientId, String name) throws MzException {
-        if (StringUtils.isBlank(patientId)) {
+        /*if (StringUtils.isBlank(patientId)) {
             throw new MzException("病人编号不能为空！");
         }
         if (StringUtils.isBlank(name)) {
             throw new MzException("病人姓名不能为空！");
+        }*/
+        if(StringUtils.isBlank(patientId)) {
+            patientId = null;
         }
         List<Map<String, Object>> unPaidChargeDetails = mzChargeDetailMapper.selectUnPaidChargeDetail(patientId);
         List<Map<String, Object>> unPaidYjReqs = mzYjReqService.queryUnPaidYjReq(patientId);
@@ -874,7 +877,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     mzChargeDetail.setTimes(Integer.valueOf((Short) map.get("times")));
                 }
                 MzChargeDetail mzChargeDetail1 = unPaidToFullChargeDetail(mzChargeDetail);
-                mzChargeDetail1.setName(name);
+//                mzChargeDetail1.setName(name);
                 returnMzChargeDetails.add(mzChargeDetail1);
             }
             //按时间倒序排序

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

@@ -211,6 +211,14 @@ $(function () {
     //     }
     // });
 
+    function payByCode() {
+
+    }
+
+    $("#codePay").on("click", function (t) {
+        payByCode();
+    });
+
     /**
      * 保存挂号信息
      */

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

@@ -477,7 +477,7 @@ function initFeeTable() {
         sortable: true,                     //是否启用排序
         sortOrder: "asc",                   //排序方式
         queryParams: queryParams,           //传递参数（*）
-        sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
+        sidePagination: "client",           //分页方式：client客户端分页，server服务端分页（*）
         pageNumber: 1,                       //初始化加载第一页，默认第一页
         pageSize: 5,                       //每页的记录行数（*）
         pageList: [5, 10, 25, 50, 100],        //可供选择的每页的行数（*）

src/main/resources/templates/mz/toll_administration.html

@@ -240,14 +240,14 @@
                     <div class="item form-group" id="dyTgDiv">
                         <div class="col-md-12 col-sm-12 col-xs-12">
                             <div class="col-md-2 col-sm-2 col-xs-12"></div>
-                            <label class="control-label col-md-3 col-sm-3 col-xs-12" for="project">抖音团购码：
+                            <label class="control-label col-md-3 col-sm-3 col-xs-12">付款码：
                             </label>
                             <div class="col-md-6 col-sm-6 col-xs-12">
-                                <input class="form-control col-md-5 col-xs-12" id="dyTgId" type="number"/>
+                                <input class="form-control col-md-5 col-xs-12" id="paymentCode"/>
                             </div>
                         </div>
                     </div>
-                    <div class="item form-group" id="projectDiv">
+                    <!--<div class="item form-group" id="projectDiv">
                         <div class="col-md-12 col-sm-12 col-xs-12">
                             <div class="col-md-2 col-sm-2 col-xs-12"></div>
                             <label class="control-label col-md-3 col-sm-3 col-xs-12" for="project">合作项目：
@@ -258,7 +258,7 @@
                                 </select>
                             </div>
                         </div>
-                    </div>
+                    </div>-->
                 </form>
             </div>
             <div class="modal-footer">
@@ -266,7 +266,8 @@
                 <!--<input type="checkbox"/>&nbsp;&nbsp;打印-->
                 <!--</div>-->
                 <!--<input type="hidden" id="benYuanJiZhangTimes"/>-->
-                <button type="button" class="btn btn-primary" id="consume">刷卡/扫码</button>
+<!--                <button type="button" class="btn btn-primary" id="consume">刷卡/扫码</button>-->
+                <button type="button" class="btn btn-primary" id="codePay">付款码付款</button>
                 <button type="button" class="btn btn-primary" onclick="saveConfirmFee()" id="saveConfirmFee">确定</button>
                <!-- <button type="button" class="btn btn-default" data-dismiss="modal" onclick="cancelFee()">取消</button>-->
                 <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>