修复历史数据异常

src/main/java/cn/hnthyy/thmz/entity/his/ZyActpatient.java

@@ -148,6 +148,7 @@ public class ZyActpatient extends PageBean implements Comparable<ZyActpatient> {
     //门诊号码
     private String mzNo;//
     private String clinicDiagStr;//门诊诊断名称
+    //床位状态:1入院；2：安排；3:待出院;4:转科;5:出院9：召回
     private String bedStatus;//
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

src/main/java/cn/hnthyy/thmz/mapper/his/MzVisitTableMapper.java

@@ -74,4 +74,18 @@ public interface MzVisitTableMapper {
             "first_or_not,receive_flag,sick_date,rtrim(icd_text) icd_text,rtrim(symptom) symptom,jz_flag,responce_type,dwmc,gh_serial_no from mz_visit_table where " +
             "patient_id= #{patientId,jdbcType=VARCHAR} and times = #{times}")
     MzVisitTable selectByPatientIdAndTimes(@Param("patientId") String patientId,@Param("times") Integer times);
+
+
+    /**
+     * 按照病人编号和就诊次数查询就诊信息 历史数据
+     *
+     * @param patientId 病人编号
+     *
+     * @return
+     */
+    @Select("select rtrim(patient_id) patient_id,times,rtrim(visit_dept_code) visit_dept_code,rtrim(doctor_code) doctor_code,visit_date,rtrim(icd_code) icd_code," +
+            "receipt_no,order_no,req_fee,cancel_mark,error_mark,rtrim(op_id) op_id,op_day,rtrim(req_dept_code) req_dept_code,rtrim(req_doctor) req_doctor,windows_no," +
+            "first_or_not,receive_flag,sick_date,rtrim(icd_text) icd_text,rtrim(symptom) symptom,jz_flag,responce_type,dwmc,gh_serial_no from mz_visit_table_b where " +
+            "patient_id= #{patientId,jdbcType=VARCHAR} and times = #{times}")
+    MzVisitTable selectHisDataByPatientIdAndTimes(@Param("patientId") String patientId,@Param("times") Integer times);
 }

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

@@ -5,6 +5,7 @@ import cn.hnthyy.thmz.common.Constants;
 import cn.hnthyy.thmz.entity.his.Employee;
 import cn.hnthyy.thmz.entity.his.MzDepositFile;
 import cn.hnthyy.thmz.entity.his.MzVisitTable;
+import cn.hnthyy.thmz.enums.YesNoEnum;
 import cn.hnthyy.thmz.mapper.his.EmployeeMapper;
 import cn.hnthyy.thmz.mapper.his.MzDepositFileMapper;
 import cn.hnthyy.thmz.mapper.his.MzVisitTableMapper;
@@ -97,14 +98,14 @@ public class MzDepositFileServiceImpl implements MzDepositFileService {
         List<Map<String, Object>> resultList = new ArrayList<>();
         Map<String, String> employeeMap = null;
         Set<String> set = new HashSet<>();
-        employeeMap = getStringStringMap(list, resultList, employeeMap,set);
+        employeeMap = getStringStringMap(list, resultList, employeeMap,set,YesNoEnum.NO);
         mzDepositFile.setTableName("mz_deposit_file_b");
         list = mzDepositFileMapper.selectMzDepositFileWithPage(mzDepositFile);
-        getStringStringMap(list, resultList, employeeMap,set);
+        getStringStringMap(list, resultList, employeeMap,set,YesNoEnum.YES);
         return resultList;
     }
 
