1.17

doctor-auth/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-gateway/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-file/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-gen/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java

@@ -1,7 +1,9 @@
 package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.SearchSickCircleVo;
 import doctor.domain.vo.SickCircleVo;
+import doctor.domain.vo.SickInfoVo;
 import doctor.service.SickCircleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,6 +20,12 @@ public class HealthSickController {
     @Autowired
     private SickCircleService sickCircleService;
 
+    @GetMapping("/findSickCircleInfo")
+    public HealthR<SickInfoVo> findSickCircleInfo(@RequestParam Integer sickCircleId) {
+        SickInfoVo sickInfoVo = sickCircleService.findSickCircleInfo(sickCircleId);
+        return HealthR.ok(sickInfoVo);
+    }
+
     @GetMapping("/findSickCircleList")
     public HealthR<List<SickCircleVo>> sickCircleList(@RequestParam Integer page,
                                                       @RequestParam Integer count,
@@ -25,4 +33,10 @@ public class HealthSickController {
         List<SickCircleVo> sickCircleList = sickCircleService.findSickCircleList(page, count, departmentId);
         return HealthR.ok(sickCircleList);
     }
+
+    @GetMapping("/searchSickCircle")
+    public HealthR<SearchSickCircleVo> searchSickCircle(@RequestParam String keyWord) {
+        SearchSickCircleVo searchSickCircleVo = sickCircleService.searchSickCircle(keyWord);
+        return HealthR.ok(searchSickCircleVo);
+    }
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java

@@ -9,7 +9,7 @@ import java.util.Date;
 
 @Data
 public class SickCircleEntity {
-    private Integer id;
+    private Integer sickCircleId;
 
     private Integer userId;
 

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java

@@ -0,0 +1,12 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class SearchSickCircleVo {
+    private Integer sickCircleId;
+    private String title;
+    private String detail;
+    private Integer amount;
+    private long releaseTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickInfoVo.java

@@ -0,0 +1,23 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class SickInfoVo {
+    private Integer id;
+    private Integer userId;
+    private String authorName;
+    private String title;
+    private Integer departmentId;
+    private String departmentName;
+    private String disease;
+    private String detail;
+    private String treatmentHospital;
+    private long treatmentStartTime;
+    private long treatmentEndTime;
+    private String treatmentProcess;
+    private String picture;
+    private Integer amount;
+    private String content;
+    private Integer whetherContent;
+}

doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryVerifyServiceMapper.java

@@ -1,4 +1,12 @@
 package doctor.mapper;
 
+import doctor.domain.vo.InquiryRecordVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+@Mapper
 public interface InquiryVerifyServiceMapper {
+    List<InquiryRecordVo> findInquiryRecordList();
+
+
 }

doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java

@@ -1,6 +1,7 @@
 package doctor.mapper;
 
 import doctor.domain.entity.SickCircleEntity;
+import doctor.domain.vo.SickInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -9,4 +10,7 @@ import java.util.List;
 public interface SickCircleMapper {
     List<SickCircleEntity> findSickCircleList(Integer departmentId);
 
+    SickCircleEntity findSickCircleInfo(Integer sickCircleId);
+
+    SickCircleEntity findSickCircleInfoByKeyWord(String keyWord);
 }

doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java

@@ -1,11 +1,16 @@
 package doctor.service;
 
 import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.SearchSickCircleVo;
 import doctor.domain.vo.SickCircleVo;
+import doctor.domain.vo.SickInfoVo;
 
 import java.util.List;
 
 public interface SickCircleService {
     List<SickCircleVo> findSickCircleList(Integer page, Integer size, Integer departmentId);
 
+    SickInfoVo findSickCircleInfo(Integer sickCircleId);
+
+    SearchSickCircleVo searchSickCircle(String keyWord);
 }

doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryVerifyServiceImpl.java

@@ -16,7 +16,6 @@ public class InquiryVerifyServiceImpl extends BaseController implements InquiryV
 
     @Override
     public List<InquiryRecordVo> findInquiryRecordList() {
-
+        return inquiryVerifyServiceMapper.findInquiryRecordList();
-        return null;
     }
 }

doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java

@@ -3,7 +3,9 @@ package doctor.service.impl;
 import doctor.common.core.domain.HealthR;
 import doctor.common.core.web.controller.BaseController;
 import doctor.domain.entity.SickCircleEntity;
+import doctor.domain.vo.SearchSickCircleVo;
 import doctor.domain.vo.SickCircleVo;
+import doctor.domain.vo.SickInfoVo;
 import doctor.mapper.SickCircleMapper;
 import doctor.service.SickCircleService;
 import org.springframework.beans.BeanUtils;
@@ -24,10 +26,26 @@ public class SickCircleServiceImpl extends BaseController implements SickCircleS
         ArrayList<SickCircleVo> sickCircleVos = new ArrayList<>();
         for (SickCircleEntity sickCircleEntity : list) {
             SickCircleVo sickCircleVo = new SickCircleVo();
-            sickCircleVo.setSickCircleId(sickCircleEntity.getId());
+            sickCircleVo.setSickCircleId(sickCircleEntity.getSickCircleId());
             BeanUtils.copyProperties(sickCircleEntity,sickCircleVo);
             sickCircleVos.add(sickCircleVo);
         }
         return sickCircleVos;
     }
+
+    @Override
+    public SickInfoVo findSickCircleInfo(Integer sickCircleId) {
+        SickCircleEntity sickCircleInfo = sickCircleMapper.findSickCircleInfo(sickCircleId);
+        SickInfoVo sickInfoVo = new SickInfoVo();
+        BeanUtils.copyProperties(sickCircleInfo,sickInfoVo);
+        return sickInfoVo;
+    }
+
+    @Override
+    public SearchSickCircleVo searchSickCircle(String keyWord) {
+        SearchSickCircleVo searchSickCircleVo = new SearchSickCircleVo();
+        SickCircleEntity sickCircleInfo = sickCircleMapper.findSickCircleInfoByKeyWord(keyWord);
+        BeanUtils.copyProperties(sickCircleInfo,searchSickCircleVo);
+        return searchSickCircleVo;
+    }
 }

doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryVerifyServiceMapper.xml

@@ -5,4 +5,7 @@
 <mapper namespace="doctor.mapper.InquiryVerifyServiceMapper">
 
 
+    <select id="findInquiryRecordList" resultType="doctor.domain.vo.InquiryRecordVo">
+
+    </select>
 </mapper>

doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml

@@ -8,4 +8,10 @@
     <select id="findSickCircleList" resultType="doctor.domain.entity.SickCircleEntity">
         SELECT * FROM sick_circle WHERE department_id = #{departmentId}
     </select>
+    <select id="findSickCircleInfo" resultType="doctor.domain.entity.SickCircleEntity">
+        SELECT * FROM sick_circle WHERE sick_circle_id = #{sickCircleId}
+    </select>
+    <select id="findSickCircleInfoByKeyWord" resultType="doctor.domain.entity.SickCircleEntity">
+        SELECT * FROM sick_circle WHERE title LIKE CONCAT('%', #{keyWord}, '%')
+    </select>
 </mapper>

doctor-modules/doctor-job/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-system/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置