From 89fd0725f7a5cf1dcf4e1f8b4d317509bce6bad2 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 18 Jan 2024 14:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=B4=E9=97=A8=E5=8C=BB=E8=BF=B0-=E4=BC=A0?=
 =?UTF-8?q?=E6=89=BF=E4=BA=BA=E6=B7=BB=E5=8A=A0=E5=9B=BD=E5=A4=96=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../book/controller/MedicaldesController.java | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

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 88e71cd6..a676a653 100644
--- a/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java
+++ b/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java
@@ -155,24 +155,6 @@ public class MedicaldesController {
         return R.ok().put("result", page);
     }
 
-    /**
-     * 学术传承列表按类型、地区
-     */
-    @RequestMapping(path = "/inheritListByTypeProvId")
-    public R inheritListByTypeProvId(String type,String provId) {
-        MPJLambdaWrapper<MedicaldesInherit> wrapper = new MPJLambdaWrapper();
-        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.selectAll(MedicaldesInherit.class);
-        wrapper.eq(Province::getProvId,provId);
-        wrapper.selectAs(MedicaldesInheritRelation::getSort,"sort");
-        wrapper.orderByAsc(MedicaldesInheritRelation::getSort);
-        List<MedicaldesInherit> list = inheritService.list(wrapper);
-        return R.ok().put("result", list);
-    }
-
     //国际医师可能来自国外在省市里加入外国
     public String[] getCounts() {
         //countId 为1 2 3
@@ -190,6 +172,29 @@ public class MedicaldesController {
         return cityList;
     }
 
+    /**
+     * 学术传承列表按类型、地区
+     */
+    @RequestMapping(path = "/inheritListByTypeProvId")
+    public R inheritListByTypeProvId(String type,String provId) {
+        MPJLambdaWrapper<MedicaldesInherit> wrapper = new MPJLambdaWrapper();
+        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.selectAll(MedicaldesInherit.class);
+        if ("0".equals(provId)){
+            //未知地址
+            wrapper.in(MedicaldesInherit::getCityId,0,1,2,3);
+        }else {
+            wrapper.eq(Province::getProvId,provId);
+        }
+        wrapper.selectAs(MedicaldesInheritRelation::getSort,"sort");
+        wrapper.orderByAsc(MedicaldesInheritRelation::getSort);
+        List<MedicaldesInherit> list = inheritService.list(wrapper);
+        return R.ok().put("result", list);
+    }
+
     //获取地址
     @RequestMapping(path = "/getMedicaldesProList")
     public R getMedicaldesProList() {
@@ -278,8 +283,8 @@ public class MedicaldesController {
         wrapper.eq(MedicaldesInheritRelation::getTypeId,type);
         wrapper.leftJoin(City.class,City::getCityId,MedicaldesInherit::getCityId);
         wrapper.leftJoin(Province.class,Province::getProvId,City::getProvId);
-        wrapper.selectAs(Province::getProvName,"provinceName");
-        wrapper.selectAs(Province::getProvId,"provinceId");
+        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);