提交临床诊断 医院下拉

health-admin/src/main/java/com/bzd/web/controller/dtp/ConfigInfoController.java

@@ -78,11 +78,14 @@ public class ConfigInfoController extends BaseController {
     @RequiresPermissions("dtp:configInfo:list")
     @PostMapping("/dtpHospitalList")
     @ResponseBody
-    public TableDataInfo dtpHospitalList() throws Exception {
+    public AjaxResult dtpHospitalList() throws Exception {
         PageData pd = this.getPageData();
+        AjaxResult ajax = new AjaxResult();
         startPage();
         List<PageData> pageData = dtpService.findHospitalList(pd);
-        return  getDataTable(pageData);
+        ajax.put("code", 200);
+        ajax.put("value", pageData);
+        return  ajax;
     }
     /**
      * 药品名单

health-admin/src/main/java/com/bzd/web/controller/dtp/RecipeRegisterController.java

@@ -376,6 +376,27 @@ public class RecipeRegisterController extends BaseController {
         List<PageData> pageData =dtpService.findRevieForList(pd);
         return  AjaxResult.success(pageData);
     }
+    @GetMapping("/typeDate")
+    @ResponseBody
+    public AjaxResult typeDate() throws Exception
+    {
+        AjaxResult ajax = new AjaxResult();
+        PageData pd = this.getPageData();
+        List<PageData> list = dtpService.typeDate(pd);
+        ajax.put("code", 200);
+        ajax.put("value", list);
+        return ajax;
+    }
 
+    @GetMapping("/typeDate2")
+    @ResponseBody
+    public AjaxResult typeDate2(@RequestParam(value = "jbtype", required = false) String jbtype, ModelMap mmap) throws Exception {
+        AjaxResult ajax = new AjaxResult();
+        PageData pd = this.getPageData();
+        List<PageData> list = dtpService.typeDate2(pd);
+        ajax.put("code", 200);
+        ajax.put("value", list);
+        return ajax;
+    }
 
 }

health-admin/src/main/resources/templates/dtp/recipe/edit.html

@@ -48,10 +48,11 @@
                 <label class="is-required">主管医生:</label>
                 <input name="attendingDoctor" id="attendingDoctor" placeholder="主管医生"   class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label class="is-required">临床诊断:</label>
-                <input name="clinicalDiagnosis" id="clinicalDiagnosis" placeholder="临床诊断"   class="styled-input" type="text">
-            </div>
+
+<!--            <div class="customize-form-group">-->
+<!--                <label class="is-required">临床诊断:</label>-->
+<!--                <input name="clinicalDiagnosis" id="clinicalDiagnosis" placeholder="临床诊断"   class="styled-input" type="text">-->
+<!--            </div>-->
             <div class="customize-form-group">
                 <label>处方图片:</label>
                 <input name="prescriptionImageUrl" id="prescriptionImageUrl" placeholder="处方图片"  class="styled-input" type="text">
@@ -82,6 +83,18 @@
                 <label>审核药师姓名:</label>
                 <input name="reviewingName" id="reviewingName" placeholder="审核药师姓名" readonly disabled  class="styled-input" type="text">
             </div>
+            <div class="customize-form-group">
+                <label>临床诊断大类：</label>
+                <select id="category-select"   class="styled-input form-control select2-multiple" multiple placeholder="请选择或输入搜索">
+                    <option value="">临床诊断大类</option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>临床诊断小类：</label>
+                <select id="subcategory-select" class="styled-input form-control select2-multiple" multiple placeholder="请选择或输入搜索">
+                    <option value="">临床诊断小类</option>
+                </select>
+            </div>
         </div>
     </form>
     <input type="hidden" id="id" name="id" th:value="${id}">
@@ -196,7 +209,12 @@
     var shangcigyList=[];
     var dataList=[];
     var selectdataList=[];
-
+    /*<![CDATA[*/
+    var dl  = /*[[${dl}]]*/ '';
+    /*]]>*/
+    /*<![CDATA[*/
+    var xl  = /*[[${xl}]]*/ '';
+    /*]]>*/
     $(document).ready(function() {
         // 获取所有的输入元素（input, textarea, select）
         var $inputs = $('form').find('input, textarea, select').filter(':visible');
@@ -237,9 +255,135 @@
                 getLastRecipe(patientId);
             }
         });
+        // 初始化 Select2 插件
+        $('#category-select').select2({
+            placeholder: "请选择或直接输入搜索",
+            //allowClear: true //在输入框最后 有一个 删除所有的X 但是会出现 第一个删除出现问题有空格
+        });
 
+        $('#category-select').on('select2:select', function(e) {
+            var clearSpan = $('.select2-selection-clear');
+            if (clearSpan.length > 0) {
+                clearSpan.remove();
+            }
+        });
+
+        // 发送 AJAX 请求获取疾病大类数据
+        $.ajax({
+            url: prefix_recipe+'/typeDate',
+            method: 'GET',
+            dataType: 'json',
+            success: function(data) {
+                var options = $('#category-select');
+                // 清空已有选项（除了第一个默认选项）
+                options.find('option').not(':first').remove();
+                $('<option>', {
+                    value: '',
+                    text : '请选择疾病类型'
+                }).appendTo(options);
+                // 遍历返回的数据并添加选项
+                $.each(data.value, function(index, item) {
+                    $('<option>', {
+                        value: item.id,
+                        text : item.categoryName
+                    }).appendTo(options);
+
+                });
+                var dlParsed = JSON.parse(dl);
+
+                // 确保 dl 和 xl 是数组后，再进行 map 操作
+                if (Array.isArray(dlParsed)) {
+                    var dlIds = dlParsed.map(function (item) {
+                        return item.id;
+                    }); // 转换为 ID 数组
+
+                    // 设置默认选中的 dl 选项
+                    options.val(dlIds).trigger('change');
+
+                    /*$('#category-select').select2({
+                        placeholder: "请选择或直接输入搜索",
+                        //allowClear: true //在输入框最后 有一个 删除所有的X 但是会出现 第一个删除出现问题有空格
+                    });*/
+                    // 加载对应的 xl 数据
+                    loadSubcategories(dlIds);
+                }
+                // 重新初始化 Select2 以反映新的选项
+                options.trigger('change');
+            },
+            error: function(xhr, status, error) {
+                console.error("Failed to load disease categories:", error);
+            }
+        });
+
+        // 初始化子类别下拉框
+        $('#subcategory-select').select2({
+            placeholder: "请选择或直接输入搜索",
+            //allowClear: true
+        });
+
+        // 监听第一个下拉框的选择事件
+        $('#category-select').on('change', function() {
+            var selectedCategory = $(this).val();
+            if (selectedCategory.length > 0) {
+                loadSubcategories(selectedCategory);
+            } else {
+                // 如果没有选择任何项，清空子类别下拉框
+                $('#subcategory-select').find('option').not(':first').remove();
+                $('#subcategory-select').trigger('change');
+            }
+        });
 
     });
