医嘱、审核、违规搜索条件添加

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

@@ -14,6 +14,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.medical.common.bo.*;
 import org.jeecg.modules.medical.common.bo.after.response.AfterDeptDetailRequest;
 import org.jeecg.modules.medical.common.enums.AfterwardsAuditStatusEnum;
@@ -167,15 +168,24 @@ public class AfterwardsAuditController extends JeecgController<AfterwardsAudit,
 			throw new JeecgBootException("用户未登录"); // "登录已过期，请重新登录"
 		}
 		AfterwardsAudit afterwardsAudit = new AfterwardsAudit();
-		afterwardsAudit.setOutpatientNumber(param.getAdmissionNumber());
-		afterwardsAudit.setPatientId(param.getPatientName());
-		afterwardsAudit.setCheckState(param.getCheckState());
-		afterwardsAudit.setDoctorId(param.getDoctorId());
+//		afterwardsAudit.setOutpatientNumber(param.getAdmissionNumber());
+//		afterwardsAudit.setPatientId(param.getPatientName());
+//		afterwardsAudit.setCheckState(param.getCheckState());
+//		afterwardsAudit.setDoctorId(param.getDoctorId());
 		QueryWrapper<AfterwardsAudit> queryWrapper = QueryGenerator.initQueryWrapper(afterwardsAudit, req.getParameterMap());
 		Page<AfterwardsAudit> page = new Page<>(pageNo, pageSize);
 		if (ObjectUtils.nullSafeEquals(param.getCheckState(), AfterwardsAuditStatusEnum.process.getStatus())) {
 			queryWrapper.eq("review_results", "issue_review");
 		}
+		if (oConvertUtils.isNotEmpty(param.getAdmissionNumber())) {
+			queryWrapper.eq("outpatient_number", "issue_review");
+		}
+		if (oConvertUtils.isNotEmpty(param.getPatientName())) {
+			queryWrapper.eq("patient_name", param.getPatientName());
+		}
+		if (oConvertUtils.isNotEmpty(param.getDoctorId())) {
+			queryWrapper.eq("doctor_id", param.getDoctorId());
+		}
 		IPage<AfterwardsAudit> violations = afterwardsAuditService.getDoctorViolations(page, queryWrapper, loginUser,param.getDoctorId());
 		// 返回结果
 		return Result.OK("获取成功", violations);

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

@@ -429,7 +429,7 @@ public class ViolationAnalysisController {
         QueryWrapper<AfterwardsAuditDetail> queryWrapper = QueryGenerator.initQueryWrapper(afterwardsAuditDetail, req.getParameterMap());
         if (StringUtils.hasText(afterwardsAuditDetail.getSearchContent())) {
             queryWrapper.and(q1 ->
-                    q1.eq("medical_project_code", afterwardsAuditDetail.getSearchContent().trim()).or().eq("medical_project_name", afterwardsAuditDetail.getSearchContent().trim())
+                    q1.eq("proejct_code", afterwardsAuditDetail.getSearchContent().trim()).or().eq("proejct_name", afterwardsAuditDetail.getSearchContent().trim())
             );
         }
         Page<AfterwardsAuditDetail> page = new Page<AfterwardsAuditDetail>(pageNo, pageSize);

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

@@ -540,20 +540,24 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     @Override
     public IPage<AfterwardsAudit> getDoctorViolations(Page<AfterwardsAudit> page, QueryWrapper<AfterwardsAudit> queryWrapper, LoginUser loginUser, String doctorId) {
         // 根据当前登录，先获取到医生面板
-        SysUser user = sysUserService.lambdaQuery().eq(SysUser::getDoctorId, doctorId).one();
-        List<SysUserDepart> list = sysUserDepartService.lambdaQuery().eq(SysUserDepart::getUserId, user.getId()).list();
-        if (list.size() == 0) {
-            log.error("找不到当前医生的科室，请检查");
-            throw new JeecgBootException("找不到当前医生的科室，请检查！");
+        if(oConvertUtils.isNotEmpty(doctorId)){
+//            SysUser user = sysUserService.lambdaQuery().eq(SysUser::getDoctorId, doctorId).one();
+//            List<SysUserDepart> list = sysUserDepartService.lambdaQuery().eq(SysUserDepart::getUserId, user.getId()).list();
+//
+////        if (list.size() == 0) {
+////            log.error("找不到当前医生的科室，请检查");
+////            throw new JeecgBootException("找不到当前医生的科室，请检查！");
+////        }
+//            // 当前登录科室/医生端的科室code
+//            SysDepart departById = departService.getDepartById(list.get(0).getDepId());
+//            String medicalDeptCode = departById.getMedicalDeptCode();
+//            // 获取医生code
+//
+//
+////        queryWrapper.eq("doctor_id", userByName.getDoctorId());
+//            queryWrapper.eq("medical_dept_code", medicalDeptCode);
         }
-        // 当前登录科室/医生端的科室code
-        SysDepart departById = departService.getDepartById(list.get(0).getDepId());
-        String medicalDeptCode = departById.getMedicalDeptCode();
-        // 获取医生code
-
 
-//        queryWrapper.eq("doctor_id", userByName.getDoctorId());
-        queryWrapper.eq("medical_dept_code", medicalDeptCode);
 
         Page<AfterwardsAudit> violations = this.page(page, queryWrapper);
         if (!CollectionUtils.isEmpty(violations.getRecords())) {

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

@@ -379,8 +379,8 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
         // 处理异常多收，少收
 //        BigDecimal detailTotalAmt = midIncidentAuditService.statissticsErrAmtByMidAuditRecordId(detailId);
 
-        v.setErrorRelativelyFewAmt(new BigDecimal("0.00"));
-        v.setErrorRelativelyManyAmt(new BigDecimal("0.00"));
+        v.setErrorRelativelyFewAmt(detailInfo.getErrorRelativelyFewAmt());
+        v.setErrorRelativelyManyAmt(detailInfo.getErrorRelativelyManyAmt());
         /*if (null != detailTotalAmt) {
             if (detailTotalAmt.compareTo(BigDecimal.ZERO) > 0) { // 异常金额大于0，就是多收
                 v.setErrorRelativelyManyAmt(detailTotalAmt);
@@ -427,16 +427,22 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
             //TODo 临时用
             AfterwardsAudit byId1 = afterwardsAuditService.getById(detialId);
             if (byId1 != null) {
-                prescriptionNumber = byId1.getPrescriptionNumber();
+//                prescriptionNumber = byId1.getPrescriptionNumber();
+                //更换 住院 门诊号查询
+                prescriptionNumber = byId1.getOutpatientNumber();
+
             }
         } else {
-            prescriptionNumber = byId.getPrescriptionNumber();
+//            prescriptionNumber = byId.getPrescriptionNumber();
+            prescriptionNumber = byId.getOutpatientNumber();
+
         }
         if (!StringUtils.hasText(prescriptionNumber)) {
             throw new JeecgBootException("找不到主单记录");
         }
         LambdaQueryWrapper<PrescriptionOrder> queryWrapper = Wrappers.<PrescriptionOrder>lambdaQuery()
-                .eq(PrescriptionOrder::getOrderNumber, prescriptionNumber);
+//                .eq(PrescriptionOrder::getOrderNumber, prescriptionNumber);
+                .eq(PrescriptionOrder::getInpOutpatientNumber, prescriptionNumber);
         return prescriptionOrderService.list(queryWrapper);
 
     }