Merge branch 'dev-1.1.4' into 'dev-1.1.4'

Map方法名修改

See merge request lihong/thmz_system!11

src/main/resources/static/js/button.js

@@ -48,7 +48,7 @@ function initAllParentMenu() {
             $.each(data.data, function (commentIndex, comment) {
                 html += '<option value="' + comment.id + '">' + comment.name + '</option>';
                 if (parentMap == null) {
-                    parentMap = new Map();
+                    parentMap = new MyMap();
                 }
                 parentMap.put(comment.id, comment.name);
             });

src/main/resources/static/js/charge/discount.js

@@ -474,7 +474,7 @@ function initDeptSelect() {
             $.each(data.data, function (commentIndex, comment) {
                 html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')</option>';
                 if (deptNoMap == null) {
-                    deptNoMap = new Map()
+                    deptNoMap = new MyMap()
                 }
                 deptNoMap.put(comment.code, comment.name);
             });
@@ -509,7 +509,7 @@ function initZdChargeSelect() {
             $.each(data.data, function (commentIndex, comment) {
                 html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.code + ')</option>';
                 if (chargeItemMap == null) {
-                    chargeItemMap = new Map()
+                    chargeItemMap = new MyMap()
                 }
                 chargeItemMap.put(comment.code, comment.name);
             });

src/main/resources/static/js/common/map-util.js

@@ -3,7 +3,7 @@
  * 描述：js实现的map方法
  * @returns {Map}
  */
-function Map(){
+function MyMap(){
     var struct = function(key, value) {
         this.key = key;
         this.value = value;
@@ -52,7 +52,7 @@ function Map(){
     };
     //   获取key集合
     var keySet = function() {
-       return this.keyArr;
+        return this.keyArr;
     };
     this.arr = new Array();
     this.keyArr = new Array();

src/main/resources/static/js/doctorIndex.js

@@ -174,13 +174,11 @@ function today_Date(e) {
     return formattedDate
 }
 
-var option1;
-var option;
-var myChart1;
-var myChart;
+let option = null, option1 = null,myChart = null,myChart1= null
 $(function () {
-    //     // 柱状图
+        //     // 柱状图
     myChart1 = echarts.init(document.getElementById('canvas'))
+
     option1 = {
         legend: {},
         tooltip: {},
@@ -252,8 +250,10 @@ $(function () {
     window.addEventListener("resize", function() {
         myChart1.resize()
     })
-    //     // 折线图
+
+        //     // 折线图
     myChart= echarts.init(document.getElementById('canvas1'))
+
     option = {
         title: {
             text: ''

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

@@ -598,7 +598,7 @@ function initSelect() {
             $.each(data.data, function (commentIndex, comment) {
                 html += '<option value="' + comment.code + '">' + comment.name + '</option>';
                 if (classCodeMap == null) {
-                    classCodeMap = new Map()
+                    classCodeMap = new MyMap()
                 }
                 classCodeMap.put(comment.code, comment.name);
             });
@@ -631,7 +631,7 @@ function initSelect() {
                 //html += '<option value="' + comment.code + '">' + comment.name + '</option>';
                 html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')</option>';
                 if (auditCodeMap == null) {
-                    auditCodeMap = new Map()
+                    auditCodeMap = new MyMap()
                 }
                 auditCodeMap.put(comment.code, comment.name);
             });
@@ -664,7 +664,7 @@ function initSelect() {
                 //html += '<option value="' + comment.code + '">' + comment.name + '</option>';
                 html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')</option>';
                 if (billItemZyMap == null) {
-                    billItemZyMap = new Map()
+                    billItemZyMap = new MyMap()
                 }
                 billItemZyMap.put(comment.code, comment.name);
             });
@@ -696,7 +696,7 @@ function initSelect() {
                 //html += '<option value="' + comment.code + '">' + comment.name + '</option>';
                 html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')</option>';
                 if (billItemMzMap == null) {
-                    billItemMzMap = new Map()
+                    billItemMzMap = new MyMap()
                 }
                 billItemMzMap.put(comment.code, comment.name);
             });

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

@@ -1050,7 +1050,7 @@ function initGroupOrder() {
     $('#groupId').selectpicker('refresh');
     $("#groupId").selectpicker('val', 1);
     $('#groupId').selectpicker('refresh');
-    groupIdMap = new Map();
+    groupIdMap = new MyMap();
 }
 
 /**
@@ -2971,8 +2971,8 @@ function resetNewGroupId(type) {
         var xyTabContents = $("#xyTabContent").find("div.tab-pane");
         //西药设置
         if (xyTabContents != null && xyTabContents.length > 0) {
-            groupIdMap = new Map();
-            gropuIdAndOrderNoMap = new Map();
+            groupIdMap = new MyMap();
+            gropuIdAndOrderNoMap = new MyMap();
             var newGroupId = 1;
             gropuIdAndOrderNoMap.put(1, 0);
             var prevGroupId = null;
@@ -2989,7 +2989,7 @@ function resetNewGroupId(type) {
                         $(formGroups[j]).find("input.temporary_items_groupId").val(newGroupId);
                         var map = groupIdMap.get(newGroupId + '');
                         if (map == null) {
-                            map = new Map();
+                            map = new MyMap();
                             map.put("supplyType", $(formGroups[j]).find("input.temporary_items_supplyType").val());
                             map.put("orderFrequency", $(formGroups[j]).find("input.temporary_items_orderFrequency").val());
                             map.put("dayNum", $(formGroups[j]).find("input.temporary_items_dayNum").val());
@@ -3012,8 +3012,8 @@ function resetNewGroupId(type) {
  * @param type 回写类型  0 全部回写 1 医疗范文 2 就诊详情
  */
 function editPrescription(jsonData, type) {
-    orderNoAndTableIdMap = new Map();
-    tableIdAndOrderNoMap = new Map();
+    orderNoAndTableIdMap = new MyMap();
+    tableIdAndOrderNoMap = new MyMap();
     var firstOrNot = jsonData.firstOrNot;
     var conciseRecordsFlag = false;
     if (type == 1) {
@@ -3169,9 +3169,9 @@ function editPrescription(jsonData, type) {
     //门诊手术选中的数据组
     var opRecordArrays = [];
     //组号与同组药数量的map
-    var groupOrderAndLengthMap = new Map();
+    var groupOrderAndLengthMap = new MyMap();
     //处方号与同处方号药数量的map
-    var orderNoAndLengthMap = new Map();
+    var orderNoAndLengthMap = new MyMap();
     //住院回写
     var zyReqCallBack = false;
     if (type == 1) {
@@ -3206,7 +3206,7 @@ function editPrescription(jsonData, type) {
         //当前实际回写的组号
         var currentOrderNo = null;
         //处方号与药品类型关系
-        var orderAndGroupNoMap = new Map();
+        var orderAndGroupNoMap = new MyMap();
         // mzChargeDetailList.sort(function (a, b) {
         //     return a.groupNo - b.groupNo
         // });
@@ -4408,7 +4408,7 @@ function saveWesternMedicine(calculateTotalAmountFlag) {
         return;
     }
     if (gropuIdAndOrderNoMap == null) {
-        gropuIdAndOrderNoMap = new Map();
+        gropuIdAndOrderNoMap = new MyMap();
     }
     var exitIndex = gropuIdAndOrderNoMap.get(groupId);
     if (exitIndex == null) {
@@ -4620,7 +4620,7 @@ function saveWesternMedicine(calculateTotalAmountFlag) {
     //设置药品的用法，频次，天数
     var map = groupIdMap.get(groupId);
     if (map == null) {
-        map = new Map();
+        map = new MyMap();
         map.put("supplyType", supplyType);
         map.put("orderFrequency", orderFrequency);
         map.put("dayNum", dayNum);
@@ -10346,7 +10346,7 @@ function setPrint() {
 function setTableHtml(prescriptionDetail) {
     //设置成组处方符号
     if (prescriptionDetail.length > 1) {
-        var map = new Map();
+        var map = new MyMap();
         var groupOrderlist = [];
         for (var j = 0; j < prescriptionDetail.length; j++) {
             var detail = prescriptionDetail[j];

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

@@ -1498,7 +1498,7 @@ function initZdChargeSelect() {
             $.each(data.data, function (commentIndex, comment) {
                 html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.code + ')</option>';
                 if (chargeItemMap == null) {
-                    chargeItemMap = new Map()
+                    chargeItemMap = new MyMap()
                 }
                 chargeItemMap.put(comment.code, comment.chargeAmount);
             });

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

@@ -6,7 +6,7 @@ var showTwoTable = false;
 //保存临时生成的新号表数据
 var tempData = null;
 //科室编码与挂号单元数关系
-var unitNumMap = new Map();
+var unitNumMap = new MyMap();
 $(function () {
     daterangepickerWithIdAndCallBack('sourceRange', initSourceList);
     daterangepickerWithIdAndCallBack('newRange', initSourceList);

src/main/resources/static/js/yf/yf_divide.js

@@ -1,6 +1,6 @@
 //@ sourceURL=yf_divide.js
 var pharmacyGroupNo = window.localStorage["groupNo"];//药房编码
-var divideDrugMap = new Map();//分装药品集
+var divideDrugMap = new MyMap();//分装药品集
 $(function () {
     $(".selectpicker").selectpicker();
     //$("#pharmacyModal").modal("show");
@@ -68,7 +68,7 @@ $(function () {
                 if (res.code == 0) {
                     $('#tb_table').bootstrapTable('removeAll');
                     $('#tb_table_divide').bootstrapTable('removeAll');
-                    divideDrugMap = new Map();
+                    divideDrugMap = new MyMap();
                     successMesage(res);
                 } else {
                     errorMesage(res);

src/main/resources/templates/doctorIndex.html

@@ -1,6 +1,7 @@
 <link rel="stylesheet" href="/thmz/css/bootstrap/css/bootstrap-progressbar-3.3.4.min.css"/>
 <link rel="stylesheet" href="/thmz/css/custom.min.css">
 <link rel="stylesheet" href="/thmz/css/doctorIndex.css">
+<!--<script src="/thmz/js/echarts/echarts.min.js"></script>-->
 <!--<script src="/thmz/js/dependent/jquery.min.js"></script>-->
 <script src="/thmz/js/dependent/moment.min.js"></script>
 <script src="/thmz/js/echarts/echarts.min.js"></script>