diff --git a/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java b/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java
index cbb99d5d..175c4def 100644
--- a/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java
+++ b/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java
@@ -252,11 +252,14 @@ public class MedicaldesController {
 
     @RequestMapping(path = "/getInheritById")
     public R getInheritById(String id) {
-        LambdaQueryWrapper<MedicaldesInheritRelation> wrapper = new LambdaQueryWrapper();
-        wrapper.eq(MedicaldesInheritRelation::getInheritId,id);
-        MedicaldesInheritRelation relation = relationService.getOne(wrapper);
-        MedicaldesInherit inherit = inheritService.getById(id);
-        inherit.setSort(relation.getSort());
+        MPJLambdaWrapper<MedicaldesInherit> wrapper = new MPJLambdaWrapper();
+        wrapper.eq(MedicaldesInherit::getId,id);
+        wrapper.leftJoin(MedicaldesInheritRelation.class,MedicaldesInheritRelation::getInheritId,MedicaldesInherit::getId);
+        wrapper.leftJoin(City.class,City::getCityId,MedicaldesInherit::getCityId);
+        wrapper.leftJoin(Province.class,Province::getProvId,City::getProvId);
+        wrapper.leftJoin(" (select dict_type,dict_value from sys_dict_data where dict_label = 'inheritPro') dd on dd.dict_type = t.city_id");
+        wrapper.select("t.*,ifnull(t2.city_name,ifnull(dd.dict_value,'其他')) as city_name,ifnull(t3.prov_name,ifnull(dd.dict_value,'其他')) as prov_name,t1.sort as sort");
+        Map<String,Object> inherit = inheritService.getMap(wrapper);
         return R.ok().put("result",inherit);
     }
 
@@ -290,15 +293,14 @@ public class MedicaldesController {
     @RequestMapping(path = "/getList")
     public List<Map<String,Object>> getList(String type) {
         MPJLambdaWrapper<MedicaldesInherit> wrapper = new MPJLambdaWrapper();
+        wrapper.select("count(1) count,ifnull(t3.prov_id,ifnull(dd.dict_type,'0')) AS prov_id,ifnull(t3.prov_name,ifnull(dd.dict_value,'其他')) AS prov_name ");
         wrapper.leftJoin(MedicaldesInheritRelation.class,MedicaldesInheritRelation::getInheritId,MedicaldesInherit::getId);
         wrapper.eq(MedicaldesInheritRelation::getTypeId,type);
         wrapper.leftJoin(City.class,City::getCityId,MedicaldesInherit::getCityId);
         wrapper.leftJoin(Province.class,Province::getProvId,City::getProvId);
-        wrapper.select("IFNULL(t3.prov_name, '其他') AS provinceName");
-        wrapper.select("IFNULL(t3.prov_id, 0) AS provinceId");
-        wrapper.select("count(*) as count");
-        wrapper.groupBy("provinceName");
-        wrapper.orderByAsc(MedicaldesInheritRelation::getSort);
+        wrapper.leftJoin(" (select dict_type,dict_value from sys_dict_data where dict_label = 'inheritPro') dd on dd.dict_type = t.city_id");
+        wrapper.groupBy("prov_name","dict_value");
+        wrapper.orderByAsc("t3.region_code","dict_value");
         List<Map<String,Object>> list = inheritService.listMaps(wrapper);
         return  list;
     }