+    var flag="";
+    function loadSubcategories(categoryId) {
+        console.log("categoryId"+categoryId);//categoryId1,3,5
+        const categoryIdStr = String(categoryId);
+        const flagStr = String(flag);
+        if(flagStr===categoryIdStr){
+            return;
+        }
+        flag = categoryId;
+
+        // 模拟从服务器获取子类别数据
+        $.ajax({
+            url: prefix_recipe+'/typeDate2?jbtype=' + categoryId, // 假设 ctx 是你的上下文路径
+            method: 'GET',
+            dataType: 'json',
+            success: function(data) {
+                var options = $('#subcategory-select');
+                // 清空已有选项（除了第一个默认选项）
+                options.find('option').not(':first').remove();
+
+                // 遍历返回的数据并添加选项
+                $.each(data.value, function(index, item) {
+                    $('<option>', {
+                        value: item.ida,
+                        text : item.categoryNamea
+                    }).appendTo(options);
+                    var xlParsed = JSON.parse(xl);
+
+                    // 确保 dl 和 xl 是数组后，再进行 map 操作
+                    if (Array.isArray(xlParsed)) {
+                        var xlIds = xlParsed.map(function (item) {
+                            return item.ida || item.id;
+                        }); // 转换为 ID 数组
+
+                        // 设置默认选中的 dl 选项
+                        options.val(xlIds).trigger('change');
+                        // 设置默认选中的 xl 选项
+                        $('#subcategory-select').val(xlIds).trigger('change');
+                    }
+                });
+
+                // 重新初始化 Select2 以反映新的选项
+                options.trigger('change');
+            },
+            error: function(xhr, status, error) {
+                console.error("Failed to load subcategories:", error);
+            }
+        });
+    }
+
     // 将后端返回的数据填充到表格中
     function populatePatientTable(datas) {
         var tbody = $('#patient-table tbody');
@@ -410,7 +554,28 @@
                 }
             }
         });
