Merge remote-tracking branch 'origin/master'

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

@@ -21,6 +21,7 @@ import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import org.jeecg.modules.medical.entity.MedicalDoctorAppealRecord;
 import org.jeecg.modules.medical.service.IAfterwardsAuditService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -28,6 +29,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/AfterwardsAudit.java

@@ -166,4 +166,8 @@ public class AfterwardsAudit implements Serializable {
     @TableField(exist = false)
     private String endTime;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "审核次数")
+    private Integer auditNumber;
+
 }

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

@@ -101,6 +101,12 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
                         item.setErrorRelativelyFewAmt(detailTotalAmt);
                     }
                 }
+                int appealNumber = 0;
+                MedicalDoctorAppealRecord appealRecord = appealRecordService.loadMaxAppealNumber(item.getId(), item.getMedicalDeptCode(), item.getDoctorId());
+                if (null != appealRecord && appealRecord.getAppealNumber() != null) {
+                    appealNumber = appealRecord.getAppealNumber();
+                }
+                item.setAuditNumber(appealNumber);
                 return item;
             }).collect(Collectors.toList());
             auditQueryPageList.setRecords(records);
@@ -426,7 +432,36 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
 //        queryWrapper.eq("doctor_id", userByName.getDoctorId());
         queryWrapper.eq("medical_dept_code", medicalDeptCode);
 
-        return this.page(page, queryWrapper);
+        Page<AfterwardsAudit> violations = this.page(page, queryWrapper);
+        if (!CollectionUtils.isEmpty(violations.getRecords())) {
+            List<AfterwardsAudit> records = violations.getRecords();
+            records = records.stream().map(item -> {
+                // 计算异常多收-少收
+                BigDecimal detailTotalAmt = baseMapper.statisticsErrAmtByAfterwareRecordId(item.getId());
+                item.setErrorRelativelyFewAmt(new BigDecimal("0.00"));
+                item.setErrorRelativelyManyAmt(new BigDecimal("0.00"));
+                if (!StringUtils.hasText(item.getCheckState())) {
+                    item.setCheckState(AfterwardsAuditStatusEnum.wait.getStatus());
+                }
+                if (null != detailTotalAmt) {
+                    if (detailTotalAmt.compareTo(BigDecimal.ZERO) > 0) { // 异常金额大于0，就是多收
+                        item.setErrorRelativelyManyAmt(detailTotalAmt);
+                    } else if (detailTotalAmt.compareTo(BigDecimal.ZERO) < 0) {
+                        item.setErrorRelativelyFewAmt(detailTotalAmt);
+                    }
+                }
+                // 赋值申诉次数
+                int appealNumber = 0;
+                MedicalDoctorAppealRecord appealRecord = appealRecordService.loadMaxAppealNumber(item.getId(), item.getMedicalDeptCode(), item.getDoctorId());
+                if (null != appealRecord && appealRecord.getAppealNumber() != null) {
+                    appealNumber = appealRecord.getAppealNumber();
+                }
+                item.setAuditNumber(appealNumber);
+                return item;
+            }).collect(Collectors.toList());
+            violations.setRecords(records);
+        }
+        return violations;
     }
 
     @Override

jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/AfterwardsAuditDataTest.java

@@ -76,12 +76,47 @@ public class AfterwardsAuditDataTest {
         doctorItem4.put("doctorId", "1002002");
 
 
+        Map<String, String> doctorItem5 = new HashMap<>();
+        doctorItem5.put("doctorName", "司马懿");
+        doctorItem5.put("doctorId", "1001201");
+
+
+        Map<String, String> doctorItem6 = new HashMap<>();
+        doctorItem6.put("doctorName", "荀彧");
+        doctorItem6.put("doctorId", "1001202");
+
+
+        Map<String, String> doctorItem7 = new HashMap<>();
+        doctorItem7.put("doctorName", "夏侯渊");
+        doctorItem7.put("doctorId", "1001203");
+
+        Map<String, String> doctorItem8 = new HashMap<>();
+        doctorItem8.put("doctorName", "曹仁");
+        doctorItem8.put("doctorId", "1001205");
+
+
+        Map<String, String> doctorItem9 = new HashMap<>();
+        doctorItem9.put("doctorName", "孙权");
+        doctorItem9.put("doctorId", "1001206");
+
+
+        Map<String, String> doctorItem10 = new HashMap<>();
+        doctorItem10.put("doctorName", "鲁肃");
+        doctorItem10.put("doctorId", "1001207");
+
+
 
 
         doctorList.add(doctorItem1);
         doctorList.add(doctorItem2);
         doctorList.add(doctorItem3);
         doctorList.add(doctorItem4);
+        doctorList.add(doctorItem5);
+        doctorList.add(doctorItem6);
+        doctorList.add(doctorItem7);
+        doctorList.add(doctorItem8);
+        doctorList.add(doctorItem9);
+        doctorList.add(doctorItem10);
 
         for (Map<String, String> stringStringMap : doctorList) {
             String doctorName = stringStringMap.get("doctorName");