增加项目类型提示

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

@@ -4784,7 +4784,25 @@ function loadjcJyItemList() {
                 align: "center",
                 valign: 'middle',
                 // sortable: true
-            }
+            }, {
+                field: 'type',
+                title: '项目类型',
+                align: "center",
+                valign: 'middle',
+                // sortable: true
+                formatter: function (value, row, index) {
+                    if(value==1 || value=="1"){
+                        return "检验";
+                    }
+                    if(value==2 || value=="2"){
+                        return "辅助检查";
+                    }
+                    if(value==3 || value=="3"){
+                        return "诊疗";
+                    }
+                    return "";
+                }
+            },
         ],
         responseHandler: function (res) {
             if (res == '401' || res == 401) {
@@ -8155,8 +8173,16 @@ function queryInspectionDetail(orderId) {
                         for (var i = 0; i < inspectionItems.length; i++) {
                             html += "<tr>";
                             var obj = inspectionItems[i];
-                            var itm_VALUE = (obj.itm_VALUE == null || obj.itm_VALUE == "" || obj.itm_VALUE == "null") ? obj.itm_STR_VALUE : obj.itm_VALUE;
-                            var range = (obj.range == null || obj.range == "" || obj.range == "null") ? obj.range_STR : obj.range;
+                            var itm_VALUE =obj.itm_VALUE;
+                            if(itm_VALUE==null || itm_VALUE=="null"){
+                                itm_VALUE="";
+                            }
+                            itm_VALUE+= (obj.itm_STR_VALUE == null || obj.itm_STR_VALUE == "null") ? "" : obj.itm_STR_VALUE;
+                            var range =obj.range;
+                            if(range==null || range=="null"){
+                                range="";
+                            }
+                            range+= (obj.range_STR == null || obj.range_STR == "null") ? "" : obj.range_STR;
                             html += "<td width='25%'>" + obj.itm_NAME + "</td>";
                             html += "<td width='16.66%'>" + itm_VALUE + "</td>";
                             html += "<td width='16.66%'>" + obj.itm_UNIT + "</td>";

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

@@ -511,8 +511,16 @@ function queryInspectionDetail(orderId) {
                         for (var i = 0; i < inspectionItems.length; i++) {
                             html += "<tr>";
                             var obj = inspectionItems[i];
-                            var itm_VALUE = (obj.itm_VALUE == null || obj.itm_VALUE == "" || obj.itm_VALUE == "null") ? obj.itm_STR_VALUE : obj.itm_VALUE;
-                            var range = (obj.range == null || obj.range == "" || obj.range == "null") ? obj.range_STR : obj.range;
+                            var itm_VALUE =obj.itm_VALUE;
+                            if(itm_VALUE==null || itm_VALUE=="null"){
+                                itm_VALUE="";
+                            }
+                            itm_VALUE+= (obj.itm_STR_VALUE == null || obj.itm_STR_VALUE == "null") ? "" : obj.itm_STR_VALUE;
+                            var range =obj.range;
+                            if(range==null || range=="null"){
+                                range="";
+                            }
+                            range+= (obj.range_STR == null || obj.range_STR == "null") ? "" : obj.range_STR;
                             html += "<td width='25%'>" + obj.itm_NAME + "</td>";
                             html += "<td width='16.66%'>" + itm_VALUE + "</td>";
                             html += "<td width='16.66%'>" + obj.itm_UNIT + "</td>";