1.17

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

@@ -10,7 +10,6 @@ import doctor.domain.entity.DoctorJobTitleEntity;
 import doctor.domain.vo.*;
 import doctor.service.BannersService;
 import doctor.service.HealthJobTitleService;
-import doctor.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -27,30 +26,16 @@ public class HealthJobTitleController {
     private BannersService bannersService;
 
 
-
-    @GetMapping("/findDoctorNoticeReadNum")
-    public HealthR<List<NoticeReadNumVo>> findDoctorNoticeReadNum(@RequestHeader Integer doctorId,
-                                                                  @RequestHeader String sessionId) {
-        List<NoticeReadNumVo> healthR = healthJobTitleService.findDoctorNoticeReadNum(doctorId);
-        return HealthR.ok(healthR);
-    }
-
     @GetMapping("/findHistoryInquiryRecord")
     public HealthR<List<DoctorHistoryInquiryVo>> findHistoryInquiryRecord(@RequestHeader Integer doctorId,
                                                                           @RequestHeader String sessionId,
                                                                           @RequestParam Integer page,
                                                                           @RequestParam Integer size) {
         HealthR<List<DoctorHistoryInquiryVo>> healthR = healthJobTitleService.findHistoryInquiryRecord(page, size);
-        return null;
+        return healthR;
     }
 
-    @GetMapping("/findDoctorWallet")
-    public HealthR<WalletVo> findDoctorWallet(@RequestHeader Integer doctorId,
-                                              @RequestHeader String sessionId) {
 
-        WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId);
-        return HealthR.ok(healthR);
-    }
 
     @PostMapping("/drawCash")
     public HealthR drawCash(@RequestHeader Integer doctorId,
@@ -60,14 +45,6 @@ public class HealthJobTitleController {
         return healthR;
     }
 
-    @GetMapping("/findDoctorIncomeRecordList")
-    public HealthR<List<DoctorIncomeRecordVo>> findDoctorIncomeRecordList(@RequestHeader Integer doctorId,
-                                                                          @RequestHeader String sessionId,
-                                                                          @RequestParam Integer page,
-                                                                          @RequestParam Integer count) {
-        List<DoctorIncomeRecordVo> doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count);
-        return HealthR.ok(doctorIncomeRecordEntities);
-    }
 
     @GetMapping("/bannersShow")
     public HealthR<List<Banners>> bannersShow() {
@@ -101,22 +78,11 @@ public class HealthJobTitleController {
         return healthR;
     }
 
-    @GetMapping("/findDoctorById")
+
-    public HealthR<DoctorVo> findDoctorById(@RequestHeader Integer doctorId,
-                                            @RequestHeader String sessionId) {
-        return HealthR.ok(healthJobTitleService.findDoctorById(doctorId));
-    }
 
     @GetMapping("/findSystemImagePic")
     public HealthR<List<FindImagePicVo>> findSystemImagePic() {
         return HealthR.ok(healthJobTitleService.findSystemImagePic());
     }
 
-    @PostMapping("/uploadImagePic")
-    public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic,
-                                  @RequestHeader String sessionId,
-                                  @RequestHeader Integer doctorId) {
-        return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic, doctorId, sessionId));
-    }
-
 }

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

@@ -1,6 +1,9 @@
 package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
+import doctor.common.core.web.controller.BaseController;
+import doctor.domain.vo.SearchSickCircleVo;
+import doctor.domain.vo.SickCircleInfoVo;
 import doctor.domain.vo.SickCircleVo;
 import doctor.service.SickCircleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,4 +28,15 @@ public class HealthSickController {
         List<SickCircleVo> sickCircleList = sickCircleService.findSickCircleList(page, count, departmentId);
         return HealthR.ok(sickCircleList);
     }
+
+    @GetMapping("/findSickCircleInfo")
+    public HealthR<SickCircleInfoVo> findSickCircleInfo(@RequestParam Integer sickCircleId) {
+        SickCircleInfoVo sickCircleInfoVo = sickCircleService.findSickCircleInfo(sickCircleId);
+        return HealthR.ok(sickCircleInfoVo);
+    }
+    @GetMapping("/searchSickCircle")
+    public HealthR<List<SearchSickCircleVo>> searchSickCircle(@RequestParam String keyWord) {
+        List<SearchSickCircleVo> searchSickCircleVoList = sickCircleService.searchSickCircle(keyWord);
+        return HealthR.ok(searchSickCircleVoList);
+    }
 }

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

