病历合并和提取功能

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

@@ -347,7 +347,19 @@ public class MzBlRecordController {
             if (StringUtils.isBlank(targetMzBlRecord.getEmrProcess())) {
                 targetMzBlRecord.setEmrProcess("");
             }
+            String bcProcess="";
+            if (baseMzBlRecord.getEmrProcess().indexOf("_补充处理：") > 0) {
+                bcProcess+=baseMzBlRecord.getEmrProcess().substring(baseMzBlRecord.getEmrProcess().indexOf("_补充处理：")+6);
+                baseMzBlRecord.setEmrProcess(baseMzBlRecord.getEmrProcess().substring(0, baseMzBlRecord.getEmrProcess().indexOf("_补充处理：")));
+            }
+            if (targetMzBlRecord.getEmrProcess().indexOf("_补充处理：") > 0) {
+                bcProcess+=targetMzBlRecord.getEmrProcess().substring(targetMzBlRecord.getEmrProcess().indexOf("_补充处理：")+6);
+                targetMzBlRecord.setEmrProcess(targetMzBlRecord.getEmrProcess().substring(0, targetMzBlRecord.getEmrProcess().indexOf("_补充处理：")));
+            }
             baseMzBlRecord.setEmrProcess(baseMzBlRecord.getEmrProcess()+targetMzBlRecord.getEmrProcess());
+            if (bcProcess != null && StringUtils.isNotBlank(bcProcess)) {
+                baseMzBlRecord.setEmrProcess(baseMzBlRecord.getEmrProcess() + "_补充处理：" + bcProcess);
+            }
             mzBlRecordService.modifyMzBlRecordEmrProcess(baseMzBlRecord);
             resultMap.put("code", 0);
             resultMap.put("message", "提取门诊病历的处理意见成功");

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

@@ -6492,6 +6492,7 @@ function visitingDetailModal(patientId, times, clnicId, clinicStatus) {
  * @param type 0 已诊患者列表发起 1 历史轨迹发起
  */
 function prescriptionDetailCommon(patientId, times, clnicId, payMark, type) {
+    $('#baseMzBlTimes').val(null);
     var oriPayMark = payMark;
     if (payMark == 1) {
         //退费时，查看的明细还是处方开立的情况
@@ -6750,6 +6751,10 @@ function prescriptionDetailCommon(patientId, times, clnicId, payMark, type) {
                     $("#printBlRecordSetup").off("click").on("click", function (t) {
                         printBlRecord(patientId, times, 2);
                     });
+                    $("#showMzBlRecordModal").removeClass("hide").addClass("in");
+                    $("#showMzBlRecordModal").off("click").on("click", function (t) {
+                        showMzBlRecordModal(patientId, times, 1);
+                    });
                     if (jsonData.mzZyReq == null || jsonData.mzZyReq.reqDept == null || jsonData.mzZyReq.reqDept == "") {
                         $("#printZyReq").removeClass("in").addClass("hide");
                         $("#printZyReq").off("click");
@@ -6767,6 +6772,10 @@ function prescriptionDetailCommon(patientId, times, clnicId, payMark, type) {
                     }
                 } else {
                     $("#printPrescription").removeClass("in").addClass("hide");
+                    $("#printZyReq").removeClass("in").addClass("hide");
+                    $("#printBlRecord").removeClass("in").addClass("hide");
+                    $("#printJcReq").removeClass("in").addClass("hide");
+                    $("#printJyReq").removeClass("in").addClass("hide");
                     $("#callPrescription").removeClass("hide").addClass("in");
                     $("#callPrescription").off("click").on("click", function (t) {
                         getMzPrescriptionVoPaid(patientId, times, clnicId);
@@ -8183,3 +8192,419 @@ function initCertificateTypeSelect() {
     });
 }
 
+/**
+ * 加载病历信息编辑预览
+ * @param patientId
+ * @param times
+ * @param type 1 编辑  2 预览
+ */
+function showMzBlRecordModal(patientId, times,type) {
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getMzBlrecord?patientId=' + patientId + '&times=' + times,
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                //$("#visitingDetailModal").modal("hide");
+                var mzPatientMi = res.mzPatientMi;
+                $("#editPatientId").text(mzPatientMi.patientId);
+                $("#editPatientName").text(mzPatientMi.name);
+                $("#editPatientGender").text(mzPatientMi.gender);
+                $("#editPatientAge").text(mzPatientMi.age + "岁");
+                var mzBlRecord = res.mzBlRecord;
+                // if (mzBlRecord.firstOrNot == "1") {
+                //     $("#firstOrNotTitle").text("复诊");
+                // } else {
+                //     $("#firstOrNotTitle").text("初诊");
+                // }
+                if (mzBlRecord.emrChiefComplaint != null && mzBlRecord.emrChiefComplaint != "") {
+                    $("#editEmrChiefComplaint").val(mzBlRecord.emrChiefComplaint);
+                    $("#editEmrChiefComplaint").parent().parent().parent().css("display", "block");
+                } else {
+                    $("#editEmrChiefComplaint").parent().parent().parent().css("display", "none");
+                }
+                if (mzBlRecord.emrHpi != null && mzBlRecord.emrHpi != "") {
+                    $("#editEmrHpi").val(mzBlRecord.emrHpi);
+                    $("#editEmrHpi").parent().parent().parent().css("display", "block");
+                } else {
+                    $("#editEmrHpi").parent().parent().parent().css("display", "none");
+                }
+                if (mzBlRecord.emrPs != null && mzBlRecord.emrPs != "") {
+                    $("#editEmrPs").val(mzBlRecord.emrPs);
+                    $("#editEmrPs").parent().parent().parent().css("display", "block");
+                } else {
+                    $("#editEmrPs").parent().parent().parent().css("display", "none");
+                }
+                if (mzBlRecord.personalHistory != null && mzBlRecord.personalHistory != "") {
+                    $("#editPersonalHistory").val(mzBlRecord.personalHistory);
+                    $("#editPersonalHistory").parent().parent().parent().css("display", "block");
+                } else {
+                    $("#editPersonalHistory").parent().parent().parent().css("display", "none");
+                }
+                if (mzBlRecord.familyHistory != null && mzBlRecord.familyHistory != "") {
+                    $("#editFamilyHistory").val(mzBlRecord.familyHistory);
+                    $("#editFamilyHistory").parent().parent().parent().css("display", "block");
+                } else {
+                    $("#editFamilyHistory").parent().parent().parent().css("display", "none");
+                }
+                if (mzBlRecord.obstericalHistory != null && mzBlRecord.obstericalHistory != "") {
+                    $("#editObstericalHistory").val(mzBlRecord.obstericalHistory);
+                    $("#editObstericalHistory").parent().parent().parent().css("display", "block");
+                } else {
+                    $("#editObstericalHistory").parent().parent().parent().css("display", "none");
+                }
+                var tz = getTz(mzBlRecord);
+                if (tz != null && tz != "") {
+                    $("#editTgjc").val(tz);
+                    $("#editTgjc").parent().parent().parent().css("display", "block");
+                } else {
+                    $("#editTgjc").parent().parent().parent().css("display", "none");
+                }
+                if (mzBlRecord.emrPe != null && mzBlRecord.emrPe != "") {
+                    $("#editQtjc").val(mzBlRecord.emrPe);
+                    $("#editQtjc").parent().parent().parent().css("display", "block");
+                } else {
+                    $("#editQtjc").parent().parent().parent().css("display", "none");
+                }
+                if (res.icdText != null && res.icdText != "") {
+                    $("#editZd").val(res.icdText);
+                    $("#editZd").parent().parent().parent().css("display", "block");
+                } else {
+                    $("#editZd").parent().parent().parent().css("display", "none");
+                }
+                if (mzBlRecord.emrProcess != null && mzBlRecord.emrProcess != "") {
+                    var reg = new RegExp("</br>", "g");//g,表示全部替换。
+                    $("#editEmrProcess").val(mzBlRecord.emrProcess.replace(reg, "\n"));
+                    $("#editEmrProcess").parent().parent().parent().css("display", "block");
+                } else {
+                    $("#editEmrProcess").parent().parent().parent().css("display", "none");
+                }
+                if (mzBlRecord.emrJkjy != null && mzBlRecord.emrJkjy != "" && mzBlRecord.emrJkjy != "无") {
+                    $("#editEmrJkjy").val(mzBlRecord.emrJkjy);
+                    $("#editEmrJkjy").parent().parent().parent().css("display", "block");
+                } else {
+                    $("#editEmrJkjy").parent().parent().parent().css("display", "none");
+                }
+                if(type==1){
+                    $("#mzBlRecorTitle").html("门诊病历【编辑】");
+                    $("#setOtherEmrProcess").removeClass("in").addClass("hide");
+                    $("#openBlRecordModel").removeClass("hide").addClass("in");
+                    $("#setEmrProcess").removeClass("hide").addClass("in");
+                    $("#newEmrProcessDiv").removeClass("hide").addClass("in");
+                    $("#visitingDetailModal").modal("hide");
+                }else if(type==2){
+                    $("#mzBlRecorTitle").html("门诊病历【预览】");
+                    $("#setOtherEmrProcess").removeClass("hide").addClass("in");
+                    $("#openBlRecordModel").removeClass("in").addClass("hide");
+                    $("#setEmrProcess").removeClass("in").addClass("hide");
+                    $("#newEmrProcessDiv").removeClass("in").addClass("hide");
+                    //因为预览的时候，关闭预览框没有清空数据，且 此时基础数据的病历次数被清空
+                    if($("#mzBlTimes").val()!=null && $("#mzBlTimes").val()!="" && ($("#baseMzBlTimes").val()==null || $("#baseMzBlTimes").val()=="")){
+                        $("#baseMzBlTimes").val($("#mzBlTimes").val());
+                    }
+                    $("#otherBlRecordModal").modal("hide");
+                }
+                $("#mzBlTimes").val(mzBlRecord.times);
+                $("#editMzBlRecordModal").modal();
+            } else {
+                errorMesage(res);
+            }
+        }
+    });
+}
+
+
+
+/**
+ * 清空区域
+ */
+function clearInput() {
+    //编辑病历的时候，没有基础病历的就诊次数，如果是预览病历的时候，有基础病历的次数
+    var baseMzBlTimes=$("#baseMzBlTimes").val();
+    $("#editPatientId").text(null);
+    $("#editPatientName").text(null);
+    $("#editPatientGender").text(null);
+    $("#editPatientAge").text(null);
+    $("#editEmrChiefComplaint").val(null);
+    $("#editEmrHpi").val(null);
+    $("#editEmrPs").val(null);
+    $("#editPersonalHistory").val(null);
+    $("#editFamilyHistory").val(null);
+    $("#editObstericalHistory").val(null);
+    $("#editTgjc").val(null);
+    $("#editQtjc").val(null);
+    $("#editZd").val(null);
+    $("#editEmrProcess").val(null);
+    $("#editEmrJkjy").val(null);
+    $("#newEmrProcess").val(null);
+    $("#mzBlTimes").val(null);
+    if(baseMzBlTimes!=null && baseMzBlTimes!=""){
+        $("#otherBlRecordModal").modal();
+    }
+
+
+}
+
+
+
+
+
+/**
+ * 保存门诊病历
+ */
+function setEmrProcess() {
+    $("#editMzBlRecordModal").modal("hide");
+    $("#messageModal").modal();
+    $("#messageContent").html("是否保存并替换已有补充处理意见?");
+    $("#messageButton").off("click").on("click", function (t) {
+        if ($("#newEmrProcess").val() == null || $("#newEmrProcess").val() == "") {
+            $("#messageContent").html("当前录入的补充处理为空，是否保存并替换已有补充处理意见?");
+            $("#messageButton").off("click").on("click", function (t) {
+                $("#messageModal").modal("hide");
+                sendEmrProcess();
+            });
+        } else {
+            $("#messageModal").modal("hide");
+            sendEmrProcess();
+        }
+    });
+    $("#cancelButton").off("click").on("click", function (t) {
+        $("#editMzBlRecordModal").modal();
+    });
+
+}
+
+
+
+/**
+ * 提交保存门诊病历
+ */
+function sendEmrProcess() {
+    $.ajax({
+        type: "POST",
+        url: '/thmz/setEmrProcess',
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        data: JSON.stringify({
+            "patientId": $("#editPatientId").text(),
+            "times": $("#mzBlTimes").val(),
+            "emrChiefComplaint": $("#editEmrChiefComplaint").val(),
+            "emrHpi": $("#editEmrHpi").val(),
+            "emrPs": $("#editEmrPs").val(),
+            "personalHistory": $("#editPersonalHistory").val(),
+            "familyHistory": $("#editFamilyHistory").val(),
+            "obstericalHistory": $("#editObstericalHistory").val(),
+            "emrJkjy": $("#editEmrJkjy").val(),
+            "emrProcess": $("#newEmrProcess").val()
+        }),
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                clearInput();
+                successMesage(res);
+                $("#editMzBlRecordModal").modal("hide");
+            } else {
+                errorMesage(res);
+            }
+        }
+    });
+}
+
+
+
+
+/**
+ * 打开待合并病历列表弹框
+ */
+function openBlRecordModel() {
+    $("#editMzBlRecordModal").modal("hide");
+    $("#otherBlRecordModal").modal();
+    initOtherMzBlRecordList();
+}
+
+
+/**
+ * 关闭待合并病历列表
+ */
+function closeBlRecordModel() {
+    $('#baseMzBlTimes').val(null);
+    $("#visitingDetailModal").modal();
+}
+
+
+/**
+ * 病历列表
+ */
+function initOtherMzBlRecordList() {
+    $('#other_bl_record_table').bootstrapTable("destroy");
+    $('#other_bl_record_table').bootstrapTable({
+        url: '/thmz/getMzBlRecordList',         //请求后台的URL（*）
+        method: 'post',                      //请求方式（*）
+        toolbar: '#toolbar',                //工具按钮用哪个容器
+        striped: true,                      //是否显示行间隔色
+        cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        pagination: true,                   //是否显示分页（*）
+        sortable: true,                     //是否启用排序
+        sortOrder: "desc",                   //排序方式
+        queryParams: queryOtherParams,           //传递参数（*）
+        sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
+        pageNumber: 1,                       //初始化加载第一页，默认第一页
+        pageSize: 5,                       //每页的记录行数（*）
+        pageList: [10, 15, 25, 50, 100],        //可供选择的每页的行数（*）
+        search: false,                       //是否显示表格搜索，此搜索是客户端搜索，不会进服务端，所以，个人感觉意义不大
+        strictSearch: true,
+        showColumns: false,                  //是否显示所有的列
+        showRefresh: false,                  //是否显示刷新按钮
+        minimumCountColumns: 2,             //最少允许的列数
+        clickToSelect: true,                //是否启用点击选中行
+        uniqueId: "ID",                     //每一行的唯一标识，一般为主键列
+        showToggle: false,                    //是否显示详细视图和列表视图的切换按钮
+        cardView: false,                    //是否显示详细视图
+        detailView: false,
+        //rowStyle:rowStyle,//通过自定义函数设置行样式
+        ajaxOptions: {
+            headers: {
+                'Accept': 'application/json',
+                'Authorization': 'Bearer ' + localStorage.getItem("token")
+            }
+        },
+        columns: [
+            {
+                title: '操作',
+                field: 'op',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    var str = '<button type="button" class="btn btn-primary  btn-sm" onclick="showMzBlRecordModal(\'' + row.patientId + '\',' + row.times + ',2)">预览<i class="fa fa-edit" style="margin-left: 10px;"></i></button>';
+                    return [str].join('');
+                }
+            },
+            {
+                field: 'patientId',
+                title: '门诊ID',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'patientName',
+                title: '患者姓名',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'deptCode',
+                title: '就诊科室',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'doctorCode',
+                title: '接诊医师',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'firstOrNot',
+                title: '初/复诊',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    if (value == '1') {
+                        return "复诊";
+                    }
+                    return "初诊";
+                }
+            }
+            , {
+                field: 'visitDate',
+                title: '就诊时间',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    if (value == null || value == "") {
+                        return "";
+                    }
+                    return format(value, "yyyy-MM-dd HH:mm:ss");
+                }
+            }
+        ],
+        responseHandler: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            var ress = eval(res);
+            if (ress.code == -1) {
+                if (ress.message != null && ress.message != '') {
+                    errorMesage(ress);
+                }
+                return {
+                    "total": 0,//总页数
+                    "rows": {}   //数据
+                };
+            }
+            return {
+                "total": ress.total,//总页数
+                "rows": ress.data   //数据
+            };
+        },
+    });
+}
+
+
+/**
+ * 构建列表查询参数
+ * @param params
+ * @returns {{mzChargeDetail: {patientId: string | number | string[] | undefined | jQuery, warnDept: string | number | string[] | undefined | jQuery, doctorCode: string | number | string[] | undefined | jQuery, name: string | number | string[] | undefined | jQuery, payMark: number}, beginTime: Date, endTime: Date, pageSize: *, pageIndex: number}}
+ */
+function queryOtherParams(params) {
+    var temp = {   //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
+        patientId: $("#editPatientId").text(),
+        exceptTimes: $("#mzBlTimes").val(),
+        pageSize: params.limit,   //页面大小
+        pageIndex: params.offset / params.limit,  //页码
+    };
+    return temp;
+}
+
+
+
+/**
+ * 提取处理意见保存
+ */
+function setOtherEmrProcess() {
+    $("#editMzBlRecordModal").modal("hide");
+    $("#messageModal").modal();
+    $("#messageContent").html("确定要执行此次提取处理意见操作吗?");
+    $("#messageButton").off("click").on("click", function (t) {
+        $("#messageModal").modal("hide");
+        $.ajax({
+            type: "GET",
+            url: '/thmz/extractEmrProcess?patientId=' + $("#editPatientId").html() + '&baseTimes=' + $("#baseMzBlTimes").val()+ '&times=' + $("#mzBlTimes").val(),
+            contentType: "application/json;charset=UTF-8",
+            dataType: "json",
+            headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+            success: function (res) {
+                if (res == '401' || res == 401) {
+                    window.location.href = '/thmz/login/view'
+                    return;
+                }
+                if (res.code == 0) {
+                    successMesage(res);
+                    $("#editMzBlRecordModal").modal("hide");
+                } else {
+                    errorMesage(res);
+                }
+            }
+        });
+    });
+    $("#cancelButton").off("click").on("click", function (t) {
+        $("#editMzBlRecordModal").modal();
+    });
+}

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