-    private Map<String, String> getStringStringMap(List<MzDepositFile> list, List<Map<String, Object>> resultList, Map<String, String> employeeMap,Set<String> set) {
+    private Map<String, String> getStringStringMap(List<MzDepositFile> list, List<Map<String, Object>> resultList, Map<String, String> employeeMap, Set<String> set, YesNoEnum hisData) {
         if (list != null && list.size() > 0) {
             if (employeeMap == null) {
                 List<Employee> employees = employeeMapper.selectAll();
@@ -122,6 +123,9 @@ public class MzDepositFileServiceImpl implements MzDepositFileService {
                 map.put("amount", mf.getAmount());
                 map.put("hisOrdNum",hisOrdNum);
                 MzVisitTable mzVisitTable = mzVisitTableMapper.selectByPatientIdAndTimes(mf.getPatientId(), mf.getTimes());
+                if(mzVisitTable==null && YesNoEnum.YES.equals(hisData)){
+                    mzVisitTable=mzVisitTableMapper.selectHisDataByPatientIdAndTimes(mf.getPatientId(), mf.getTimes());
+                }
                 if (mzVisitTable != null) {
                     map.put("visitDeptName", zdUnitCodeService.queryDeptNameByIdInCache(mzVisitTable.getVisitDeptCode()));
                     map.put("doctorName", employeeMap.get(mzVisitTable.getDoctorCode()));

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

@@ -0,0 +1,12 @@
+package cn.hnthyy.thmz.service.impl.thmz;
+
+import cn.hnthyy.thmz.service.thmz.ZyjsService;
+
+import java.util.Map;
+
+public class ZyjsServiceImpl implements ZyjsService {
+    @Override
+    public Map<String, Object> getActOrders(String inpatientNo, String admissTimes) {
+        return null;
+    }
+}

src/main/java/cn/hnthyy/thmz/service/thmz/ZyjsService.java

@@ -0,0 +1,17 @@
+package cn.hnthyy.thmz.service.thmz;
+
+import java.util.Map;
+
+/**
+ * 出院结算 丁捷服务
+ */
+public interface ZyjsService {
+    /**
+     * 出院结算
+     *
+     * @param inpatientNo
+     * @param admissTimes
+     * @return
+     */
+    Map<String, Object> getActOrders(String inpatientNo, String admissTimes);
+}

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

@@ -311,11 +311,11 @@ function initFeeTable() {
                 valign: 'middle',
                 // sortable: true,
                 formatter: function (value, row, index) {
-                    var str = '<button type="button" class="registration-no-color-foot-button" title="费用明细" onclick="chargeDetailModal(\'' + row.patientId + '\',' + row.times + ',' + row.receiptNo + ')"><i class="fa fa-plus"></i></button>';
-                    str += '<button type="button" class="registration-no-color-foot-button" title="诊断查询" onclick="diagnoseQuery(\'' + row.patientId + '\',' + row.times + ')"><i class="fa fa-search-minus"></i></button>';
+                    var str = '';
                     var payMarkGroup = getIndex("pay_mark_group");
                     if (payMarkGroup == 0) {
-                        str += '<button type="button" class="registration-no-color-foot-button"title="确认收费" onclick="tipHaveTally(' + row.amount + ',\'' + row.patientId + '\',' + row.times + ',\'' + row.name + '\',' + row.receiptNo + ')"><i class="fa fa-rmb"></i></button>';
+                        if(row.bedStatus==3)
+                        str += '<button type="button" class="registration-no-color-foot-button"title="出院结算" onclick="settlement(' + row.amount + ',\'' + row.patientId + '\',' + row.times + ',\'' + row.name + '\',' + row.receiptNo + ')"><i class="fa fa-credit-card"></i></button>';
                     }
                     if (payMarkGroup == 1) {
                         str += '<button type="button" class="registration-no-color-foot-button" title="退费" onclick="refundFee(\'' + row.patientId + '\',' + row.times + ',' + row.receiptNo + ',' + row.printFlag + ');"><i class="fa fa-reply"></i></button>';
@@ -382,6 +382,16 @@ function initFeeTable() {
     });
 }
 
+
+
+
+
+
+function settlement() {
+    $("#settlementModal").modal();
+}
+
+
 /**
  * 更新病人缴费记录病人姓名
  * @param index

src/main/resources/templates/actpatient.html

@@ -94,403 +94,28 @@
 </div>
 
 
-<!--收费弹窗开始-->
-<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="confirmFeeModal">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 680px;margin-left: 120px;">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" onclick="cancelFee()"><span aria-hidden="true">×</span>
-                </button>
-                <h4 class="modal-title">收费</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal form-label-left" id="payForm" novalidate>
-                    <div class="item form-group"
-                         style="padding: 20px 10px;background: rgb(245, 246, 250);border-radius: 4px;border: none;">
-                        <div class="col-md-12 col-sm-12 col-xs-12">
-                            <div class="col-md-3 col-sm-3 col-xs-12">
-                                <div class="total"> 合计：
-                                    <span class="amountMoney" id="amountMoneyConfirm">0.00</span><span>元</span>
-                                </div>
-                            </div>
-                            <div class="col-md-6 col-sm-6 col-xs-12">
-                                <label class="control-label col-md-4 col-sm-4 col-xs-12" for="realMoney">实收：
-                                </label>
-                                <div class="col-md-8 col-sm-8 col-xs-12">
-                                    <input id="realMoney" class="form-control col-md-5 col-xs-12" type="number"
-                                           data-placement="bottom-right" min="0" onchange="checkFee(false)" readonly>
-                                    <input id="fundPay"  type="hidden" readonly>
-                                </div>
-                            </div>
-                            <div class="col-md-3 col-sm-3 col-xs-12" style="line-height: 34px;">
-                                <span>元（折扣</span><span class="amountMoney" id="discount">100</span><span>%）</span>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="item form-group pay-item">
-                        <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="col-md-3 col-sm-3 col-xs-12" for="cash">
-                                <select class="form-control selectpicker show-tick" required="true"
-                                        id="payType" onchange="checkFee(false)"></select>
-                            </label>
-                            <div class="col-md-3 col-sm-3 col-xs-12">
-                                <input id="cash" class="form-control col-md-5 col-xs-12" type="number"
-                                       data-placement="bottom-right" min="0" onchange="checkFee(false)">
-                            </div>
-                            <div class="col-md-1 col-sm-1 col-xs-12" style="line-height: 34px;">元</div>
-                            <div class="col-md-3 col-sm-3 col-xs-12 hide">
-                                <button type="button" class="btn btn-primary" id="addPayType">
-                                    <span>增加收款方式</span>
-                                </button>
-                                <input type="hidden" id="payTypeIndex" value="0"/>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="item form-group" id="changeAmountParent">
-                        <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="changeAmount">找零金额：
-                            </label>
-                            <div class="col-md-3 col-sm-3 col-xs-12">
-                                <input id="changeAmount" class="form-control col-md-5 col-xs-12"
-                                       data-placement="bottom-right" readonly>
-                            </div>
-                            <div class="col-md-1 col-sm-1 col-xs-12" style="line-height: 34px;">元</div>
-                        </div>
-                    </div>
-                    <div class="item form-group">
-                        <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="changeAmount">剩余应收：
-                            </label>
-                            <div class="col-md-3 col-sm-3 col-xs-12">
-                                <input id="surplusAmount" class="form-control col-md-5 col-xs-12"
-                                       data-placement="bottom-right" readonly>
-                            </div>
-                            <div class="col-md-1 col-sm-1 col-xs-12" style="line-height: 34px;">元</div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <!--<div style="float: left;margin-left: 10px;">-->
-                <!--<input type="checkbox"/>&nbsp;&nbsp;打印-->
-                <!--</div>-->
-                <!--<input type="hidden" id="benYuanJiZhangTimes"/>-->
-                <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>
-            </div>
-        </div>
-    </div>
-</div>
-<!--收费弹窗结尾-->
 
 
-<!--收费明细弹窗开始-->
-<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="chargeDetailModal">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 980px;">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
-                </button>
-                <h4 class="modal-title">费用明细</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal form-label-left" novalidate>
-                    <div class="btn-group col-md-4 col-sm-4 col-xs-12" id="bill_item_group">
-                        <button class="btn btn-sm btn-primary" type="button" onclick="billItemButtonChange(this)">&nbsp;&nbsp;西成药&nbsp;&nbsp;
-                        </button>
-                        <button class="btn btn-sm btn-default" type="button" onclick="billItemButtonChange(this)">&nbsp;&nbsp;中草药&nbsp;&nbsp;
-                        </button>
-                        <button class="btn btn-sm btn-default" type="button" onclick="billItemButtonChange(this)">&nbsp;&nbsp;诊疗与医技&nbsp;&nbsp;
-                        </button>
-                    </div>
-                    <table id="charge_detail_table" style="margin-top: 10px;"></table>
-                    <!--查询收费明细所需条件-->
-                    <input id="patientIdChargeItem" type="hidden"/>
-                    <!--查询收费明细所需条件-->
-                    <input id="timesChargeItem" type="hidden"/>
-                    <!--查询收费明细所需条件-->
-                    <input id="receiptNoChargeItem" type="hidden"/>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!--收费明细弹窗结尾-->
-
-
-<!--病人存在记账信息弹窗开始-->
-<div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="haveTallyModal"
-     style="top:20%;">
-    <div class="modal-dialog modal-sm">
-        <div class="modal-content" style="width: 680px;margin-left: -120px;">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span
-                        aria-hidden="true">×</span>
-                </button>
-                <h4 class="modal-title">提示</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal form-label-left" novalidate>
-                    <div class="col-md-2 col-sm-2 col-xs-12">
-                        <i class="fa fa-info-circle blue fa-3x"></i>
-                    </div>
-                    <div class="col-md-10 col-sm-10 col-xs-12"
-                         style="font-size: 14px;font-weight: 700;height: 39px;line-height: 39px;">
-                        该病人还有<span id="totalTallyAmount" style="color: red">0.00</span>元记账记录未缴费，是否查询记账记录明细？
-                    </div>
-                    <!--查询记账明细所需条件-->
-                    <input id="patientIdHaveTally" type="hidden"/>
-                    <!--查询记账明细所需条件-->
-                    <input id="nameHaveTally" type="hidden"/>
-                    <!--查询记账明细所需条件-->
-                    <input id="dataIdHaveTally" type="hidden"/>
-                    <!--查询记账明细所需条件-->
-                    <input id="timesHaveTally" type="hidden"/>
-                    <!--查询记账明细所需条件-->
-                    <input id="receiptNoHaveTally" type="hidden"/>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="initTallyDetailTable()">确定</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!--病人存在记账信息弹窗结尾-->
-
-
-<!--本院记账明细弹窗开始-->
-<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="tallyDetailModal">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 980px;">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span
-                        aria-hidden="true">×</span>
-                </button>
-                <h4 class="modal-title">本院记账明细</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal form-label-left" novalidate style="overflow:scroll;height: 400px;">
-                    <table id="tally_detail_table"></table>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <!--<button type="button" class="btn btn-primary" onclick="confirmFeeModal(true)">收费</button>-->
-                <button type="button" class="btn btn-default" data-dismiss="modal">
-                    关闭
-                </button>
-            </div>
-        </div>
-    </div>
-</div>
-<!--本院记账明细弹窗结尾-->
-
-
-<!--窗口设置弹窗开始-->
-<!--<div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="editWindowsModal"
-     style="top:20%;">
-    <div class="modal-dialog modal-sm">
-        <div class="modal-content" style="width: 480px;">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
-                </button>
-                <h4 class="modal-title">窗口设置</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal form-label-left" novalidate autocomplete="off">
-                    <div class="item form-group">
-                        <div class="col-md-12 col-sm-12 col-xs-12 item">
-                            <label class="control-label col-md-3 col-sm-3 col-xs-12" for="windowsNum">窗口号 <span
-                                    class="required">*</span>
-                            </label>
-                            <div class="col-md-3 col-sm-3 col-xs-12">
-                                <input id="windowsNum" class="form-control col-md-7 col-xs-12"
-                                       data-validate-length-range="1,3"
-                                       placeholder="请输入" required="required" type="text" data-placement="bottom-right">
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="saveWindows()">确定</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-            </div>
-        </div>
-    </div>
-</div>-->
-<!--窗口设置弹窗结尾-->
-
-
-<!--打印设置弹窗开始-->
-<!--<div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="editPrintModal"-->
-<!--style="top:20%;">-->
-<!--<div class="modal-dialog modal-sm">-->
-<!--<div class="modal-content" style="width: 480px;">-->
-<!--<div class="modal-header">-->
-<!--<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>-->
-<!--</button>-->
-<!--<h4 class="modal-title">打印设置</h4>-->
-<!--</div>-->
-<!--<div class="modal-body">-->
-<!--<form class="form-horizontal form-label-left" novalidate autocomplete="off">-->
-<!--<div class="item form-group">-->
-<!--<div class="col-md-1 col-sm-1 col-xs-12 item"></div>-->
-<!--<div class="col-md-3 col-sm-3 col-xs-12 item">-->
-<!--<label class="control-label" for="printSelect">打印机名称 <span-->
-<!--class="required">*</span>-->
-<!--</label>-->
-<!--</div>-->
-<!--<div class="col-md-7 col-sm-7 col-xs-12 item">-->
-<!--<select class="form-control selectpicker show-tick" required="required" id="printSelect">-->
-<!--</select>-->
-<!--</div>-->
-<!--<div class="col-md-1 col-sm-1 col-xs-12 item"></div>-->
-<!--</div>-->
-<!--</form>-->
-<!--</div>-->
-<!--<div class="modal-footer">-->
-<!--<button type="button" class="btn btn-primary" onclick="savePrint()">确定</button>-->
-<!--<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!--打印设置弹窗结尾-->
-
-
-<!--退费明细弹窗开始-->
-<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="refundFeeDetailModal">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 1080px;">
-            <div class="modal-header">
-                <button type="button" class="close" onclick="closeRefundFeeDetailModal()"><span
-                        aria-hidden="true">×</span>
-                </button>
-                <h4 class="modal-title">费用明细</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal form-label-left row pre-scrollable" novalidate>
-                    <table id="refund_fee_detail_table"></table>
-                    <!--查询退费明细所需条件-->
-                    <input id="patientIdRefund" type="hidden"/>
-                    <!--查询退费明细所需条件-->
-                    <input id="timesRefund" type="hidden"/>
-                    <!--查询退费明细所需条件-->
-                    <input id="receiptNoRefund" type="hidden"/>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <span style="margin-right: 100px;">应退金额(元)</span><span style="margin-right: 100px;" id="refundFeePrepare">0.00</span>
-                <button type="button" class="btn btn-primary" onclick="readyRefundFee()">退费</button>
-                <button type="button" class="btn btn-default" onclick="closeRefundFeeDetailModal()">关闭</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!--退费明细弹窗结尾-->
-
-
-<!--退费重收弹窗开始-->
-<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="refundFeeModal">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 900px;margin-left: -100px;">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
-                </button>
-                <h4 class="modal-title">退费重收</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal form-label-left" novalidate>
-                    <table id="refund_fee_table"></table>
-                    <div class="btn-group col-md-4 col-sm-4 col-xs-12 hide" id="refund_bill_item_group"
-                         style="margin-top: 20px;margin-bottom: 20px;">
-                        <button class="btn btn-sm btn-primary" type="button" onclick="refundBillItemButtonChange(this)">
-                            &nbsp;&nbsp;西成药&nbsp;&nbsp;
-                        </button>
-                        <button class="btn btn-sm btn-default" type="button" onclick="refundBillItemButtonChange(this)">
-                            &nbsp;&nbsp;中草药&nbsp;&nbsp;
-                        </button>
-                        <button class="btn btn-sm btn-default" type="button" onclick="refundBillItemButtonChange(this)">
-                            &nbsp;&nbsp;诊疗与医技&nbsp;&nbsp;
-                        </button>
-                    </div>
-                    <table id="refund_fee_bill_table"></table>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!--退费重收弹窗结尾-->
-
-
-<!--重打发票弹窗开始-->
-<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="repPrintModal">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 420px;margin-left: 200px;">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
-                </button>
-                <h4 class="modal-title">发票重打</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal form-label-left" novalidate>
-                    <table class="table table-striped table-bordered">
-                        <thead>
-                        <tr>
-                            <th>发票号<span style="font-size: 1px;margin-left: 20px;" id="tip_message">请选择需要重新打印的发票号</span>
-                            </th>
-                        </tr>
-                        </thead>
-                        <tbody id="repPrintTable">
-                        </tbody>
-                    </table>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!--重打发票弹窗结尾-->
-
-
-<!--诊断弹窗开始-->
-<div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="diagnoseModal"
+<!--出院结算弹窗开始-->
+<div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="settlementModal"
      style="top:20%;">
     <div class="modal-dialog modal-sm">
         <div class="modal-content" style="width: 480px;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
-                <h4 class="modal-title">诊断内容</h4>
+                <h4 class="modal-title">出院结算</h4>
             </div>
             <div class="modal-body">
-                <form class="form-horizontal form-label-left" novalidate>
-                    <div class="col-md-12 col-sm-12 col-xs-12"
-                         style="font-size: 14px;font-weight: 700;height: 39px;line-height: 39px;" id="diagnose">
-                    </div>
-                </form>
+               <table id="settlement_table"></table>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="$('#diagnoseModal').modal('hide')">确定</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
             </div>
         </div>
     </div>
 </div>
-<!--诊断弹窗结尾-->
+<!--出院结算弹窗结尾-->
 
 <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>