Selaa lähdekoodia

出院结算优化

hurugang 2 vuotta sitten
vanhempi
commit
71ec49c553
1 muutettua tiedostoa jossa 170 lisäystä ja 171 poistoa
  1. 170 171
      src/main/resources/static/js/zy/actpatient.js

+ 170 - 171
src/main/resources/static/js/zy/actpatient.js

@@ -681,188 +681,187 @@ function settlement(inpatientNo, admissTimes) {
  */
 function execute() {
     var dismissFlag = $("#dismissFlag").val();
-    if (dismissFlag == "2" && ($("#myDatepicker").val() == null || $("#myDatepicker").val() == "")) {
+    var myDatepicker=$("#myDatepicker").find('input').val();
+    if (dismissFlag == "2" && (myDatepicker == null || myDatepicker == "")) {
         errorMesageSimaple("中间断帐时间必选");
         return;
     }
-    if (dismissFlag == "1") {
-        $.ajax({
-            type: "GET",
-            url: '/thmz/getIntervalDayForLeaveHis?inpatientNo=' + $("#inpatientNoParams").val() + "&admissTimes=" + $("#admissTimesParams").val(),
-            contentType: "application/json;charset=UTF-8",
-            dataType: "json",
-            headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
-            async: false,
-            success: function (res) {
-                if (res == '401' || res == 401) {
-                    window.location.href = '/thmz/login/view'
-                    return;
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getIntervalDayForLeaveHis?inpatientNo=' + $("#inpatientNoParams").val() + "&admissTimes=" + $("#admissTimesParams").val(),
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        async: false,
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                if (res.data != null) {
+                    if (!confirm(res.message)) {
+                        return;
+                    }
                 }
-                if (res.code == 0) {
-                    if (res.data != null) {
-                        if (!confirm(res.message)) {
+                $.ajax({
+                    type: "GET",
+                    url: '/thmz/executeNew?inpatientNo=' + $("#inpatientNoParams").val() + "&admissTimes=" + $("#admissTimesParams").val() + "&dismissFlag=" + dismissFlag + "&zjdzDatetime=" + myDatepicker,
+                    contentType: "application/json;charset=UTF-8",
+                    dataType: "json",
+                    headers: {
+                        'Accept': 'application/json',
+                        'Authorization': 'Bearer ' + localStorage.getItem("token")
+                    },
+                    async: false,
+                    success: function (res) {
+                        if (res == '401' || res == 401) {
+                            window.location.href = '/thmz/login/view'
                             return;
                         }
-                    }
-                    $.ajax({
-                        type: "GET",
-                        url: '/thmz/executeNew?inpatientNo=' + $("#inpatientNoParams").val() + "&admissTimes=" + $("#admissTimesParams").val() + "&dismissFlag=" + dismissFlag + "&zjdzDatetime=" + $("#myDatepicker").find("input").val(),
-                        contentType: "application/json;charset=UTF-8",
-                        dataType: "json",
-                        headers: {
-                            'Accept': 'application/json',
-                            'Authorization': 'Bearer ' + localStorage.getItem("token")
-                        },
-                        async: false,
-                        success: function (res) {
-                            if (res == '401' || res == 401) {
-                                window.location.href = '/thmz/login/view'
-                                return;
-                            }
-                            if (res.code == 0) {
-                                successMesage(res);
-                                $("#settlementModal").modal("hide");
-                                clearMode();
-                                $('#tb_table').bootstrapTable("refresh");
-                                return;
-                            }
-                            if (res.code == -1) {
-                                errorMesage(res);
-                                return;
-                            }
-                            if (res.code == -2) {
-                                $("#settlementModal").modal("hide");
-                                $("#ycyzModal").modal();
-                                clearMode();
-                                var data = res.data;
-                                $('#settlement_table').bootstrapTable("destroy");
-                                $('#settlement_table').bootstrapTable({
-                                    data: data,         //请求后台的URL(*)
-                                    //method: 'post',                      //请求方式(*)
-                                    toolbar: '#toolbar',                //工具按钮用哪个容器
-                                    striped: true,                      //是否显示行间隔色
-                                    cache: false,                       //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*)
-                                    pagination: true,                   //是否显示分页(*)
-                                    sortable: true,                     //是否启用排序
-                                    sortOrder: "asc",                   //排序方式
-                                    //queryParams: queryParams,           //传递参数(*)
-                                    sidePagination: "client",           //分页方式:client客户端分页,server服务端分页(*)
-                                    pageNumber: 1,                       //初始化加载第一页,默认第一页
-                                    pageSize: 2,                       //每页的记录行数(*)
-                                    pageList: [2, 5, 10, 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: [
-                                        // {
-                                        //     checkbox: true
-                                        // },
-                                        {
-                                            field: 'chargeStatus',
-                                            title: '异常状态',
-                                            align: "center",
-                                            valign: 'middle',
-                                            formatter: function (value, row, index) {
-                                                if (value == 5) {
-                                                    return '<span style="color:#1E90FF">未确认药</span>';
-                                                }
-                                                if (value == 6) {
-                                                    return '<span style="color:#FFA500">未接收</span>';
-                                                }
-                                                if (value == 8) {
-                                                    return '<span style="color:#FF4500">医技未确认</span>';
-                                                }
+                        if (res.code == 0) {
+                            successMesage(res);
+                            $("#settlementModal").modal("hide");
+                            clearMode();
+                            $('#tb_table').bootstrapTable("refresh");
+                            return;
+                        }
+                        if (res.code == -1) {
+                            errorMesage(res);
+                            return;
+                        }
+                        if (res.code == -2) {
+                            $("#settlementModal").modal("hide");
+                            $("#ycyzModal").modal();
+                            clearMode();
+                            var data = res.data;
+                            $('#settlement_table').bootstrapTable("destroy");
+                            $('#settlement_table').bootstrapTable({
+                                data: data,         //请求后台的URL(*)
+                                //method: 'post',                      //请求方式(*)
+                                toolbar: '#toolbar',                //工具按钮用哪个容器
+                                striped: true,                      //是否显示行间隔色
+                                cache: false,                       //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*)
+                                pagination: true,                   //是否显示分页(*)
+                                sortable: true,                     //是否启用排序
+                                sortOrder: "asc",                   //排序方式
+                                //queryParams: queryParams,           //传递参数(*)
+                                sidePagination: "client",           //分页方式:client客户端分页,server服务端分页(*)
+                                pageNumber: 1,                       //初始化加载第一页,默认第一页
+                                pageSize: 2,                       //每页的记录行数(*)
+                                pageList: [2, 5, 10, 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: [
+                                    // {
+                                    //     checkbox: true
+                                    // },
+                                    {
+                                        field: 'chargeStatus',
+                                        title: '异常状态',
+                                        align: "center",
+                                        valign: 'middle',
+                                        formatter: function (value, row, index) {
+                                            if (value == 5) {
+                                                return '<span style="color:#1E90FF">未确认药</span>';
+                                            }
+                                            if (value == 6) {
+                                                return '<span style="color:#FFA500">未接收</span>';
                                             }
-                                        }, {
-                                            field: 'orderNo',
-                                            title: '医嘱号',
-                                            align: "center",
-                                            valign: 'middle'
-                                        }, {
-                                            field: 'orderName',
-                                            title: '医嘱名称',
-                                            align: "center",
-                                            valign: 'middle',
-                                        }, {
-                                            field: 'frequCode',
-                                            title: '频率',
-                                            align: "center",
-                                            valign: 'middle',
-                                        }, {
-                                            field: 'cxFlag',
-                                            title: '撤销',
-                                            align: "center",
-                                            valign: 'middle',
-                                            formatter: function (value, row, index) {
-                                                if (value == 1) {
-                                                    return "是";
-                                                }
-                                                return "否";
+                                            if (value == 8) {
+                                                return '<span style="color:#FF4500">医技未确认</span>';
                                             }
-                                        }, {
-                                            field: 'startTime',
-                                            title: '开始时间',
-                                            align: "center",
-                                            valign: 'middle'
-                                        }, {
-                                            field: 'endTime',
-                                            title: '结束时间',
-                                            align: "center",
-                                            valign: 'middle',
-                                        }, {
-                                            field: 'physician',
-                                            title: '医生',
-                                            align: "center",
-                                            valign: 'middle',
-                                        }, {
-                                            field: 'enterOper',
-                                            title: '录入人',
-                                            align: "center",
-                                            valign: 'middle',
-                                        }, {
-                                            field: 'wardName',
-                                            title: '病区',
-                                            align: "center",
-                                            valign: 'middle'
                                         }
-                                    ],
-                                    onClickRow: function (row) {
-                                        var dataDetal = row.list;
-                                        setSettlementTableDetail(dataDetal);
-                                    },
-                                });
-                                //第一次初始化医嘱列表的时候需要同步初始化子医嘱列表
-                                setSettlementTableDetail(data[0].list);
-                            }
-                            if (res.code == -3) {
-                                $("#settlementModal").modal("hide");
-                                clearMode();
-                            }
+                                    }, {
+                                        field: 'orderNo',
+                                        title: '医嘱号',
+                                        align: "center",
+                                        valign: 'middle'
+                                    }, {
+                                        field: 'orderName',
+                                        title: '医嘱名称',
+                                        align: "center",
+                                        valign: 'middle',
+                                    }, {
+                                        field: 'frequCode',
+                                        title: '频率',
+                                        align: "center",
+                                        valign: 'middle',
+                                    }, {
+                                        field: 'cxFlag',
+                                        title: '撤销',
+                                        align: "center",
+                                        valign: 'middle',
+                                        formatter: function (value, row, index) {
+                                            if (value == 1) {
+                                                return "是";
+                                            }
+                                            return "否";
+                                        }
+                                    }, {
+                                        field: 'startTime',
+                                        title: '开始时间',
+                                        align: "center",
+                                        valign: 'middle'
+                                    }, {
+                                        field: 'endTime',
+                                        title: '结束时间',
+                                        align: "center",
+                                        valign: 'middle',
+                                    }, {
+                                        field: 'physician',
+                                        title: '医生',
+                                        align: "center",
+                                        valign: 'middle',
+                                    }, {
+                                        field: 'enterOper',
+                                        title: '录入人',
+                                        align: "center",
+                                        valign: 'middle',
+                                    }, {
+                                        field: 'wardName',
+                                        title: '病区',
+                                        align: "center",
+                                        valign: 'middle'
+                                    }
+                                ],
+                                onClickRow: function (row) {
+                                    var dataDetal = row.list;
+                                    setSettlementTableDetail(dataDetal);
+                                },
+                            });
+                            //第一次初始化医嘱列表的时候需要同步初始化子医嘱列表
+                            setSettlementTableDetail(data[0].list);
                         }
-                    });
-                    return;
-                }
-                if (res.code == -1) {
-                    errorMesage(res);
-                    return;
-                }
+                        if (res.code == -3) {
+                            $("#settlementModal").modal("hide");
+                            clearMode();
+                        }
+                    }
+                });
+                return;
             }
-        });
-    }
+            if (res.code == -1) {
+                errorMesage(res);
+                return;
+            }
+        }
+    });
 }