优化聚合支付功能

src/main/java/cn/hnthyy/thmz/service/impl/thmz/EvaluationServiceImpl.java

@@ -122,10 +122,10 @@ public class EvaluationServiceImpl implements EvaluationService {
             throw new MzException("推送价格消息到评价器失败，请求客户端对应的评价器IP为空！");
         }
         BigDecimal needPay = new BigDecimal((String) params.get("needPay")).setScale(2, BigDecimal.ROUND_HALF_UP);
-        BigDecimal pay = new BigDecimal((Integer) params.get("pay")).setScale(2, BigDecimal.ROUND_HALF_UP);
+        BigDecimal pay = new BigDecimal((Double) params.get("pay")).setScale(2, BigDecimal.ROUND_HALF_UP);
         BigDecimal changeAmount=null;
         try{
-            changeAmount = new BigDecimal((Integer) params.get("changeAmount")).setScale(2, BigDecimal.ROUND_HALF_UP);
+            changeAmount = new BigDecimal((Double) params.get("changeAmount")).setScale(2, BigDecimal.ROUND_HALF_UP);
         }catch (ClassCastException e){
             changeAmount = new BigDecimal((String) params.get("changeAmount")).setScale(2, BigDecimal.ROUND_HALF_UP);
         }

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

@@ -7,7 +7,7 @@ var pageIndex = 0;
 var LODOP; //声明为全局变量
 //默认打印机下标
 var printIndex = -1;
-var TableInit = function () {
+var TableInit = function () {consume
     var oTableInit = new Object();
     //初始化Table
     oTableInit.Init = function () {
@@ -212,7 +212,7 @@ $(function () {
         }
         var patientId = $("#patientId").val();
         if (patientId == null || patientId == "") {
-            savePatient(true);
+            savePatient(1);
         } else {
             saveMzyReqrec();
         }
@@ -1363,9 +1363,9 @@ function setPrint() {
 
 /**
  * 保存病人信息
- * @param flag true 继续调用挂号接口，false，只建档不挂号
+ * @param type 1 继续调用挂号接口，2，只建档不挂号 3 不清空
  */
-function savePatient(flag) {
+function savePatient(type) {
     $.ajax({
         type: "POST",
         url: '/thmz/savePatient',
@@ -1394,12 +1394,15 @@ function savePatient(flag) {
                 return;
             }
             if (res.code == 0) {
-                if (flag) {
+                if (type==1) {
                     $("#patientId").val(res.data.patientId);
                     saveMzyReqrec();
-                } else {
+                } else if (type==2){
                     clearRegistration();
                     successMesage(res);
+                }else if (type==3){
+                    $("#patientId").val(res.data.patientId);
+                    $("#saveUser").hide();
                 }
             } else {
                 $("#saveConfirmFee").attr("disabled", false);
@@ -2077,6 +2080,10 @@ function consume() {
     $("#consume").attr("disabled", true);
     $("#saveConfirmFee").attr("disabled", true);
     var patientId = $("#patientId").val();
+    if(patientId==null || patientId==""){
+        savePatient(3);
+        patientId = $("#patientId").val();
+    }
     var chequeType = $("#payType").val();
     var amt = $("#realMoney").val();
     $.ajax({

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

@@ -890,10 +890,10 @@ function confirmFeeModal(times, totalCharge, receiptNo) {
         $("#timesHaveTally").val(times);
         $("#receiptNoHaveTally").val(receiptNo);
     }
-    var prevAll = $("#changeAmountParent").prevAll();
-    while (prevAll.length > 2) {
-        $("#changeAmountParent").prev().remove();
-        prevAll = $("#changeAmountParent").prevAll();
+    var prevAll = $("#cashDiv").prevAll();
+    while (prevAll.length > 1) {
+        $("#cashDiv").prev().remove();
+        prevAll = $("#cashDiv").prevAll();
     }
     // $("#realMoney").val($("#amountMoneyConfirm").text());
     // $("#cash").val($("#amountMoneyConfirm").text());
@@ -2478,7 +2478,7 @@ function addPayType(id) {
         payTypeId = "payType_" + payTypeIndex;
     }
     var html = '<div class="item form-group pay-item"><div class="col-md-12 col-sm-12 col-xs-12"> <input type="hidden" class="refNo"/><input type="hidden" class="qrCodeParam"/><input type="hidden" class="transDate"/><input type="hidden" class="payChannel"/><input type="hidden" class="traceNo"/><div class="col-md-2 col-sm-2 col-xs-12"></div><label class="col-md-3 col-sm-3 col-xs-12"><select class="form-control selectpicker show-tick" required="true" id="' + payTypeId + '" onchange="checkFee(false)"></select></label><div class="col-md-3 col-sm-3 col-xs-12"><input class="form-control col-md-5 col-xs-12 money" type="number" data-placement="bottom-right" min="0" onchange="checkFee()"></div><div class="col-md-1 col-sm-1 col-xs-12" style="line-height: 34px;">元&nbsp;&nbsp;<a style="line-height: 34px;cursor: pointer;" onclick="closeThisParent(this)"><i class="fa fa-close"></i></a></div></div></div>';
-    $("#changeAmountParent").before(html);
+    $("#cashDiv").before(html);
     initChequeType(payTypeId)
     if (payTypeIndex != undefined && payTypeIndex != null) {
         payTypeIndex = Add(payTypeIndex, 1);

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

@@ -64,7 +64,7 @@
                         <a id="hybridTest" hidden onclick="hybridTest()"><i class="fa fa-eyedropper">&nbsp;核酸检测（混检）</i></a>
                         <a id="clearIcCardNo" hidden onclick="clearIcCardNo()"><i
                                 class="fa fa-chain-broken">&nbsp;销卡</i></a>
-                        <a onclick="savePatient(false)" id="saveUser" hidden><i class="fa fa-user">&nbsp;患者建档</i></a>
+                        <a onclick="savePatient(2)" id="saveUser" hidden><i class="fa fa-user">&nbsp;患者建档</i></a>
                         <a onclick="editUserModal(null)" id="editUser" hidden><i class="fa fa-edit">&nbsp;修改患者</i></a>
                         <a id="siReadCard"><i class="fa fa-barcode">&nbsp;医保电子凭证读卡</i></a>
                         <a id="copyAddress" hidden><i class="fa fa-copyright" onclick="copyAddress()">&nbsp;复制身份证地址</i></a>

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

@@ -176,7 +176,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="item form-group pay-item">
+                    <div class="item form-group pay-item" id="cashDiv">
                         <div class="col-md-12 col-sm-12 col-xs-12">
                             <!--POS主机参考号-->
                             <input type="hidden" class="refNo"/>