用户、审核中心

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

@@ -154,10 +154,13 @@
                any_value (medical_dept_code) as medicalDeptCode,
                count(*) as errNum
         FROM afterwards_audit
-        WHERE
-            medical_dept_code = #{medicalDeptCode,jdbcType=VARCHAR}
-              AND check_state = 'process'
-              AND review_results = 'issue_review'
+        WHERE  check_state = 'process'
+                AND review_results = 'issue_review'
+
+        <if test="medicalDeptCode != null and medicalDeptCode != ''">
+            AND medical_dept_code = #{medicalDeptCode,jdbcType=VARCHAR}
+        </if>
+
             GROUP BY doctor_id
     </select>
     <!-- 获取科室下的医生 -->
@@ -168,7 +171,11 @@
             u.realname as doctorName
         FROM sys_user as u
             LEFT JOIN sys_user_depart as dm on u.id = dm.user_id
-        WHERE dm.dep_id = #{dptId,jdbcType=VARCHAR}
+        WHERE 1=1
+        <if test="dptId != null and dptId != ''">
+            AND  dm.dep_id = #{dptId,jdbcType=VARCHAR}
+        </if>
+
 
     </select>
 

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

@@ -190,11 +190,17 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     @Override
     public DeptAuditResponse deptAuditPanel(String loginUserName) {
         // 根据当前登录，先获取到医生面板
-        SysDepart sysDepart = baseMapper.loadUserDept(loginUserName);
-        if (null == sysDepart) {
-            log.error("找不到当前医生的科室，请检查");
-            throw new JeecgBootException("找不到当前医生的科室，请检查");
+        SysDepart sysDepart = new SysDepart();
+        if(loginUserName.equals("admin")){
+            sysDepart = new SysDepart();
+        }else{
+            sysDepart = baseMapper.loadUserDept(loginUserName);
+            if (null == sysDepart) {
+                log.error("找不到当前医生的科室，请检查");
+                throw new JeecgBootException("找不到当前医生的科室，请检查");
+            }
         }
+
         // 获取违规医生列表
         List<DeptAuditItemResponse> deptDoctorViolationList = baseMapper.loadDeptDoctorViolationList(sysDepart.getMedicalDeptCode());
         // 获取该科室的医生面板

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

@@ -12,6 +12,7 @@ import org.jeecg.modules.medical.common.bo.mid.AuditMidDetailListResponse;
 import org.jeecg.modules.medical.common.bo.mid.request.AuditMidDetailListRequest;
 import org.jeecg.modules.medical.common.bo.mid.response.*;
 import org.jeecg.modules.medical.entity.AdvanceWarningAuditDetail;
+import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
 import org.jeecg.modules.medical.service.IAdvanceWarningAuditDetailService;
 import org.jeecg.modules.medical.service.IMidIncidentAuditDetailService;
 import org.jeecg.modules.medical.service.IMidIncidentAuditService;
@@ -166,4 +167,12 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
     public IPage<MidAuditViolateProjectStatisticsResponse> violateProjectStatisticsList(IPage<AuditAdvanceWarningAuditDetailResponse> page, String projectSearch, String startTime, String endTime) {
         return midIncidentAuditDetailService.violateProjectStatisticsList(page, projectSearch, startTime, endTime);
     }
+
+//    @Override
+//    public IPage<AfterwardsAuditDetail> allAuditPage(AuditMidDetailListRequest request, Integer pageNo, Integer pageSize, Map<String, String[]> parameterMap) {
+//        Page<AfterwardsAuditDetail> page = new Page<>(pageNo, pageSize);
+//        IPage<AfterwardsAuditDetail> resultPage = midIncidentAuditService.page(page, request);
+//
+//        return resultPage;
+//    }
 }

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

@@ -221,6 +221,7 @@ public class SysUser implements Serializable {
     private String practiceRange;
 
     private String professionalName;
+    @Excel(name = "医师级别", width = 15,dicCode="doctor_level")
     @Dict(dicCode = "doctor_level")
     private String doctorLevel;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.model;
 
+import lombok.Data;
 import org.jeecg.modules.system.entity.SysDepart;
 
 import java.io.Serializable;
@@ -16,12 +17,14 @@ import java.util.Objects;
  * @Author Steve
  * @Since 2019-01-22 
  */
+@Data
 public class SysDepartTreeModel implements Serializable{
 	
     private static final long serialVersionUID = 1L;
     
     /** 对应SysDepart中的id字段,前端数据树中的key*/
     private String key;
+    private String medicalDeptCode;
 
     /** 对应SysDepart中的id字段,前端数据树中的value*/
     private String value;
@@ -113,6 +116,7 @@ public class SysDepartTreeModel implements Serializable{
         this.updateBy = sysDepart.getUpdateBy();
         this.updateTime = sysDepart.getUpdateTime();
         this.directorUserIds = sysDepart.getDirectorUserIds();
+        this.medicalDeptCode = sysDepart.getMedicalDeptCode();
         if(0 == sysDepart.getIzLeaf()){
             this.isLeaf = false;
         }else{

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

@@ -192,6 +192,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 			sysDepart.setOrgType(String.valueOf(orgType));
 			sysDepart.setCreateTime(new Date());
 			sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
+			sysDepart.setMedicalDeptCode(sysDepart.getMedicalDeptCode());
 			//新添加的部门是叶子节点
 			sysDepart.setIzLeaf(CommonConstant.IS_LEAF);
 			this.save(sysDepart);