修改有效期取值问题以及下拉选加载，模糊搜索报错问题

src/main/java/cn/hnthyy/thmz/controller/yf/YfDivideController.java

@@ -49,6 +49,10 @@ public class YfDivideController {
                 resultMap.put("data", "");
                 return resultMap;
             }
+
+            // 替换因拼音隔音符号导致的问题
+            searchText = searchText.replace("'", "");
+
             List<YpZdDictVo> list = ypBaseYfService.queryYpBaseYfLike(searchText.toUpperCase(), groupNo);
             resultMap.put("code", 0);
             resultMap.put("message", "查询药品成功");

src/main/java/cn/hnthyy/thmz/controller/yf/YfIncomingRecordsController.java

@@ -62,6 +62,10 @@ public class YfIncomingRecordsController {
                 resultMap.put("data", "");
                 return resultMap;
             }
+
+            // 替换因拼音隔音符号导致的问题
+            searchTextDrug = searchTextDrug.replace("'", "");
+
             List<YpZdDict> list = ypZdDictService.queryYpBySearchText(searchTextDrug.toUpperCase());
             for (int i = 0; i < list.size(); i++) {
                 YpZdDict ypZdDict = list.get(i);
@@ -94,6 +98,10 @@ public class YfIncomingRecordsController {
                 resultMap.put("message", "查询成功");
                 return resultMap;
             }
+
+            // 替换因拼音隔音符号导致的问题
+            searchText = searchText.replace("'", "");
+
             List<YpZdManufactory> ypZdManufactories = ypZdManufactoryService.queryYpZdManufactoryBySearchText(searchText.toUpperCase());
             resultMap.put("code", 0);
             resultMap.put("message", "查询制造厂商成功");
@@ -123,6 +131,10 @@ public class YfIncomingRecordsController {
                 resultMap.put("message", "查询成功");
                 return resultMap;
             }
+
+            // 替换因拼音隔音符号导致的问题
+            searchText = searchText.replace("'", "");
+
             List<Employee> employees = employeeService.queryEmployeeBySearchText(searchText.toUpperCase());
             employees.forEach(employee -> {
                 employee.setDeptName(zdUnitCodeService.queryDeptNameByIdInCache(employee.getDeptCode()));

src/main/java/cn/hnthyy/thmz/controller/yf/YfInventoryListController.java

@@ -58,6 +58,10 @@ public class YfInventoryListController {
         try {
             if (!StringUtils.isBlank(searchText)) {
                 searchText = searchText.toUpperCase();
+
+                // 替换因拼音隔音符号导致的问题
+                searchText = searchText.replace("'", "");
+
             }
             if (StringUtils.isBlank(classCode)) {
                 classCode = null;

src/main/java/cn/hnthyy/thmz/controller/yk/YpBaseController.java

@@ -47,6 +47,12 @@ public class YpBaseController {
                 resultMap.put("data", "");
                 return resultMap;
             }
+
+            // 替换因拼音隔音符号导致的问题
+            if(null != ypZdDictVo.getSearchText()){
+                ypZdDictVo.setSearchText(ypZdDictVo.getSearchText().replace("'", ""));
+            }
+
             List<YpZdDictVo> list = ypBaseService.queryYpZdBaseByLike(ypZdDictVo);
             resultMap.put("code", 0);
             resultMap.put("message", "查询药品成功");

src/main/java/cn/hnthyy/thmz/controller/yk/YpZdSupplyController.java

@@ -41,6 +41,10 @@ public class YpZdSupplyController {
                 resultMap.put("message", "查询成功");
                 return resultMap;
             }
+
+            // 替换因拼音隔音符号导致的问题
+            searchText = searchText.replace("'", "");
+
             List<YpZdSupply> ypZdSupplys = ypZdSupplyService.queryYpZdSupplyBySearchText(searchText.toUpperCase());
             resultMap.put("code", 0);
             resultMap.put("message", "查询供应商信息成功");

src/main/resources/static/js/common/pharmacy-com.js

@@ -264,7 +264,7 @@ function showDrugPopover(data) {
                 };
             }
             return {
-                "total": ress.data.length,//总页数
+                "total": typeof(ress.data) == 'undefined' ? 0 : ress.data.length,//总页数
                 "rows": ress.data   //数据
             };
         }
@@ -342,7 +342,7 @@ function showEmployeePopover(data) {
                 };
             }
             return {
-                "total": ress.data.length,//总页数
+                "total": typeof(ress.data) == 'undefined' ? 0 : ress.data.length,//总页数
                 "rows": ress.data   //数据
             };
         }
@@ -415,7 +415,7 @@ function showManufactoryPopover(data) {
                 };
             }
             return {
-                "total": ress.data.length,//总页数
+                "total": typeof(ress.data) == 'undefined' ? 0 : ress.data.length,//总页数
                 "rows": ress.data   //数据
             };
         }
@@ -488,7 +488,7 @@ function showSupplyPopover(data) {
                 };
             }
             return {
-                "total": ress.data.length,//总页数
+                "total": typeof(ress.data) == 'undefined' ? 0 : ress.data.length,//总页数
                 "rows": ress.data   //数据
             };
         }

src/main/resources/static/js/yk/drug_storage.js

@@ -414,7 +414,7 @@ function initDetailed() {
         sortname: 'chargeCode', //设置默认的排序列
         sortorder: 'desc',
         cellsubmit: "remote",
-        colNames: ['药品编码', '药品名称', '生产厂家', '规格', '零售价', '零售金额', '购入价', '购入量', '购入金额', '效期', '生产日期', '批号', '传票号', '传票日期', '文号', '入库人',
+        colNames: ['药品编码', '药品名称', '生产厂家', '规格', '零售价', '零售金额', '购入价', '购入量', '购入金额', '有效期', '生产日期', '批号', '传票号', '传票日期', '文号', '入库人',
             '入库类别名称','入库类别', '结账标记', '发票日期', '规格编码', '生成厂家编码', '序号', '审核状态'],
         colModel: [
             {name: 'chargeCode', index: 'chargeCode', align: 'center', width: 100, sortable: false},

src/main/resources/templates/yk/drug_storage.html

@@ -299,7 +299,7 @@
                                 <div class="col-md-2 col-sm-2 col-xs-12">
                                     <input id="producingDate" name="producingDate" class="form-control optional datetime" type="text" >
                                 </div>
-                                <label class="control-label col-md-2 col-sm-2 col-xs-12" for="effDate">失效期:
+                                <label class="control-label col-md-2 col-sm-2 col-xs-12" for="effDate">有效期:
                                 </label>
                                 <div class="col-md-2 col-sm-2 col-xs-12">
                                     <input id="effDate" name="effDate" class="form-control optional datetime" type="text">