jpz7.0

doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java

@@ -1,5 +1,7 @@
 package doctor.system.api.domain;
-
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -10,6 +12,9 @@ import java.util.Date;
  * @Author : FJJ
  * @Date: 2024-01-10 20:46
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class User {
     private Integer id;
     private String phone;
@@ -20,121 +25,11 @@ public class User {
     private String headPic;
     private Integer sex;
     private Integer age;
-    private String height;
+    private Integer height;
-    private String weight;
+    private Integer weight;
     private String invitationCode;
     private Date updateTime;
     private Long createTime;
 
-    public Integer getId() {
-        return id;
-    }
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getPwd() {
-        return pwd;
-    }
-
-    public void setPwd(String pwd) {
-        this.pwd = pwd;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getHeadPic() {
-        return headPic;
-    }
-
-    public void setHeadPic(String headPic) {
-        this.headPic = headPic;
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public Integer getAge() {
-        return age;
-    }
-
-    public void setAge(Integer age) {
-        this.age = age;
-    }
-
-    public String getHeight() {
-        return height;
-    }
-
-    public void setHeight(String height) {
-        this.height = height;
-    }
-
-    public String getWeight() {
-        return weight;
-    }
-
-    public void setWeight(String weight) {
-        this.weight = weight;
-    }
-
-    public String getInvitationCode() {
-        return invitationCode;
-    }
-
-    public void setInvitationCode(String invitationCode) {
-        this.invitationCode = invitationCode;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
 }

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

@@ -2,8 +2,8 @@ package doctor.controller;
 
 
 import doctor.common.core.domain.HealthR;
-import doctor.domain.entity.DiseaseKnowledge;
+import doctor.common.core.domain.R;
-import doctor.domain.entity.DrugsCategory;
+import doctor.domain.entity.*;
 import doctor.service.DiseaseKnowledgeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +45,18 @@ public class DiseaseKnowledgeController {
         List<DrugsCategory> list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId);
         return HealthR.ok(list);
     }
+    @GetMapping("/findDrugsKnowledge")
+    public HealthR <DrugsKnowledge> findDrugsKnowledge(@RequestParam Integer id){
+        DrugsKnowledge list=diseaseKnowledgeService.findDrugsKnowledge(id);
+        return HealthR.ok(list);
+    }
+    @GetMapping("/popularSearch")
+    public HealthR<List<PopularSearchEntity>> popularSeach(){
+        List<PopularSearchEntity> list=diseaseKnowledgeService.popularSeach();
+        return HealthR.ok(list);
+    }
+
+
 
 
 

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

@@ -5,10 +5,7 @@ import doctor.domain.entity.Information;
 import doctor.domain.entity.InformationPlate;
 import doctor.service.InformationService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -22,6 +19,7 @@ import static com.github.pagehelper.page.PageMethod.startPage;
  */
 @RestController
 @RequestMapping("/share/information/v1")
+
 public class InformationController {
     @Autowired
     private InformationService informationService;
@@ -38,4 +36,11 @@ public class InformationController {
         List<InformationPlate> list=informationService.findInformationPlateList();
         return HealthR.ok(list);
     }
+    @GetMapping("/findInformation")
+    public HealthR<Information> findInformation(@RequestParam Long infoId,
+                                                      @RequestHeader(name="userId",required = false)Long userId,
+                                                      @RequestHeader(name = "sessionId",required = false)String sessionId){
+        Information list=informationService.findInformation(infoId);
+        return HealthR.ok(list,"查询成功");
+    }
 }

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

@@ -1,40 +0,0 @@
-package doctor.controller;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import doctor.common.core.domain.R;
-import doctor.domain.entity.DoctorUser;
-import doctor.service.IDoctorUserService;
-import doctor.system.api.domain.SysUser;
-import doctor.system.api.model.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/doctor")
-@DS("master")
-public class SysDoctorController {
-
-    @Autowired
-    private IDoctorUserService iDoctorUserService;
-
-    @PostMapping("/getUser")
-    public R<LoginUser> getUser(String email) {
-        DoctorUser user = iDoctorUserService.getUser(email);
-        LoginUser loginUser = new LoginUser();
-        SysUser sysUser = new SysUser();
-        sysUser.setUserId(Long.valueOf(user.getId()));
-        sysUser.setNickName(user.getNickName());
-        sysUser.setUserName(user.getUserName());
-        sysUser.setPhonenumber(user.getPhone());
-        sysUser.setPassword(user.getPwd());
-        if (user.getSex()==0){
-            sysUser.setSex("男");
-        }else {
-            sysUser.setSex("女");
-        }
-        loginUser.setSysUser(sysUser);
-        return R.ok(loginUser);
-    }
-}

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

@@ -1,5 +1,8 @@
 package doctor.domain.entity;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.w3c.dom.Text;
 
 import java.util.Date;
@@ -10,6 +13,9 @@ import java.util.Date;
  * @Author: jpz
  * @CreateTime: 2024/1/10 22:00
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DrugsKnowledge {
     private Integer id;
     private Integer drugsCategoryId;
@@ -27,123 +33,5 @@ public class DrugsKnowledge {
     private String approvalNumber;
     private Date createTime;
 
-    public Integer getId() {
-        return id;
-    }
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getDrugsCategoryId() {
-        return drugsCategoryId;
-    }
-
-    public void setDrugsCategoryId(Integer drugsCategoryId) {
-        this.drugsCategoryId = drugsCategoryId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Text getPicture() {
-        return picture;
-    }
-
-    public void setPicture(Text picture) {
-        this.picture = picture;
-    }
-
-    public String getEffect() {
-        return effect;
-    }
-
-    public void setEffect(String effect) {
-        this.effect = effect;
-    }
-
-    public Text getTaboo() {
-        return taboo;
-    }
-
-    public void setTaboo(Text taboo) {
-        this.taboo = taboo;
-    }
-
-    public String getShape() {
-        return shape;
-    }
-
-    public void setShape(String shape) {
-        this.shape = shape;
-    }
-
-    public String getPacking() {
-        return packing;
-    }
-
-    public void setPacking(String packing) {
-        this.packing = packing;
-    }
-
-    public Text getComponent() {
-        return component;
-    }
-
-    public void setComponent(Text component) {
-        this.component = component;
-    }
-
-    public Text getUsage() {
-        return usage;
-    }
-
-    public void setUsage(Text usage) {
-        this.usage = usage;
-    }
-
-    public Text getSideEffects() {
-        return sideEffects;
-    }
-
-    public void setSideEffects(Text sideEffects) {
-        this.sideEffects = sideEffects;
-    }
-
-    public String getStorage() {
-        return storage;
-    }
-
-    public void setStorage(String storage) {
-        this.storage = storage;
-    }
-
-    public Text getMindMatter() {
-        return mindMatter;
-    }
-
-    public void setMindMatter(Text mindMatter) {
-        this.mindMatter = mindMatter;
-    }
-
-    public String getApprovalNumber() {
-        return approvalNumber;
-    }
-
-    public void setApprovalNumber(String approvalNumber) {
-        this.approvalNumber = approvalNumber;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 }

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

@@ -0,0 +1,54 @@
+package doctor.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.domain.entity
+ * @Author: jpz
+ * @CreateTime: 2024/1/12 21:46
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class InquiryDetailsRecordEntity {
+    //主键id
+    private Integer id;
+    //问诊记录
+    private Integer inquiryId;
+    //用户id
+    private Integer userId;
+    //好友id
+    private Integer friendId;
+    //问诊内容
+    private String askContent;
+    //问诊图片
+    private String askImage;
+    //语音聊天
+    private String voiceChat;
+    //方向1=发送 2=接收
+    private Integer direction;
+    //问诊时间
+    private Date askTime;
+    //创建时间
+    private Date createTime;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

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

@@ -0,0 +1,26 @@
+package doctor.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.domain.entity
+ * @Author: jpz
+ * @CreateTime: 2024/1/12 21:52
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class InquiryRecordEntity {
+    private Integer id;
+    private Integer userId;
+    private Integer doctorId;
+    private Integer status;
+    private Integer showStatus;
+    private Date inquiryTime;
+    private Date createTime;
+}

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

@@ -0,0 +1,22 @@
+package doctor.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.domain.entity
+ * @Author: jpz
+ * @CreateTime: 2024/1/14 16:00
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PopularSearchEntity {
+    private Integer id;
+    private String name;
+    private Date createTime;
+}

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

@@ -18,5 +18,16 @@ public class DrugsKnowledgeVo {
     private Integer drugsCategoryId;
     private String name;
     private String picture;
+    private String effect;
+    private String taboo;
+    private String shape;
+    private String packing;
+    private String component;
+    private String usage;
+    private String sideEffects;
+    private String storage;
+    private String mindMatter;
+    private String approvalNumber;
+
 
 }

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

@@ -19,5 +19,6 @@ public class InformationVo {
     private String thumbnail;
     private String source;
     private long releaseTime;
+    private Integer whetherCollection;
 
 }

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

@@ -1,9 +1,6 @@
 package doctor.mapper;
 
-import doctor.domain.entity.DiseaseKnowledge;
+import doctor.domain.entity.*;
-import doctor.domain.entity.DrugsCategory;
-import doctor.domain.entity.Information;
-import doctor.domain.entity.InformationPlate;
 import org.mybatis.spring.annotation.MapperScan;
 
 import java.util.List;
@@ -23,4 +20,8 @@ public interface DiseaseKnowledgeMapper {
     List<DrugsCategory> findDrugsKnowledgeList(Integer drugsCategoryId);
 
 
+    DrugsKnowledge findDrugsKnowledge(Integer id);
+
+    List<PopularSearchEntity> popularSeach();
+
 }

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

@@ -1,10 +0,0 @@
-package doctor.mapper;
-
-import doctor.domain.entity.DoctorUser;
-import org.apache.ibatis.annotations.Param;
-import org.mybatis.spring.annotation.MapperScan;
-
-@MapperScan
-public interface IDoctorUserMapper {
-    DoctorUser selectDoctorUserByEmail(@Param("email") String email);
-}

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

@@ -18,4 +18,6 @@ public interface InformationMapper {
 
     List<InformationPlate> findInformationPlateList();
 
+
+    Information findInformation(Long infoId);
 }

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

@@ -1,7 +1,6 @@
 package doctor.service;
 
-import doctor.domain.entity.DiseaseKnowledge;
+import doctor.domain.entity.*;
-import doctor.domain.entity.DrugsCategory;
 
 import java.util.List;
 
@@ -19,4 +18,8 @@ public interface DiseaseKnowledgeService {
     List<DrugsCategory> findDrugsKnowledgeList(Integer drugsCategoryId);
 
 
+    DrugsKnowledge  findDrugsKnowledge(Integer id);
+
+    List<PopularSearchEntity> popularSeach();
+
 }

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

@@ -1,8 +0,0 @@
-package doctor.service;
-
-import doctor.domain.entity.DoctorUser;
-import doctor.system.api.model.LoginUser;
-
-public interface IDoctorUserService {
-    DoctorUser getUser(String email);
-}

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

@@ -16,4 +16,7 @@ public interface InformationService {
     List<Information> findInformationList(Integer plateId);
 
     List<InformationPlate> findInformationPlateList();
+
+
+    Information findInformation(Long infoId);
 }

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

@@ -1,7 +1,6 @@
 package doctor.service.impl;
 
-import doctor.domain.entity.DiseaseKnowledge;
+import doctor.domain.entity.*;
-import doctor.domain.entity.DrugsCategory;
 import doctor.mapper.DiseaseKnowledgeMapper;
 import doctor.service.DiseaseKnowledgeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,5 +33,17 @@ public class DiseaseKnowledgeServiceimpl implements DiseaseKnowledgeService {
         return diseaseKnowledgeMapper.findDrugsKnowledgeList(drugsCategoryId);
     }
 
+    @Override
+    public DrugsKnowledge findDrugsKnowledge(Integer id) {
+        return diseaseKnowledgeMapper.findDrugsKnowledge(id);
+    }
+
+    @Override
+    public List<PopularSearchEntity> popularSeach() {
+        return diseaseKnowledgeMapper.popularSeach();
+    }
+
+
+
 
 }

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

@@ -1,19 +0,0 @@
-package doctor.service.impl;
-
-import doctor.mapper.IDoctorUserMapper;
-import doctor.domain.entity.DoctorUser;
-import doctor.service.IDoctorUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class IDoctorUserServiceImpl implements IDoctorUserService {
-    @Autowired
-    private IDoctorUserMapper iDoctorUserMapper;
-
-    @Override
-    public DoctorUser getUser(String email) {
-        DoctorUser doctorUser = iDoctorUserMapper.selectDoctorUserByEmail(email);
-        return doctorUser;
-    }
-}

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

@@ -29,4 +29,11 @@ public class InformationServiceimpl implements InformationService {
     public List<InformationPlate> findInformationPlateList() {
         return informationMapper.findInformationPlateList();
     }
+
+    @Override
+    public Information findInformation(Long infoId) {
+        return informationMapper.findInformation(infoId);
+    }
+
+
 }

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

@@ -16,5 +16,12 @@
         select *
         from drugs_knowledge where drugs_category_id = #{drugsCategoryId}
     </select>
+    <select id="findDrugsKnowledge" resultType="doctor.domain.entity.DrugsKnowledge">
+        select *from drugs_knowledge where id=#{id}
+    </select>
+    <select id="popularSeach" resultType="doctor.domain.entity.PopularSearchEntity">
+        select *from popular_search
+    </select>
+
 
 </mapper>

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="doctor.mapper.IDoctorUserMapper">
-
-
-    <select id="selectDoctorUserByEmail" resultType="doctor.domain.entity.DoctorUser">
-        select * from user where email = #{email}
-    </select>
-</mapper>

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

@@ -14,4 +14,9 @@
         select *
         from information where plate_id = #{plateId}
     </select>
+    <select id="findInformation" resultType="doctor.domain.entity.Information">
+        select *
+        from information where plate_id=#{infoId}
+    </select>
+
 </mapper>