修复1

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/DiagnosisController.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_DiagnosisController.java

@@ -1,25 +1,23 @@
-package com.ruoyi.web.work.controller;
+package com.ruoyi.web.work.api;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.domain.Diagnosis;
-import com.ruoyi.web.work.domain.Visit;
 import com.ruoyi.web.work.service.IDiagnosisService;
-import com.ruoyi.web.work.service.IVisitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
 import java.util.List;
 
 @RestController
 @RequestMapping("/work/diagnosis")
-@Api(tags = "诊断信息")
-public class DiagnosisController {
+@Api(tags = "小程序诊断信息")
+public class Api_DiagnosisController {
 
     @Autowired
     private IDiagnosisService diagnosisService;
@@ -30,7 +28,6 @@ public class DiagnosisController {
      * @return
      */
     @ApiOperation(value = "诊断详情")
-    //@PreAuthorize("@ss.hasPermi('work:template:list')")
     @GetMapping("/{visitId}")
     public AjaxResult getDiagnosisInfoByVisitId(@PathVariable String visitId){
         List<Diagnosis> visitList = diagnosisService.getDiagnosisInfoByVisitId(visitId);

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/ObrRequestController.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_ObrRequestController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.work.controller;
+package com.ruoyi.web.work.api;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.domain.ObrRequest;
@@ -6,6 +6,7 @@ import com.ruoyi.web.work.service.ObrRequestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -15,8 +16,8 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/work/obrRequest")
-@Api(tags = "检测报告列表")
-public class ObrRequestController {
+@Api(tags = "小程序检测报告列表")
+public class Api_ObrRequestController {
 
     @Autowired
     private ObrRequestService obrRequestService;
@@ -28,7 +29,6 @@ public class ObrRequestController {
      * @return
      */
     @ApiOperation(value = "检测报告列表")
-    //@PreAuthorize("@ss.hasPermi('work:template:list')")
     @GetMapping("/{cardId}")
     public AjaxResult getObrRequestByCardId(@PathVariable String cardId){
         List<ObrRequest> obrRequestList = obrRequestService.getObrRequestByCardId(cardId);

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/ObxResultController.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_ObxResultController.java

@@ -1,14 +1,13 @@
-package com.ruoyi.web.work.controller;
+package com.ruoyi.web.work.api;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.web.work.domain.ObrRequest;
 import com.ruoyi.web.work.domain.ObxResult;
-import com.ruoyi.web.work.service.ObrRequestService;
 import com.ruoyi.web.work.service.ObxResultService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,8 +17,8 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/work/obxResult")
-@Api(tags = "检测报告结果详情")
-public class ObxResultController {
+@Api(tags = "小程序检测报告结果详情")
+public class Api_ObxResultController {
 
     @Autowired
     private ObxResultService obxResultService;
@@ -27,11 +26,10 @@ public class ObxResultController {
 
     /**
      * 根据检测报告ID获取报告结果
-     * @param cardId
+     * @param obrId
      * @return
      */
     @ApiOperation(value = "检测报告列表")
-    //@PreAuthorize("@ss.hasPermi('work:template:list')")
     @GetMapping("/{obrId}")
     public AjaxResult getObxResultByObrId(@PathVariable String obrId){
         List<ObxResult> obxResults = obxResultService.getObxResultByObrId(obrId);

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/VisitController.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_VisitController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.work.controller;
+package com.ruoyi.web.work.api;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.domain.Visit;
@@ -6,6 +6,7 @@ import com.ruoyi.web.work.service.IVisitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
@@ -16,8 +17,8 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/work/visit")
-@Api(tags = "就诊记录")
-public class VisitController {
+@Api(tags = "小程序就诊记录")
+public class Api_VisitController {
 
     @Autowired
     private IVisitService service;
@@ -28,7 +29,6 @@ public class VisitController {
      * @return
      */
     @ApiOperation(value = "就诊记录列表")
-    //@PreAuthorize("@ss.hasPermi('work:template:list')")
     @GetMapping("/{cardId}")
     public AjaxResult getVisitByCardId(@PathVariable String cardId,@RequestParam(value = "startTime",required = false) LocalDateTime startTime,
                                        @RequestParam(value = "endTime",required = false) LocalDateTime endTime){

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Patient.java

@@ -30,7 +30,8 @@ public class Patient{
     private String name;
 
     @ApiModelProperty(value = "出生时间")
-    private String birthDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
 
     @ApiModelProperty(value = "性别")
     private String sex;
@@ -57,7 +58,8 @@ public class Patient{
     private String nationality;
 
     @ApiModelProperty(value = "事件触发时间")
-    private String eventTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date eventTime;
 
     @ApiModelProperty(value = "住院业务类型：(1入院登记 2入区登记 3转区接收(出A区后入B区) 4转科转床接收(同科室换床) 5出区 6出区召回 7出院 8取消出院 9新生儿登记 10修改病人信息 门诊业务类型： 1患者建卡 2修改病人信息 3门诊挂号 4取消挂号 5就诊结束)")
     private String eventType;
@@ -94,8 +96,4 @@ public class Patient{
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    @ApiModelProperty(value = "消息体主表ID")
-    private String msgType;
-
-
 }