@@ -464,7 +464,7 @@ function getTz(mzBlRecord) {
 
 
 /**
- * 加载病历信息编辑
+ * 加载病历信息编辑预览
  * @param patientId
  * @param times
  * @param type 1 编辑  2 预览
@@ -605,8 +605,6 @@ function setEmrProcess() {
             sendEmrProcess();
         }
     });
-
-
 }
 
 /**

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

@@ -1304,6 +1304,7 @@
                 <button type="button" class="btn btn-primary hide" id="printJyReq">打印检验申请单</button>
                 <button type="button" class="btn btn-primary hide" id="printPrescription">打印处方、门诊指引单</button>
                 <button type="button" class="btn btn-primary hide" id="callPrescription">调用</button>
+                <button type="button" class="btn btn-primary hide" id="showMzBlRecordModal">病历编辑</button>
                 <button type="button" class="btn btn-primary hide" id="previewYjReq">检查检验报告</button>
                 <button type="button" class="btn btn-primary hide" id="previewYjReqAll">检查检验报告（含往期）</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
@@ -1461,7 +1462,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-primary" id="messageButton">确定</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal" id="cancelButton">取消</button>
             </div>
         </div>
     </div>
@@ -2473,6 +2474,179 @@
 <!--检查检验报告弹窗结尾-->
 
 
+<!--病历编辑弹窗开始-->
+<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="editMzBlRecordModal">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content" style="width: 680px;">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" onclick="clearInput()"><span aria-hidden="true">×</span>
+                </button>
+                <h4 class="modal-title modal-title-thmz" id="mzBlRecorTitle">门诊病历【编辑】</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal form-label-left" novalidate autocomplete="off">
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-3 col-sm-3 col-xs-12 item">
+                            <span>门诊Id：<span id="editPatientId"></span></span>
+                        </div>
+                        <div class="col-md-3 col-sm-3 col-xs-12 item">
+                            <span>姓名：<span id="editPatientName"></span></span>
+                        </div>
+                        <div class="col-md-3 col-sm-3 col-xs-12 item">
+                            <span>性别：<span id="editPatientGender"></span></span>
+                        </div>
+                        <div class="col-md-3 col-sm-3 col-xs-12 item">
+                            <span>年龄：<span id="editPatientAge"></span></span>
+                        </div>
+                    </div>
+
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editEmrChiefComplaint">主诉
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="editEmrChiefComplaint" class="form-control col-md-7 col-xs-12" type="text" >
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editEmrHpi">现病史
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="editEmrHpi" class="form-control col-md-7 col-xs-12" type="text" >
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editEmrPs">既往史
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="editEmrPs" class="form-control col-md-7 col-xs-12" type="text" >
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editPersonalHistory">个人史
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="editPersonalHistory" class="form-control col-md-7 col-xs-12" type="text" >
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editFamilyHistory">家族史
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="editFamilyHistory" class="form-control col-md-7 col-xs-12" type="text" >
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editObstericalHistory">婚育史
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="editObstericalHistory" class="form-control col-md-7 col-xs-12" type="text" >
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editTgjc">体格检查
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="editTgjc" class="form-control col-md-7 col-xs-12" type="text" readonly>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editQtjc">其他检查
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="editQtjc" class="form-control col-md-7 col-xs-12" type="text" readonly>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editZd">诊断
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="editZd" class="form-control col-md-7 col-xs-12" type="text" readonly>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editEmrProcess">已有处理（RP.）
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <textarea id="editEmrProcess" class="form-control col-md-7 col-xs-12" readonly style="min-height: 250px;"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editEmrJkjy">健康教育
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <textarea id="editEmrJkjy" class="form-control col-md-7 col-xs-12" style="min-height: 80px;"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert" id="newEmrProcessDiv">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="newEmrProcess">补充处理（RP.）
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <textarea id="newEmrProcess" class="form-control col-md-7 col-xs-12" style="min-height: 80px;"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <!--本次病历的就诊次数-->
+                <input id="mzBlTimes" type="hidden"/>
+                <!-- 合并处方的基础就诊次数-->
+                <input id="baseMzBlTimes" type="hidden"/>
+                <button type="button" class="btn btn-primary hide" onclick="setOtherEmrProcess()" id="setOtherEmrProcess">提取处理意见</button>
+                <button type="button" class="btn btn-primary" onclick="openBlRecordModel()" id="openBlRecordModel">合并病历列表</button>
+                <button type="button" class="btn btn-primary" onclick="setEmrProcess()" id="setEmrProcess">保存</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal" onclick="clearInput()">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!--病历编辑弹窗结尾-->
+
+
+<!--待合并病历列表弹框开始-->
+<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="otherBlRecordModal">
+    <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" onclick="closeBlRecordModel()"><span aria-hidden="true">×</span>
+                </button>
+                <h4 class="modal-title modal-title-thmz">待合并病历列表</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal form-label-left" novalidate>
+                    <table id="other_bl_record_table" style="margin-top: 10px;"></table>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal" onclick="closeBlRecordModel()">关闭</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>

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

@@ -329,7 +329,7 @@
                <!-- 合并处方的基础就诊次数-->
                 <input id="baseMzBlTimes" type="hidden"/>
                 <button type="button" class="btn btn-primary hide" onclick="setOtherEmrProcess()" id="setOtherEmrProcess">提取处理意见</button>
-                <button type="button" class="btn btn-primary" onclick="openBlRecordModel()" id="openBlRecordModel">合并病历列</button>
+                <button type="button" class="btn btn-primary" onclick="openBlRecordModel()" id="openBlRecordModel">合并病历列表</button>
                 <button type="button" class="btn btn-primary" onclick="setEmrProcess()" id="setEmrProcess">保存</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal" onclick="clearInput()">取消</button>
             </div>