-
+        var selectedOptionsDL = $('#category-select option:selected');
+        var selectedOptionsXL = $('#subcategory-select option:selected');
+        var selectedDataDL = selectedOptionsDL.map(function() {
+            return {
+                id: $(this).val(),
+                name: $(this).text()
+            };
+        }).get();  // 获取的数据格式 [{ id: "2", name: "肿瘤治疗并发症与合并症名称" }, { id: "3", name: "风湿免疫疾病名称库" }]
+        var selectedDataXL = selectedOptionsXL.map(function() {
+            return {
+                id: $(this).val(),
+                name: $(this).text()
+            };
+        }).get();  // 获取的数据格式 [{ id: "2", name: "肿瘤治疗并发症与合并症名称" }, { id: "3", name: "风湿免疫疾病名称库" }]
+        const DL = JSON.stringify(selectedDataDL);
+        const XL = JSON.stringify(selectedDataXL);
+        formData.append('dl', DL);
+        formData.append('xl', XL);
+        formData.append('dlanme', DL);
+        formData.append('xlname', XL);
+        console.log("DL=" + DL);
+        console.log("XL=" + XL);
 // 将药物数据序列化为 JSON 字符串并添加到 FormData 中
         var tableRows = [];
         var falg = true;

health-admin/src/main/resources/templates/dtp/recipe/newRecipe.html

@@ -51,7 +51,10 @@
                     <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>医院:</label>
-                            <input name="hospital" placeholder="医院" id="hospital" class="styled-input" type="text">
+<!--                            <input name="hospital" placeholder="医院" id="hospital" class="styled-input" type="text">-->
+                            <select id="hospital-select"  name="hospital" class="styled-input form-control select2-multiple" placeholder="请选择或输入搜索">
+                                <option value="">请选择医院</option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
                             <label class="is-required">处方医生:</label>
@@ -69,10 +72,13 @@
                             <label class="is-required">主管医生:</label>
                             <input name="attendingDoctor" id="attendingDoctor" placeholder="主管医生"   class="styled-input" type="text">
                         </div>
-                        <div class="customize-form-group">
-                            <label class="is-required">临床诊断:</label>
-                            <input name="clinicalDiagnosis" id="clinicalDiagnosis" placeholder="临床诊断"   class="styled-input" type="text">
+                        <div class="customize-form-group-container">
+
                         </div>
+<!--                        <div class="customize-form-group">-->
+<!--                            <label class="is-required">临床诊断:</label>-->
+<!--                            <input name="clinicalDiagnosis" id="clinicalDiagnosis" placeholder="临床诊断"   class="styled-input" type="text">-->
+<!--                        </div>-->
                         <div class="customize-form-group">
                             <label>处方图片:</label>
                             <input name="prescriptionImageUrl" id="prescriptionImageUrl" placeholder="处方图片"  class="styled-input" type="text">
@@ -91,10 +97,10 @@
                         </div>
 
 
-                        <div class="customize-form-group">
-                            <label class="is-required">登记药师姓名:</label>
-                            <input name="registerPharmacistName" id="registerPharmacistName" placeholder="登记药师姓名"   class="styled-input" type="text">
-                        </div>
+<!--                        <div class="customize-form-group">-->
+<!--                            <label class="is-required">登记药师姓名:</label>-->
+<!--                            <input name="registerPharmacistName" id="registerPharmacistName" placeholder="登记药师姓名"   class="styled-input" type="text">-->
+<!--                        </div>-->
                         <div class="customize-form-group">
                             <label class="is-required">登记人:</label>
                             <input name="registrant" id="registrant" placeholder="登记人"  class="styled-input" type="text">
@@ -111,6 +117,18 @@
                                 ></option>
                             </select>
                         </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">临床诊断大类：</label>
+                            <select id="category-select"   class="styled-input form-control select2-multiple" multiple placeholder="请选择或输入搜索">
+                                <option value="">请选择疾病大类</option>
+                            </select>
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">临床诊断小类：</label>
+                            <select id="subcategory-select" class="styled-input form-control select2-multiple" multiple placeholder="请选择或输入搜索">
+                                <option value="">请选择子类别</option>
+                            </select>
+                        </div>
                     </div>
      </form>
         <!-- 假设这是你的 HTML 结构class="table table-bordered" -->
