Merge remote-tracking branch 'origin/master'

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

@@ -103,12 +103,13 @@ public class ViolationAnalysisController {
     @ApiOperation(value="违规分析-科室事中审查-列表", notes="违规分析-科室事中审查-列表")
     @GetMapping(value = "/mid/dept/list")
     public Result<IPage<MidDeptAuditDetailResponse>> midDeptAuditList(@RequestParam("deptName") String deptName,
+                                                                        String medicalDeptCode,
                                                                         @RequestParam("startTime") String startTime,
                                                                         @RequestParam("endTime") String endTime,
                                                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
         IPage<AuditAdvanceWarningAuditDetailResponse> page = new Page<>(pageNo, pageSize);
-        IPage<MidDeptAuditDetailResponse> resultPage = violationAnalysisService.midDeptAuditList(page, deptName, startTime, endTime);
+        IPage<MidDeptAuditDetailResponse> resultPage = violationAnalysisService.midDeptAuditList(page, medicalDeptCode ,deptName, startTime, endTime);
         return Result.OK(resultPage);
     }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/MidIncidentAuditDetailMapper.java

@@ -31,9 +31,13 @@ public interface MidIncidentAuditDetailMapper extends BaseMapper<MidIncidentAudi
     IPage<ViolationDetails> loadViolationDetails(Page<ViolationDetails> page, @Param("id") String id, @Param("ruleCode") String ruleCode);
 
 
-    IPage<MidDeptAuditDetailResponse> midDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, @Param("deptName") String deptName,
+    IPage<MidDeptAuditDetailResponse> midDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page,
+                                                       @Param("medicalDeptCode") String medicalDeptCode,
+                                                       @Param("deptName") String deptName,
                                                        @Param("startTime") String startTime, @Param("endTime") String endTime);
-    IPage<MidDeptAuditDetailResponse> afterDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, @Param("deptName") String deptName,
+    IPage<MidDeptAuditDetailResponse> afterDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page,
+                                                         @Param("medicalDeptCode") String medicalDeptCode,
+                                                         @Param("deptName") String deptName,
                                                        @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     IPage<MidAuditViolateProjectStatisticsResponse> violateProjectStatisticsList(IPage<AuditAdvanceWarningAuditDetailResponse> page, @Param("projectSearch")String projectSearch,

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/MidIncidentAuditDetailMapper.xml

@@ -86,6 +86,9 @@
             <if test="deptName != null and deptName != ''">
                 AND m.medical_dept_name like LIKE concat(concat('%',#{deptName}),'%')
             </if>
+            <if test="medicalDeptCode != null and medicalDeptCode != ''" >
+                AND m.medical_dept_code = #{medicalDeptCode}
+            </if>
             <if test="startTime != null and startTime != ''">
                 and <![CDATA[ m.create_time >= #{startTime} ]]>
             </if>
@@ -114,6 +117,9 @@
             <if test="deptName != null and deptName != ''">
                 AND m.medical_dept_name like LIKE concat(concat('%',#{deptName}),'%')
             </if>
+            <if test="medicalDeptCode != null and medicalDeptCode != ''" >
+                AND m.medical_dept_code = #{medicalDeptCode}
+            </if>
             <if test="startTime != null and startTime != ''">
                 and <![CDATA[ m.create_time >= #{startTime} ]]>
             </if>

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

@@ -49,8 +49,8 @@ public interface IMidIncidentAuditDetailService extends IService<MidIncidentAudi
     void updateReason(FeedbackReasonRequest request, IMidIncidentAuditService midIncidentAuditService);
 
 
-    IPage<MidDeptAuditDetailResponse> midDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String deptName, String startTime, String endTime);
-    IPage<MidDeptAuditDetailResponse> afterDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String deptName, String startTime, String endTime);
+    IPage<MidDeptAuditDetailResponse> midDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page,String medicalDeptCode, String deptName, String startTime, String endTime);
+    IPage<MidDeptAuditDetailResponse> afterDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page,String medicalDeptCode, String deptName, String startTime, String endTime);
 
 
     IPage<MidAuditViolateProjectStatisticsResponse> violateProjectStatisticsList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String projectSearch, String startTime, String endTime);

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

@@ -43,8 +43,8 @@ public interface IViolationAnalysisService {
     MidAuditDetailResponse midAuditDetail(Integer detailId);
 
 
-    IPage<MidDeptAuditDetailResponse> midDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String deptName, String startTime, String endTime);
-    IPage<MidDeptAuditDetailResponse> afterDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String deptName, String startTime, String endTime);
+    IPage<MidDeptAuditDetailResponse> midDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalDeptCode,String deptName, String startTime, String endTime);
+    IPage<MidDeptAuditDetailResponse> afterDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page,String medicalDeptCode, String deptName, String startTime, String endTime);
 
 
     IPage<MidAuditViolateProjectStatisticsResponse> midViolateProjectStatisticsList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String projectSearch, String startTime, String endTime);

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

@@ -140,13 +140,13 @@ public class MidIncidentAuditDetailServiceImpl extends ServiceImpl<MidIncidentAu
     }
 
     @Override
-    public IPage<MidDeptAuditDetailResponse> midDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String deptName, String startTime, String endTime) {
-        return baseMapper.midDeptAuditList(page, deptName, startTime, endTime);
+    public IPage<MidDeptAuditDetailResponse> midDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalDeptCode, String deptName, String startTime, String endTime) {
+        return baseMapper.midDeptAuditList(page, medicalDeptCode, deptName, startTime, endTime);
     }
 
     @Override
-    public IPage<MidDeptAuditDetailResponse> afterDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String deptName, String startTime, String endTime) {
-        return baseMapper.afterDeptAuditList(page, deptName, startTime, endTime);
+    public IPage<MidDeptAuditDetailResponse> afterDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String medicalDeptCode, String deptName, String startTime, String endTime) {
+        return baseMapper.afterDeptAuditList(page, medicalDeptCode, deptName, startTime, endTime);
     }
 
     @Override

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

@@ -213,13 +213,13 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
     }
 
     @Override
-    public IPage<MidDeptAuditDetailResponse> midDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String deptName, String startTime, String endTime) {
-        return midIncidentAuditDetailService.midDeptAuditList(page, deptName, startTime, endTime);
+    public IPage<MidDeptAuditDetailResponse> midDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page,String medicalDeptCode, String deptName, String startTime, String endTime) {
+        return midIncidentAuditDetailService.midDeptAuditList(page,medicalDeptCode, deptName, startTime, endTime);
     }
 
     @Override
-    public IPage<MidDeptAuditDetailResponse> afterDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String deptName, String startTime, String endTime) {
-        return midIncidentAuditDetailService.afterDeptAuditList(page, deptName, startTime, endTime);
+    public IPage<MidDeptAuditDetailResponse> afterDeptAuditList(IPage<AuditAdvanceWarningAuditDetailResponse> page,String medicalDeptCode, String deptName, String startTime, String endTime) {
+        return midIncidentAuditDetailService.afterDeptAuditList(page, medicalDeptCode, deptName, startTime, endTime);
     }
 
     @Override