소스 검색

add: 添加诊断信息数据获取接口

Scott 2 년 전
부모
커밋
b3c03cc69a

+ 4 - 3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/AfterwardsAuditController.java

@@ -29,8 +29,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Arrays;
+import java.util.List;
 
- /**
+/**
  * @Description: afterwards_audit
  * @Author: jeecg-boot
  * @Date:   2023-05-09 14:37:31
@@ -78,13 +79,13 @@ public class AfterwardsAuditController extends JeecgController<AfterwardsAudit,
 
 	 @ApiOperation(value = "审核端-诊断信息")
 	 @GetMapping(value = "/audit/diagnostic/info")
-	 public Result<DiagnosticInfoResponse> loadDiagnosticInformation(HttpServletRequest request, @RequestParam("id") Integer id) {
+	 public Result<List<DiagnosticInfoResponse>> loadDiagnosticInformation(HttpServletRequest request, @RequestParam("id") Integer id) {
 		 LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 if (null == loginUser) {
 			 log.error("当前用户未登录");
 			 throw new JeecgBootException("用户未登录"); // "登录已过期,请重新登录"
 		 }
-		DiagnosticInfoResponse result = afterwardsAuditService.loadDiagnosticInfo(id);
+		List<DiagnosticInfoResponse> result = afterwardsAuditService.loadDiagnosticInfo(id);
 		return Result.OK(result);
 	 }
 

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/AfterwardsAuditMapper.java

@@ -66,5 +66,5 @@ public interface AfterwardsAuditMapper extends BaseMapper<AfterwardsAudit> {
      */
     List<AuditInfoListResponse> loadAuditInfoList(Integer id);
 
-    DiagnosticInfoResponse loadDiagnosticInfo(@Param("id") Integer id);
+    List<DiagnosticInfoResponse> loadDiagnosticInfo(@Param("id") Integer id);
 }

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/AfterwardsAuditMapper.xml

@@ -228,7 +228,7 @@
             "" as subDiagnosis2Code -- 这个等后面确认
         FROM
             afterwards_audit as ad
-            LEFT JOIN medical_record_homepage as h ON ad.outpatient_number = h.zyh
+            RIGHT JOIN medical_record_homepage as h ON ad.outpatient_number = h.zyh
         WHERE ad.id = #{id, jdbcType=INTEGER}
     </select>
 </mapper>

+ 3 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IAfterwardsAuditService.java

@@ -9,6 +9,8 @@ import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 
+import java.util.List;
+
 /**
  * @Description: afterwards_audit
  * @Author: jeecg-boot
@@ -63,5 +65,5 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
      * @param id
      * @return
      */
-    DiagnosticInfoResponse loadDiagnosticInfo(Integer id);
+    List<DiagnosticInfoResponse> loadDiagnosticInfo(Integer id);
 }

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterwardsAuditServiceImpl.java

@@ -342,7 +342,7 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
      * @return
      */
     @Override
-    public DiagnosticInfoResponse loadDiagnosticInfo(Integer id) {
+    public List<DiagnosticInfoResponse> loadDiagnosticInfo(Integer id) {
         return baseMapper.loadDiagnosticInfo(id);
     }
 }