@@ -208,6 +226,8 @@
     var removeFlag = [[${@permission.hasPermi('dtp:RecipeRegister:remove')}]];
     var prefix_recipe = ctx + "dtp/recipe";
     var prefix_yppz= ctx + "yppz/drugConfig";
+    var prefix_configInfo= ctx + "dtp/configInfo";
+
     var prefix_pmService = ctx + "dtp/pmService";
     var hzparam =[];
     var hzparam1 ={};
@@ -258,9 +278,137 @@
                 getLastRecipe(patientId);
             }
         });
-
+         // 初始化 Select2 插件
+         $('#hospital-select').select2({
+             placeholder: "请选择或直接输入搜索",
+             //allowClear: true //在输入框最后 有一个 删除所有的X 但是会出现 第一个删除出现问题有空格
+         });
+         // Listen for the 'select2:select' event
+         $('#hospital-select').on('select2:select', function(e) {
+             var clearSpan = $('.select2-selection-clear');
+             if (clearSpan.length > 0) {
+                 clearSpan.remove();
+             }
+         });
+         // 发送 AJAX 请求获取疾病大类数据
+         $.ajax({
+             url: prefix_configInfo+'/dtpHospitalList',
+             method: 'POST',
+             dataType: 'json',
+             success: function(data) {
+                 var options = $('#hospital-select');
+                 // 清空已有选项（除了第一个默认选项）
+                 options.find('option').not(':first').remove();
+                 $('<option>', {
+                     value: '',
+                     text : '请选择疾病医院'
+                 }).appendTo(options);
+                 // 遍历返回的数据并添加选项
+                 $.each(data.value, function(index, item) {
+                     $('<option>', {
+                         value: item.id,
+                         text : item.standardName
+                     }).appendTo(options);
+                 });
+
+                 // 重新初始化 Select2 以反映新的选项
+                 options.trigger('change');
+             },
+             error: function(xhr, status, error) {
+                 console.error("Failed to load disease categories:", error);
+             }
+         });
+         var clearSpan = $('.select2-selection-clear');
+         // 初始化 Select2 插件
+         $('#category-select').select2({
+             placeholder: "请选择或直接输入搜索",
+             //allowClear: true //在输入框最后 有一个 删除所有的X 但是会出现 第一个删除出现问题有空格
+         });
+         // Listen for the 'select2:select' event
+         $('#category-select').on('select2:select', function(e) {
+             var clearSpan = $('.select2-selection-clear');
+             if (clearSpan.length > 0) {
+                 clearSpan.remove();
+             }
+         });
+
+         // 发送 AJAX 请求获取疾病大类数据
+         $.ajax({
+             url: prefix_recipe+'/typeDate',
+             method: 'GET',
+             dataType: 'json',
+             success: function(data) {
+                 var options = $('#category-select');
+                 // 清空已有选项（除了第一个默认选项）
+                 options.find('option').not(':first').remove();
+                 $('<option>', {
+                     value: '',
+                     text : '请选择疾病类型'
+                 }).appendTo(options);
+                 // 遍历返回的数据并添加选项
+                 $.each(data.value, function(index, item) {
+                     $('<option>', {
+                         value: item.id,
+                         text : item.categoryName
+                     }).appendTo(options);
+                 });
+
+                 // 重新初始化 Select2 以反映新的选项
+                 options.trigger('change');
+             },
+             error: function(xhr, status, error) {
+                 console.error("Failed to load disease categories:", error);
+             }
+         });
+
+         // 初始化子类别下拉框
+         $('#subcategory-select').select2({
+             placeholder: "请选择或直接输入搜索",
+             //allowClear: true
+         });
+
+         // 监听第一个下拉框的选择事件
+         $('#category-select').on('change', function() {
+             var selectedCategory = $(this).val();
+             if (selectedCategory.length > 0) {
+                 loadSubcategories(selectedCategory);
+             } else {
+                 // 如果没有选择任何项，清空子类别下拉框
+                 $('#subcategory-select').find('option').not(':first').remove();
+                 $('#subcategory-select').trigger('change');
+             }
+         });
+         // 监听医院下拉框的选择事件
 
     });
