dev

src/main/java/com/syjiaer/clinic/server/controller/social/SocialChineseMedicinalGranulaController.java

@@ -1,7 +1,11 @@
 package com.syjiaer.clinic.server.controller.social;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.patient.dto.RegistrationSaveDto;
 import com.syjiaer.clinic.server.service.social.SocialChineseMedicinalGranulaService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +19,10 @@ public class SocialChineseMedicinalGranulaController extends BaseController {
     private SocialChineseMedicinalGranulaService socialChineseMedicinalGranulaService;
     @RequestMapping("download")
     @ApiOperation("下载中药颗粒")
+    @ApiParams({
+            @ApiParam(name = "version", value = "版本号", required = true, type = RegistrationSaveDto.class),
+    })
+    @ApiReturn(name = "版本号",value = "version",  type = String.class)
     public String download() {
         String version = parmsUtil.getString("version");
         if (version == null || version.isEmpty()) {

src/main/java/com/syjiaer/clinic/server/controller/social/SocialChronicDiseaseController.java

@@ -1,7 +1,11 @@
 package com.syjiaer.clinic.server.controller.social;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
 import com.syjiaer.clinic.server.common.vo.Result;
+import com.syjiaer.clinic.server.entity.patient.dto.RegistrationSaveDto;
 import com.syjiaer.clinic.server.service.social.SocialChronicDiseaseService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -12,6 +16,7 @@ public class SocialChronicDiseaseController {
     @Autowired
     private SocialChronicDiseaseService socialChronicDiseaseService;
     @RequestMapping("download")
+    @ApiOperation("下载中医疾病(没有用)")
     public Result download() {
 //        return socialChronicDiseaseService.download();
         return null;

src/main/java/com/syjiaer/clinic/server/controller/social/SocialDiagnoseController.java

@@ -1,7 +1,11 @@
 package com.syjiaer.clinic.server.controller.social;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.patient.dto.RegistrationSaveDto;
 import com.syjiaer.clinic.server.entity.social.SocialDiagnose;
 import com.syjiaer.clinic.server.service.social.SocialDiagnoseService;
 import io.swagger.annotations.ApiOperation;
@@ -19,6 +23,10 @@ public class SocialDiagnoseController extends BaseController {
 
     @ApiOperation("诊断搜索")
     @RequestMapping("search")
+    @ApiParams({
+            @ApiParam(name = "keyword", value = "关键字", required = true, type = String.class),
+    })
+    @ApiReturn(name = "诊断列表",value = "diagnosis",  isArray = true ,type = SocialDiagnose.class)
     public Result<List<SocialDiagnose>> getDiagnosis() {
         String keyword = parmsUtil.getString("keyword");
         List<SocialDiagnose> diagnosis = socialDiagnoseService.getDiagnosis(keyword);

src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationSaveDto.java

@@ -2,18 +2,81 @@ package com.syjiaer.clinic.server.entity.patient.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.syjiaer.clinic.server.entity.patient.PatientRegistration;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 @Data
-public class RegistrationSaveDto extends PatientRegistration {
+public class RegistrationSaveDto {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("科室id")
+    private Integer organizationSectionId;
+
+    @ApiModelProperty("医生id")
+    private Integer organizationDoctorId;
+
+    @ApiModelProperty("患者姓名")
+    private String name;
+
+    @ApiModelProperty("患者年龄")
+    private Integer age;
+
+    @ApiModelProperty("患者手机号")
+    private String phone;
+
+    @ApiModelProperty("就诊类型")
+    private Short visitType;
+
+    @ApiModelProperty("挂号时间")
+    private LocalDateTime createDatetime;
+
+    @ApiModelProperty("推荐")
+    private String recommendations;
+
+    @ApiModelProperty("备注")
+    private String memo;
+
+    @ApiModelProperty("预诊")
+    private String advanceDiagnosis;
+
+    @ApiModelProperty("挂号费")
+    private BigDecimal registrationMoney;
+
+    @ApiModelProperty("逻辑删除")
+    private Integer delFlag;
+
+    @ApiModelProperty("挂号类型")
+    private Integer type;
+
+    @ApiModelProperty("性别")
+    private Integer gender;
+
+    @ApiModelProperty("病人id")
+    private Integer patientInfoId;
+
+    @ApiModelProperty("挂号状态 1候诊 2在诊 3已诊 0取消")
+    private Integer status;
+
+    @ApiModelProperty("人员编号")
+    private String psnNo;
+
+    @ApiModelProperty("险种类型")
+    private String insutype;
+
+    @ApiModelProperty("就诊id 挂号后医保返会")
+    private String mdtrtId;
+
+    @ApiModelProperty("流水号")
+    private String fstNo;
+
     @ApiModelProperty("证件号码")
     private String certNo;
     @ApiModelProperty("证件类型")
     private String certType;
+
     @ApiModelProperty("医保余额")
     private BigDecimal insuBalance;
     @ApiModelProperty("预约时间")

src/main/java/com/syjiaer/clinic/server/entity/patient/vo/PatientAndRegistrationInfoVo.java

@@ -12,8 +12,6 @@ import java.time.LocalDateTime;
 public class PatientAndRegistrationInfoVo extends PatientInfo {
     @ApiModelProperty("就诊次数")
     private Integer visitCount;
-    @ApiModelProperty("上次就诊时间")
-    private LocalDateTime lastVisitTime;
     @ApiModelProperty("挂号医生姓名")
     private String doctorName;
     @ApiModelProperty("挂号医生科室")