From 9678bda4e95add4a6c2be2360b824293fb7d9b86 Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Tue, 20 Apr 2021 10:48:58 +0800
Subject: [PATCH] 价格增加大于0的判断

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html |   64 ++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
index dc6173c..b8c8229 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
@@ -10,15 +10,15 @@
         <div class="layui-form toolbar">
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <input type="text" name="date" id="datebegin" lay-verify="date" autocomplete="off"
-                        class="layui-input search-input" />&emsp;至&emsp;
-                    <input type="text" name="date" id="dateend" lay-verify="date" autocomplete="off"
-                        class="layui-input search-input" />&emsp;
-                    <input id="childName" class="layui-input search-input" type="text" placeholder="按患者名" />&emsp;
-                    <input id="diagnosticDoctorName" class="layui-input search-input" type="text"
-                        placeholder="按诊断医生名" />&emsp;
-                    <input id="hospitalName" class="layui-input  search-input" type="text" placeholder="按医院名,必选条件！"
-                        autocomplete="off" /></div>&emsp;
+                    <input type="text" name="date" id="datebegin" lay-verify="date"
+                           class="layui-input search-input" />&emsp;至&emsp;
+                    <input type="text" name="date" id="dateend" lay-verify="date"
+                           class="layui-input search-input" />&emsp;
+                    <input id="childName" class="layui-input search-input"  type="text" placeholder="按患者名" />&emsp;
+                    <input id="diagnosticDoctorName" class="layui-input search-input" autocomplete="off"  type="text"
+                           placeholder="按诊断医生名" />&emsp;
+                    <input id="hospitalName" class="layui-input  search-input"   type="text" placeholder="按医院名,必选条件！"
+                           autocomplete="off" /></div>&emsp;
                 <button id="diagnostic-btn-search" class="layui-btn icon-btn permissions"  permissions="diagnostic-get">
                     <i class="layui-icon">&#xe615;</i>搜索</button>
 
@@ -74,10 +74,16 @@
                 { field: 'diagnosticDepartName', width: "10%", title: '科室名称' },
                 { field: 'diagnosticDoctorName', width: "10%", title: '医生姓名' },
                 { field: 'childName', width: "10%", title: '患者姓名' },
-                { field: 'childSex', width: "10%", title: '性别' },
+                { field: 'childSex', width: "10%", title: '性别',templet:function(d){
+                        if(d.childSex==0){
+                            return "男";
+                        }else if(d.childSex==1){
+                            return "女";
+                        }
+                    } },
                 { field: 'childBirthday', width: "10%", title: '出生日期',templet:function(d){
-                    return new Date(d.createTime).dateFormat("yyyy-MM-dd");
-                }},
+                        return new Date(d.childBirthday).dateFormat("yyyy-MM-dd");
+                    }},
                 { field: 'childPhone', width: "10%", title: '联系电话' },
                 {
                     field: 'isDeleted', sort: true, align: 'center', width: 100, templet: function (d) {
@@ -98,7 +104,10 @@
                 },
                 {
                     field: 'updateTime', width: "10%", sort: true, title: '修改时间', templet: function (d) {
-                        return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
+                        if(d.updateTime==null){
+                            return "";
+                        }
+                        return new Date(d.updateTime).dateFormat("yyyy-MM-dd hh:mm");
                     }
                 },
                 { field: 'enabled', width: "10%", templet: '#diagnostic-table-bar', title: '查看' }
@@ -131,24 +140,31 @@
                     endTime: dateend
                 };
                 table.reload('diagnostic-table', { where: whereData,page: {curr: 1  }});
+            }else{
+                layer.msg('请输入医院');
+                return false;
             }
         });
+        //获取软件的服务周期
+        var getCycleTime = function (departmentId) {
+
+        }
         // 工具条点击事件
         table.on('tool(diagnostic-table)', function (obj) {
             var data = obj.data;
             var layEvent = obj.event;
             if (layEvent === "select") {
-                //查看报告  报告列数据缓存起来
-                admin.putTempData("t_diagnosis", data);
-                admin.popupCenter({
-                    title: '查看报告',
-                    path: 'pages/opration/recordNote.html',
-                    area: '1200px',
-                    offset: '10px',
-                    finish: function () {
-                        admin.putTempData("t_diagnosis", "");
-                    }
-                });
+                admin.req('api-opration/productorderrecord/pdfname/'+data.diagnosticId+"/0/"+data.diagnosticHospitalId+"/"+data.diagnosticDepartId, {},
+                    function (data) {
+                        if (data.code == 0) {
+                            //打开新的窗口
+                            window.open(data.data)
+                        }else{
+                            layer.msg("查询报告失败")
+                        }
+
+                    }, "post")
+                admin.re
             }
         });
     });

--
Gitblit v1.8.0