+    function loadSubcategories(categoryId) {
+        // 模拟从服务器获取子类别数据
+        $.ajax({
+            url: prefix_recipe+'/typeDate2?jbtype=' + categoryId, // 假设 ctx 是你的上下文路径
+            method: 'GET',
+            dataType: 'json',
+            success: function(data) {
+                var options = $('#subcategory-select');
+                // 清空已有选项（除了第一个默认选项）
+                options.find('option').not(':first').remove();
+
+                // 遍历返回的数据并添加选项
+                $.each(data.value, function(index, item) {
+                    $('<option>', {
+                        value: item.ida,
+                        text : item.categoryNamea
+                    }).appendTo(options);
+                });
+
+                // 重新初始化 Select2 以反映新的选项
+                options.trigger('change');
+            },
+            error: function(xhr, status, error) {
+                console.error("Failed to load subcategories:", error);
+            }
+        });
+    }
+
     // 将后端返回的数据填充到表格中
     function populatePatientTable(datas) {
         var tbody = $('#patient-table tbody');
@@ -479,7 +627,34 @@ function initTab(datas){
                 }
             }
         });
-
+        var selectedOptionsDL = $('#category-select option:selected');
+        var selectedOptionsXL = $('#subcategory-select option:selected');
+        /*var JBDL = selectedOptionsDL.map(function() { // 疾病大类
+            return $(this).text();
+        }).get(); // 获取的数据格式 [ "肿瘤治疗并发症与合并症名称", "风湿免疫疾病名称库" ]
+        var JBXL = selectedOptionsXL.map(function() { // 疾病小类
+            return $(this).text();
+        }).get(); // 获取的数据格式 [ "肿瘤治疗并发症与合并症名称", "风湿免疫疾病名称库" ]*/
+        var selectedDataDL = selectedOptionsDL.map(function() {
+            return {
+                id: $(this).val(),
+                name: $(this).text()
+            };
+        }).get();  // 获取的数据格式 [{ id: "2", name: "肿瘤治疗并发症与合并症名称" }, { id: "3", name: "风湿免疫疾病名称库" }]
+        var selectedDataXL = selectedOptionsXL.map(function() {
+            return {
+                id: $(this).val(),
+                name: $(this).text()
+            };
+        }).get();  // 获取的数据格式 [{ id: "2", name: "肿瘤治疗并发症与合并症名称" }, { id: "3", name: "风湿免疫疾病名称库" }]
+        const DL = JSON.stringify(selectedDataDL);
+        const XL = JSON.stringify(selectedDataXL);
+        formData.append('dl', DL);
+        formData.append('xl', XL);
+        formData.append('dlanme', DL);
+        formData.append('xlname', XL);
+        console.log("DL=" + DL);
+        console.log("XL=" + XL);
 // 将药物数据序列化为 JSON 字符串并添加到 FormData 中
         /*var drugData = getTableData(); // 假设此函数正确获取表格数据
         if (drugData.length > 0) {

health-system/src/main/java/com/bzd/system/service/DTPService.java

@@ -535,6 +535,7 @@ public class DTPService {
      * @throws Exception
      */
     public List<PageData> findHospitalList(final PageData pd) throws Exception {
+        pd.put("storeId", getSysUser().getDeptId());
         return (List<PageData>) daoSupport.findForList("DTPMapper.HospitalList", pd);
     }
     @Transactional(rollbackFor = Exception.class)
@@ -620,4 +621,25 @@ public class DTPService {
         return 0;
     }
 
+    /**
+     * 获取ICD疾病信息
+     * @param pd
+     * @return
+     * @throws Exception
+     */
+    public List<PageData> typeDate(PageData pd) throws Exception{
+        if (pd==null || pd.size()==0){
+            pd.put("dict_key","ICD11");
+        }
+        return (List<PageData>) daoSupport.findForList("TypeDateMapper.getICD11_Date", pd);
+    }
+    /**
+     * 获取ICD疾病信息
+     * @param pd
+     * @return
+     * @throws Exception
+     */
+    public List<PageData> typeDate2(PageData pd) throws Exception{
+        return (List<PageData>) daoSupport.findForList("TypeDateMapper.getICD11_Date2", pd);
+    }
 }

health-system/src/main/resources/mapper/mdyy/DTPCFDJMapper.xml

