划价问题优化

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

@@ -217,7 +217,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             List<String> jianChas = new ArrayList<>();
             Integer index = 1;
             for (MzYjReq mzYjReq : mzYjReqs) {
-                if (mzYjReq != null) {
+                //不为空且没有划价
+                if (mzYjReq != null && mzYjReq.getPercentFt()==null) {
                     String temp = maxOrderNo.toString();
                     temp = temp + index++;
                     itemNo = formatYjChargeDetail(mzChargeDetail, mzChargeDetails, maxOrderNo, mzPatientMi, itemNo, jianYans, jianChas, mzYjReq, temp, priceId, priceTime, tcNoMap);

src/main/resources/static/js/daily.js

@@ -756,6 +756,8 @@ function dcountCharge() {
                     LODOP.ADD_PRINT_HTM("0mm", "5mm", "200mm", "280mm", document.getElementById("printDiv_gh").innerHTML);
                     LODOP.PRINT();
                     //LODOP.PREVIEW();
+                    //刷新数据
+                    getRjbb();
                 }
                 successMesage(res);
             } else {

src/main/resources/templates/daily.html

@@ -32,11 +32,11 @@
                         </button>
                     </div>
                     <div class="form-group col-md-8 col-sm-8 col-xs-12">
-                        <div class="col-md-6 col-sm-6 col-xs-12"></div>
-                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="printNum">打印份数
+                        <div class="col-md-3 col-sm-3 col-xs-12"></div>
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="printNum">打印份数
                         </label>
-                        <div class="col-md-2 col-sm-2 col-xs-12">
-                            <input id="printNum" class="form-control col-md-7 col-xs-12" type="Number"
+                        <div class="col-md-3 col-sm-3 col-xs-12">
+                            <input id="printNum" class="form-control col-md-12 col-xs-12" type="Number"
                                    placeholder="打印份数">
                         </div>
                         <div class="col-md-1 col-sm-1 col-xs-12" style="text-align:left;">
@@ -44,7 +44,7 @@
                                     title="重置"><i class="fa fa-rotate-left"></i>
                             </button>
                         </div>
-                        <div class="col-md-1 col-sm-1 col-xs-12" style="text-align:left;">
+                        <div class="col-md-1 col-sm-1 col-xs-12" style="text-align:left;margin-left: 5px;">
                             <button type="button" style="margin-left:3px" id="btn_daily" class="btn btn-primary"
                                     title="结账处理">结账处理
                             </button>

src/main/resources/templates/daily_repeat_print.html

@@ -33,36 +33,39 @@
                     </div>
                     <div class="form-group col-md-8 col-sm-8 col-xs-12">
                         <!--<div class="col-md-6 col-sm-6 col-xs-12"></div>-->
-                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="reportrange"> 日结时间
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="reportrange"> 日结时间
                         </label>
-                        <div class="col-md-3 col-sm-3 col-xs-12">
+                        <div class="col-md-4 col-sm-4 col-xs-12">
                             <div id="reportrange" class="pull-right"
                                  style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc">
                                 <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
                                 <span>December 30, 2014 - January 28, 2015</span> <b class="caret"></b>
                             </div>
                         </div>
-                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="cashParam">收费员
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="cashParam">收费员
                         </label>
                         <div class="col-md-2 col-sm-2 col-xs-12">
                             <select class="form-control selectpicker show-tick" data-live-search="true" title="请选择"
                                     id="cashParam" onchange="getDcountDateList()">
                             </select>
                         </div>
-                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="rjList">日结列表
+                    </div>
+                    <div class="btn-group col-md-4 col-sm-4 col-xs-12"></div>
+                    <div class="form-group col-md-8 col-sm-8 col-xs-12">
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="rjList">日结列表
                         </label>
-                        <div class="col-md-2 col-sm-2 col-xs-12">
+                        <div class="col-md-4 col-sm-4 col-xs-12">
                             <select class="form-control selectpicker show-tick" data-live-search="true" title="请选择"
                                     id="rjList" onchange="initFeeTable()">
                             </select>
                         </div>
-                        <div class="col-md-1 col-sm-1 col-xs-12" style="text-align:left;">
-                            <button type="button" style="margin-left:20px" id="btn_clean" class="btn btn-primary"
+                        <div class="col-md-2 col-sm-2 col-xs-12" style="text-align:left;">
+                            <button type="button" style="margin-left:50px" id="btn_clean" class="btn btn-primary"
                                     title="重置"><i class="fa fa-rotate-left"></i>
                             </button>
                         </div>
                         <div class="col-md-1 col-sm-1 col-xs-12" style="text-align:left;">
-                            <button type="button" style="margin-left:3px" id="btn_daily" class="btn btn-primary"
+                            <button type="button" style="margin-left:50px" id="btn_daily" class="btn btn-primary"
                                     title="打印"><i class="fa fa-print"></i>
                             </button>
                         </div>