excel 编码、关联编码循环嵌套

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/ViolationAnalysisController.java

@@ -223,7 +223,7 @@ public class ViolationAnalysisController {
         return ok;
     }
 
-    @ApiOperation(value = "审核端-医嘱信息")
+    @ApiOperation(value = "违规分析-医嘱信息")
     @GetMapping(value = "/audit/medicalorder/info")
     public Result<List<PrescriptionOrder>> loadMedicalOrderInfoResponseInfo(HttpServletRequest request, @RequestParam(value = "detialId", required = false) Integer detialId) {
        /* LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -368,22 +368,28 @@ public class ViolationAnalysisController {
 
     @ApiOperation(value = "违规分析-医院结算明细")
     @GetMapping(value = "/audit/settlement/detail")
-    public Result<InpatientSettlementDetailResponse> loadInpatientSettlementDetail(HttpServletRequest request, @RequestParam("afterwardsAuditId") Integer afterwardsAuditId) {
-        InpatientSettlementDetailResponse result = afterwardsAuditService.loadInpatientSettlementDetail(afterwardsAuditId);
+    public Result<InpatientSettlementDetailResponse> loadInpatientSettlementDetail(HttpServletRequest request, @RequestParam("detailId") Integer detailId) {
+        AfterwardsAuditDetail byId = afterwardsAuditDetailService.getById(detailId);
+
+        InpatientSettlementDetailResponse result = afterwardsAuditService.loadInpatientSettlementDetail(byId.getAfterwardsAuditId());
         return Result.OK("获取成功", result);
     }
 
     @ApiOperation(value = "违规分析-患者住院结算主单")
     @GetMapping(value = "/audit/settlement/master")
-    public Result<List<InpatientSettlementMasterResponse>> loadInpatientSettlementMaster(HttpServletRequest request, @RequestParam("afterwardsAuditId") Integer afterwardsAuditId) {
-        List<InpatientSettlementMasterResponse> result = afterwardsAuditService.loadInpatientSettlementMaster(afterwardsAuditId);
+    public Result<List<InpatientSettlementMasterResponse>> loadInpatientSettlementMaster(HttpServletRequest request, @RequestParam("detailId") Integer detailId) {
+        AfterwardsAuditDetail byId = afterwardsAuditDetailService.getById(detailId);
+
+        List<InpatientSettlementMasterResponse> result = afterwardsAuditService.loadInpatientSettlementMaster(byId.getAfterwardsAuditId());
         return Result.OK("获取成功", result);
     }
 
     @ApiOperation(value = "违规分析-诊断信息")
     @GetMapping(value = "/audit/diagnostic/info")
-    public Result<List<DiagnosticInfoResponse>> loadDiagnosticInformation(HttpServletRequest request, @RequestParam("afterwardsAuditId") Integer afterwardsAuditId) {
-        List<DiagnosticInfoResponse> result = afterwardsAuditService.loadDiagnosticInfo(afterwardsAuditId);
+    public Result<List<DiagnosticInfoResponse>> loadDiagnosticInformation(HttpServletRequest request, @RequestParam("detailId") Integer detailId) {
+        AfterwardsAuditDetail byId = afterwardsAuditDetailService.getById(detailId);
+
+        List<DiagnosticInfoResponse> result = afterwardsAuditService.loadDiagnosticInfo(byId.getAfterwardsAuditId());
         return Result.OK(result);
     }
 }

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

@@ -73,7 +73,7 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
      * @param id
      * @return
      */
-    List<DiagnosticInfoResponse> loadDiagnosticInfo(Integer id);
+    List<DiagnosticInfoResponse> loadDiagnosticInfo(Integer detailId);
 
 
     /**

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

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