@@ -219,6 +219,8 @@
             <if test="clinicalDiagnosis != null and clinicalDiagnosis != ''">
                 clinicalDiagnosis,
             </if>
+            <if test="dl != null and dl != ''">dl,</if>
+            <if test="xl != null and xl != ''">xl,</if>
             <if test="prescriptionImageUrl != null and prescriptionImageUrl != ''">
                 prescriptionImageUrl,
             </if>
@@ -333,6 +335,8 @@
             <if test="clinicalDiagnosis != null and clinicalDiagnosis != ''">
                 #{clinicalDiagnosis},
             </if>
+            <if test="dl != null and dl != ''">#{dl},</if>
+            <if test="xl != null and xl != ''">#{xl},</if>
             <if test="prescriptionImageUrl != null and prescriptionImageUrl != ''">
                 #{prescriptionImageUrl},
             </if>
@@ -451,6 +455,8 @@
             <if test="clinicalDiagnosis != null and clinicalDiagnosis != ''">
                 clinicalDiagnosis = #{clinicalDiagnosis},
             </if>
+            <if test="dl != null and dl != ''">dl=#{dl},</if>
+            <if test="xl != null and xl != ''">xl=#{xl},</if>
             <if test="prescriptionImageUrl != null and prescriptionImageUrl != ''">
                 prescriptionImageUrl = #{prescriptionImageUrl},
             </if>
@@ -673,7 +679,7 @@
             <if test="singleDoseValue != null">singleDoseValue,</if>
             <if test="singleDoseUnit != null or singleDoseUnit != ''">singleDoseUnit,</if>
             <if test="dosageFrequency != null or dosageFrequency != ''">dosageFrequency,</if>
-            <if test="dosageFrequencyDays != null">dosageFrequencyDays,</if>
+            <if test="dosageFrequencyDays != null or dosageFrequencyDays != ''">dosageFrequencyDays,</if>
             <if test="dvalueDays != null or  dvalueDays != ''">dvalueDays,</if>
             <if test="medicationRoute != null or medicationRoute != ''">medicationRoute,</if>
             <if test="sales != null or sales != ''">sales,</if>
@@ -708,7 +714,7 @@
             <if test="singleDoseValue != null">#{singleDoseValue},</if>
             <if test="singleDoseUnit != null or singleDoseUnit != ''">#{singleDoseUnit},</if>
             <if test="dosageFrequency != null or dosageFrequency != ''">#{dosageFrequency},</if>
-            <if test="dosageFrequencyDays != null">#{dosageFrequencyDays},</if>
+            <if test="dosageFrequencyDays != null or dosageFrequencyDays != ''">#{dosageFrequencyDays},</if>
             <if test="dvalueDays != null or  dvalueDays != ''">#{dvalueDays},</if>
             <if test="medicationRoute != null or medicationRoute != ''">#{medicationRoute},</if>
             <if test="sales != null or sales != ''">#{sales},</if>

health-system/src/main/resources/mapper/spgl/TypeDateMapper.xml

@@ -15,4 +15,20 @@
             and dict_key in( ${jbtype})
     </select>
 
+
+    <!-- 通用查询ICD11映射结果 -->
+    <select id="getICD11_Date" parameterType="pd" resultType="pd">
+        select type as id,categoryName
+        from s_gxhpz_zd_attributecategory
+        where 1=1
+          and dict_key = 'ICD11'
+    </select>
+    <select id="getICD11_Date2" parameterType="pd" resultType="pd">
+        select id as ida,categoryName as categoryNamea
+        from s_gxhpz_zd_attributecategory
+        where 1=1
+          and type in( ${jbtype})
+    </select>
+
+
 </mapper>

health-system/src/main/resources/mapper/system/DTPMapper.xml

@@ -571,6 +571,8 @@
                 AND standardName like concat('%', #{standardName}, '%')
             </if>
             <if test="address != null and address != ''">AND address = #{address}</if>
+            <if test="storeId != null and storeId != ''">AND storeId = #{storeId}</if>
+            <if test="storeName != null and storeName != ''">AND storeName = #{storeName}</if>
             <if test="phone != null and phone != ''">AND phone = #{phone}</if>
             <if test="create_time_start != null and create_time_start != '' and create_time_end != null and create_time_end != ''">
                 AND create_time BETWEEN #{create_time_start} AND #{create_time_end}