@@ -0,0 +1,56 @@
+package doctor.controller;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.DoctorIncomeRecordVo;
+import doctor.domain.vo.DoctorVo;
+import doctor.domain.vo.NoticeReadNumVo;
+import doctor.domain.vo.WalletVo;
+import doctor.service.HealthJobTitleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/verify/v1")
+public class HealthVerifyController {
+    @Autowired
+    private HealthJobTitleService healthJobTitleService;
+    @GetMapping("/findDoctorById")
+    public HealthR<DoctorVo> findDoctorById(@RequestHeader Integer doctorId,
+                                            @RequestHeader String sessionId) {
+        return HealthR.ok(healthJobTitleService.findDoctorById(doctorId));
+    }
+
+    @GetMapping("/findDoctorNoticeReadNum")
+    public HealthR<List<NoticeReadNumVo>> findDoctorNoticeReadNum(@RequestHeader Integer doctorId,
+                                                                  @RequestHeader String sessionId) {
+        List<NoticeReadNumVo> healthR = healthJobTitleService.findDoctorNoticeReadNum(doctorId);
+        return HealthR.ok(healthR);
+    }
+
+    @PostMapping("/uploadImagePic")
+    public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic,
+                                  @RequestHeader String sessionId,
+                                  @RequestHeader Integer doctorId) {
+        return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic, doctorId, sessionId));
+    }
+
+    @GetMapping("/findDoctorIncomeRecordList")
+    public HealthR<List<DoctorIncomeRecordVo>> findDoctorIncomeRecordList(@RequestHeader Integer doctorId,
+                                                                          @RequestHeader String sessionId,
+                                                                          @RequestParam Integer page,
+                                                                          @RequestParam Integer count) {
+        List<DoctorIncomeRecordVo> doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count);
+        return HealthR.ok(doctorIncomeRecordEntities);
+    }
+
+    @GetMapping("/findDoctorWallet")
+    public HealthR<WalletVo> findDoctorWallet(@RequestHeader Integer doctorId,
+                                              @RequestHeader String sessionId) {
+
+        WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId);
+        return HealthR.ok(healthR);
+    }
+}

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,15 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SearchSickCircleVo {
+    private Integer sickCircleId;
+    private String title;
+    private String detail;
+    private Integer amount;
+    private Date releaseTime;
+
+}

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

@@ -0,0 +1,25 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SickCircleInfoVo {
+    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 Date treatmentStartTime;
+    private Date treatmentEndTime;
+    private String treatmentProcess;
+    private String picture;
+    private Integer amount;
+    private String content;
+    private Integer whetherContent;
+}

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

@@ -2,11 +2,13 @@ package doctor.domain.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class SickCircleVo {
     private Integer sickCircleId;
     private String title;
     private String detail;
-    private long releaseTime;
+    private Date releaseTime;
     private Integer amount;
 }

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

@@ -1,6 +1,8 @@
 package doctor.mapper;
 
 import doctor.domain.entity.SickCircleEntity;
+import doctor.domain.vo.SearchSickCircleVo;
+import doctor.domain.vo.SickCircleInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -9,4 +11,7 @@ import java.util.List;
 public interface SickCircleMapper {
     List<SickCircleEntity> findSickCircleList(Integer departmentId);
 
+    SickCircleInfoVo findSickCircleInfo(Integer sickCircleId);
+
+    List<SearchSickCircleVo> searchSickCircle(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.SickCircleInfoVo;
 import doctor.domain.vo.SickCircleVo;
 
 import java.util.List;
 
 public interface SickCircleService {
-    List<SickCircleVo> findSickCircleList(Integer page, Integer size, Integer departmentId);
+    List<SickCircleVo> findSickCircleList(Integer page, Integer count, Integer departmentId);
 
+    SickCircleInfoVo findSickCircleInfo(Integer sickCircleId);
+
+    List<SearchSickCircleVo> searchSickCircle(String keyWord);
 }

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

@@ -164,7 +164,7 @@ public class HealthJobTitleServiceImpl extends BaseController implements HealthJ
 
     @Override
     public List<DoctorIncomeRecordVo> findDoctorIncomeRecordList(Integer doctorId, Integer page, Integer count) {
-        startPage(page,count);
+
         List<DoctorIncomeRecordEntity> doctorIncomeRecordList = healthJobTitleMapper.findDoctorIncomeRecordList(doctorId);
         ArrayList<DoctorIncomeRecordVo> doctorIncomeRecordVos = new ArrayList<>();
         for (DoctorIncomeRecordEntity doctorIncomeRecordEntity : doctorIncomeRecordList) {

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

@@ -3,6 +3,8 @@ 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.SickCircleInfoVo;
 import doctor.domain.vo.SickCircleVo;
 import doctor.mapper.SickCircleMapper;
 import doctor.service.SickCircleService;
@@ -19,16 +21,25 @@ public class SickCircleServiceImpl extends BaseController implements SickCircleS
     @Autowired
     private SickCircleMapper sickCircleMapper;
     @Override
-    public List<SickCircleVo> findSickCircleList(Integer page, Integer size, Integer departmentId) {
+    public List<SickCircleVo> findSickCircleList(Integer page, Integer count, Integer departmentId) {
-        startPage(page,size);
         List<SickCircleEntity> list = sickCircleMapper.findSickCircleList(departmentId);
         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 SickCircleInfoVo findSickCircleInfo(Integer sickCircleId) {
+        return sickCircleMapper.findSickCircleInfo(sickCircleId);
+    }
+
+    @Override
+    public List<SearchSickCircleVo> searchSickCircle(String keyWord) {
+        return sickCircleMapper.searchSickCircle(keyWord);
+    }
 }

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.vo.SickCircleInfoVo">
+        SELECT * FROM sick_circle WHERE sick_circle_id = #{sickCircleId}
+    </select>
+    <select id="searchSickCircle" resultType="doctor.domain.vo.SearchSickCircleVo">
+        SELECT * FROM sick_circle WHERE title LIKE CONCAT('%',#{keyWord},'%')
+    </select>
 </mapper>