Merge remote-tracking branch 'origin/master'

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

@@ -168,10 +168,10 @@ public class AfterwardsAuditController extends JeecgController<AfterwardsAudit,
 
 	 @ApiOperation(value = "科室端，医生违规面板", notes = "科室端，医生违规面板")
 	 @GetMapping(value = "/dept/panel/list")
-	 public Result<DeptAuditResponse> deptAuditPanel(HttpServletRequest request) {
+	 public Result<DeptAuditResponse> deptAuditPanel(HttpServletRequest request, String doctorName) {
 	 	// 获取当前登录的人，并获取到他的科室
 	 	String loginUserName = JwtUtil.getUserNameByToken(request);
-	 	DeptAuditResponse result = afterwardsAuditService.deptAuditPanel(loginUserName);
+	 	DeptAuditResponse result = afterwardsAuditService.deptAuditPanel(loginUserName, doctorName);
 	 	return Result.OK("获取成功", result);
 	 }
 

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

@@ -49,7 +49,7 @@ public interface AfterwardsAuditMapper extends BaseMapper<AfterwardsAudit> {
      * @param medicalDeptCode
      * @return
      */
-    List<DeptAuditItemResponse> loadDeptDoctorViolationList(@Param("medicalDeptCode") String medicalDeptCode);
+    List<DeptAuditItemResponse> loadDeptDoctorViolationList(@Param("medicalDeptCode") String medicalDeptCode, @Param("doctorName") String doctorName);
 
     List<DeptAuditItemResponse> loadDeptDoctorList(@Param("dptId") String dptId);
 

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

@@ -145,6 +145,9 @@
         <if test="medicalDeptCode != null and medicalDeptCode != ''">
             AND medical_dept_code = #{medicalDeptCode,jdbcType=VARCHAR}
         </if>
+        <if test="doctorName != null and doctorName != ''" >
+            AND doctor_name like concat(concat('%',#{doctorName}),'%')
+        </if>
 
             GROUP BY doctor_id
     </select>

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

@@ -46,7 +46,7 @@ public interface IAfterwardsAuditService extends IService<AfterwardsAudit> {
 
     boolean audit(LoginUser loginUser, AuditRequestBO param);
 
-    DeptAuditResponse deptAuditPanel(String loginUserName);
+    DeptAuditResponse deptAuditPanel(String loginUserName, String doctorName);
     IPage<DeptAuditItemResponse> violationDoctor(Page<DeptAuditItemResponse> page,String doctorId,String createTimeBegin,String createTimeEnd);
 
     /**

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

@@ -179,7 +179,7 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
 
 
     @Override
-    public DeptAuditResponse deptAuditPanel(String loginUserName) {
+    public DeptAuditResponse deptAuditPanel(String loginUserName, String doctorName) {
         // 根据当前登录，先获取到医生面板
         SysDepart sysDepart = new SysDepart();
         if(loginUserName.equals("admin")){
@@ -193,7 +193,7 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
         }
 
         // 获取违规医生列表
-        List<DeptAuditItemResponse> deptDoctorViolationList = baseMapper.loadDeptDoctorViolationList(sysDepart.getMedicalDeptCode());
+        List<DeptAuditItemResponse> deptDoctorViolationList = baseMapper.loadDeptDoctorViolationList(sysDepart.getMedicalDeptCode(), doctorName);
         // 获取该科室的医生面板
         List<DeptAuditItemResponse> deptDoctorList = baseMapper.loadDeptDoctorList(sysDepart.getId());
         List<DeptAuditItemResponse> allDeptDoctorList = new ArrayList<>();
@@ -215,7 +215,7 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     public IPage<DeptAuditItemResponse> violationDoctor(Page<DeptAuditItemResponse> page,String deptCode,String createTimeBegin,String createTimeEnd) {
 
         // 获取违规医生列表
-        List<DeptAuditItemResponse> deptDoctorViolationList = baseMapper.loadDeptDoctorViolationList(deptCode);
+        List<DeptAuditItemResponse> deptDoctorViolationList = baseMapper.loadDeptDoctorViolationList(deptCode, null);
         // 获取该科室的医生面板
 //        List<DeptAuditItemResponse> deptDoctorList = baseMapper.loadDeptDoctorList(sysDepart.getId());
 //        List<DeptAuditItemResponse> allDeptDoctorList = new ArrayList<>();

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://124.220.224.184:3306/medical_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://124.220.224.184:3306/medical?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: G@7NYpxInsxLOn%l
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -160,7 +160,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置