病例分配

medical_history-vue/src/views/admin/AdminDoctorUserList.vue

@@ -286,11 +286,11 @@ export default {
           align: 'center',
           dataIndex: 'backCard'
         },
-        {
-          title: '开户行',
-          align: 'center',
-          dataIndex: 'backName'
-        },
+        // {
+        //   title: '开户行',
+        //   align: 'center',
+        //   dataIndex: 'backName'
+        // },
         {
           title: '是否允许病历上传',
           align: 'center',

medical_history-vue/src/views/admin/AdminSpecialistUserList.vue

@@ -268,11 +268,11 @@
             align:"center",
             dataIndex: 'backCard'
           },
-          {
-            title:'开户行',
-            align:"center",
-            dataIndex: 'backName'
-          },
+          // {
+          //   title:'开户行',
+          //   align:"center",
+          //   dataIndex: 'backName'
+          // },
           {
             title: '操作',
             dataIndex: 'action',

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admincasehistory/controller/AdminMedicalHistoryController.java

@@ -13,7 +13,9 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.aliyun.ocr_api20210707.models.RecognizeAdvancedResponse;
 import com.aliyun.tea.TeaException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import net.sf.json.JSONObject;
+import org.apache.catalina.security.SecurityUtil;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -28,7 +30,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.adminuser.entity.AdminCompSelect;
 import org.jeecg.modules.adminuser.entity.AdminUser;
+import org.jeecg.modules.adminuser.service.IAdminCompSelectService;
 import org.jeecg.modules.adminuser.service.IAdminUserService;
 import org.jeecg.modules.api.entity.ORCPicUrl;
 import org.jeecg.modules.system.service.ISysUserService;
@@ -66,6 +70,8 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
     private IAdminUserService adminUserService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private IAdminCompSelectService adminCompSelectService;
 
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
@@ -85,20 +91,20 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
     public Result<IPage<AdminMedicalHistory>> queryPageList(AdminMedicalHistory adminMedicalHistory,
                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                            HttpServletRequest req,String sstitle,String ssname) {
+                                                            HttpServletRequest req, String sstitle, String ssname) {
         QueryWrapper<AdminMedicalHistory> queryWrapper = QueryGenerator.initQueryWrapper(adminMedicalHistory, req.getParameterMap());
         //未初审的
 //        queryWrapper.eq("first_trial","0").or().eq( "first_trial","1" );
-        queryWrapper.in( "first_trial","0","1" );
-        if (sstitle != null){
-            queryWrapper.like("title",sstitle);
+        queryWrapper.in("first_trial", "0", "1");
+        if (sstitle != null) {
+            queryWrapper.like("title", sstitle);
         }
-        if (ssname != null){
-            queryWrapper.like("submitter_name",ssname);
+        if (ssname != null) {
+            queryWrapper.like("submitter_name", ssname);
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<String> role = sysUserService.getRole(sysUser.getUsername());
-        if (!role.contains("admin")){
+        if (!role.contains("admin")) {
             queryWrapper.eq("sys_org_code", sysUser.getOrgCode());
         }
 
@@ -107,28 +113,28 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
         return Result.OK(pageList);
     }
 
-//    初审通过病例列表
+    //    初审通过病例列表
     @GetMapping(value = "/list2")
     public Result<IPage<AdminMedicalHistory>> list2(AdminMedicalHistory adminMedicalHistory,
-                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                            HttpServletRequest req,String sstitle,String ssname) {
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req, String sstitle, String ssname) {
         QueryWrapper<AdminMedicalHistory> queryWrapper = QueryGenerator.initQueryWrapper(adminMedicalHistory, req.getParameterMap());
         //不能是初审通过未二次上传的  应该是初审通过未分配的
-        queryWrapper.eq("first_trial","2");
-        queryWrapper.eq("allocation","1");
-        if (sstitle != null){
-            queryWrapper.like("title",sstitle);
+        queryWrapper.eq("first_trial", "2");
+        queryWrapper.eq("allocation", "1");
+        if (sstitle != null) {
+            queryWrapper.like("title", sstitle);
         }
-        if (ssname != null){
-            queryWrapper.like("submitter_name",ssname);
+        if (ssname != null) {
+            queryWrapper.like("submitter_name", ssname);
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<String> role = sysUserService.getRole(sysUser.getUsername());
-        if (!role.contains("admin")){
+        if (!role.contains("admin")) {
             queryWrapper.eq("sys_org_code", sysUser.getOrgCode());
         }
-        queryWrapper.orderByDesc( "auditor_time" );
+        queryWrapper.orderByDesc("auditor_time");
         Page<AdminMedicalHistory> page = new Page<AdminMedicalHistory>(pageNo, pageSize);
         IPage<AdminMedicalHistory> pageList = adminMedicalHistoryService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -137,46 +143,47 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
     //    专家审核病例列表
     @GetMapping(value = "/list3")
     public Result<IPage<AdminMedicalHistory>> list3(AdminMedicalHistory adminMedicalHistory,
-                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                            HttpServletRequest req,String sstitle,String ssname) {
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req, String sstitle, String ssname) {
         QueryWrapper<AdminMedicalHistory> queryWrapper = QueryGenerator.initQueryWrapper(adminMedicalHistory, req.getParameterMap());
         //已分配的就算专家审核病理列表  不论是专家 未审理 没通过  通过了都算专家审核病例列表
-        queryWrapper.eq("allocation","2");
-        if (sstitle != null){
-            queryWrapper.like("title",sstitle);
+        queryWrapper.eq("allocation", "2");
+        if (sstitle != null) {
+            queryWrapper.like("title", sstitle);
         }
-        if (ssname != null){
-            queryWrapper.like("submitter_name",ssname);
+        if (ssname != null) {
+            queryWrapper.like("submitter_name", ssname);
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<String> role = sysUserService.getRole(sysUser.getUsername());
-        if (!role.contains("admin")){
+        if (!role.contains("admin")) {
             queryWrapper.eq("sys_org_code", sysUser.getOrgCode());
         }
-        queryWrapper.orderByDesc( "zjsp_time    " );
+        queryWrapper.orderByDesc("zjsp_time");
         Page<AdminMedicalHistory> page = new Page<AdminMedicalHistory>(pageNo, pageSize);
         IPage<AdminMedicalHistory> pageList = adminMedicalHistoryService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
+
     //优秀病例列表（专家审核通过的病例列表）
     @GetMapping(value = "/list4")
     public Result<IPage<AdminMedicalHistory>> list4(AdminMedicalHistory adminMedicalHistory,
                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                    HttpServletRequest req,String sstitle,String ssname) {
+                                                    HttpServletRequest req, String sstitle, String ssname) {
         QueryWrapper<AdminMedicalHistory> queryWrapper = QueryGenerator.initQueryWrapper(adminMedicalHistory, req.getParameterMap());
         //专家审核通过
-        queryWrapper.eq("type","2");
-        if (sstitle != null){
-            queryWrapper.like("title",sstitle);
+        queryWrapper.eq("type", "2");
+        if (sstitle != null) {
+            queryWrapper.like("title", sstitle);
         }
-        if (ssname != null){
-            queryWrapper.like("submitter_name",ssname);
+        if (ssname != null) {
+            queryWrapper.like("submitter_name", ssname);
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<String> role = sysUserService.getRole(sysUser.getUsername());
-        if (!role.contains("admin")){
+        if (!role.contains("admin")) {
             queryWrapper.eq("sys_org_code", sysUser.getOrgCode());
         }
         Page<AdminMedicalHistory> page = new Page<AdminMedicalHistory>(pageNo, pageSize);
@@ -187,10 +194,14 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
     //可以分配的数量
     @PostMapping(value = "/listNum")
     public Result<Integer> listNum() {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String orgCode = sysUser.getOrgCode();
+
         QueryWrapper<AdminMedicalHistory> queryWrapper = new QueryWrapper<>();
         //后台初审通过  但没分配
-        queryWrapper.eq("first_trial","2");
-        queryWrapper.eq("allocation","1");
+        queryWrapper.eq("first_trial", "2");
+        queryWrapper.eq("allocation", "1");
+        queryWrapper.eq("sys_org_code", orgCode);
         List<AdminMedicalHistory> list = adminMedicalHistoryService.list(queryWrapper);
         return Result.OK(list.size());
     }
@@ -203,23 +214,22 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
 
 
         //查询所有专家（分配数量不为0的）
-        QueryWrapper<AdminUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq( "doctor_and_specialist","2" );
-        queryWrapper.ne( "allocation_num",0 );
-
-        queryWrapper.eq("sys_org_code", sysUser.getOrgCode());
+        LambdaQueryWrapper<AdminCompSelect> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AdminCompSelect::getDoctorAndSpecialist, "2");
+        queryWrapper.ne(AdminCompSelect::getAllocationNum, 0);
+        queryWrapper.eq(AdminCompSelect::getSysOrgCode, sysUser.getOrgCode());
 
-        List<AdminUser> list1 = adminUserService.list(queryWrapper);
-        for (int o = 0;o<list1.size();o++){
-            System.err.println(list1.get( o ).toString());
+        List<AdminCompSelect> list1 = adminCompSelectService.list(queryWrapper);
+        for (int o = 0; o < list1.size(); o++) {
+            System.err.println(list1.get(o).toString());
         }
 
         //查询所有没有分配专家的病例
-        QueryWrapper<AdminMedicalHistory> queryWrapper2 = new QueryWrapper<>();
+        LambdaQueryWrapper<AdminMedicalHistory> queryWrapper2 = new LambdaQueryWrapper<>();
         //后台初审通过  但没分配
-        queryWrapper2.eq("first_trial","2");
-        queryWrapper2.eq("allocation","1");
-        queryWrapper2.eq("sys_org_code", sysUser.getOrgCode());
+        queryWrapper2.eq(AdminMedicalHistory::getFirstTrial, "2");
+        queryWrapper2.eq(AdminMedicalHistory::getAllocation, "1");
+        queryWrapper2.eq(AdminMedicalHistory::getSysOrgCode, sysUser.getOrgCode());
 
         List<AdminMedicalHistory> list = adminMedicalHistoryService.list(queryWrapper2);
 
@@ -240,10 +250,10 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
                 sb.setLength(0);
                 if (userCount * (j) + i <= clientCount - 1) {
                     //list1.get(i) 给专家账号分配数清零
-                    AdminUser adminUser = new AdminUser();
+                    AdminCompSelect adminUser = new AdminCompSelect();
                     adminUser.setId(list1.get(i).getId());
-                    adminUser.setAllocationNum(divideCount-(j+1));
-                    adminUserService.updateById(adminUser);
+                    adminUser.setAllocationNum(divideCount - (j + 1));
+                    adminCompSelectService.updateById(adminUser);
                     //list.get(userCount * (j) + i)给病例添加分配人
                     AdminMedicalHistory adminMedicalHistory = new AdminMedicalHistory();
                     adminMedicalHistory.setId(list.get(userCount * (j) + i).getId());
@@ -258,6 +268,7 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
         }
         return Result.OK("分配成功");
     }
+
     /**
      * 添加
      *
@@ -278,7 +289,7 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
     }
 
     @PostMapping(value = "/ORC")
-    public Result<String> ORC(@RequestBody ORCPicUrl orcPicUrl)throws Exception {
+    public Result<String> ORC(@RequestBody ORCPicUrl orcPicUrl) throws Exception {
         com.aliyun.ocr_api20210707.Client client = createClient("LTAI5tD17r71nA9bfKtzcayJ", "EblO65wHRfmOtl3GrAeBbAu8i05H8O");
         com.aliyun.ocr_api20210707.models.RecognizeAdvancedRequest recognizeAdvancedRequest = new com.aliyun.ocr_api20210707.models.RecognizeAdvancedRequest()
                 .setUrl(orcPicUrl.getPicUrl());
@@ -290,19 +301,20 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
 //            System.err.println(data);
             JSONObject jsonObject = JSONObject.fromObject(data);
 
-            String content = jsonObject.getString( "content" );
+            String content = jsonObject.getString("content");
             return Result.OK(content);
         } catch (TeaException error) {
             // 如有需要，请打印 error
             com.aliyun.teautil.Common.assertAsString(error.message);
-            return Result.error("识别错误1:"+error.message);
+            return Result.error("识别错误1:" + error.message);
         } catch (Exception _error) {
             TeaException error = new TeaException(_error.getMessage(), _error);
             // 如有需要，请打印 error
             com.aliyun.teautil.Common.assertAsString(error.message);
-            return Result.error("识别错误2:"+error.message);
+            return Result.error("识别错误2:" + error.message);
         }
     }
+
     public static com.aliyun.ocr_api20210707.Client createClient(String accessKeyId, String accessKeySecret) throws Exception {
         com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config()
                 // 必填，您的 AccessKey ID
@@ -327,8 +339,8 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
 //        if (adminMedicalHistory.getType()!=null){
 //            adminMedicalHistory.setZjspTime( new Date(  ) );
 //        }
-        if (adminMedicalHistory.getFirstTrial()!=null){
-            adminMedicalHistory.setAuditorTime( new Date(  ) );
+        if (adminMedicalHistory.getFirstTrial() != null) {
+            adminMedicalHistory.setAuditorTime(new Date());
         }
         adminMedicalHistoryService.updateById(adminMedicalHistory);
         return Result.OK("编辑成功!");
@@ -393,18 +405,18 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
 //        return super.exportXls(request, adminMedicalHistory, AdminMedicalHistory.class, "待审核病历列表");
 //    }
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, AdminMedicalHistory adminMedicalHistory,String sstitle,String ssname) {
+    public ModelAndView exportXls(HttpServletRequest request, AdminMedicalHistory adminMedicalHistory, String sstitle, String ssname) {
         String title = "待审核病历列表";
         // Step.1 组装查询条件
         QueryWrapper<AdminMedicalHistory> queryWrapper = QueryGenerator.initQueryWrapper(adminMedicalHistory, request.getParameterMap());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (sstitle != null){
-            queryWrapper.like( "title",sstitle );
+        if (sstitle != null) {
+            queryWrapper.like("title", sstitle);
         }
-        if (ssname != null){
-            queryWrapper.like( "submitter_name",ssname );
+        if (ssname != null) {
+            queryWrapper.like("submitter_name", ssname);
         }
-        queryWrapper.in("first_trial","0","1");
+        queryWrapper.in("first_trial", "0", "1");
         // Step.2 获取导出数据
         List<AdminMedicalHistory> pageList = service.list(queryWrapper);
 
@@ -421,12 +433,12 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
         }
         //导出不太可能 一是慢这个没啥问题 二是只能通过
         int a = exportList.size();
-        for (int i = 0; i<a;i++){
-            if (exportList.get( i ).getSubmitterName()==null){
+        for (int i = 0; i < a; i++) {
+            if (exportList.get(i).getSubmitterName() == null) {
                 QueryWrapper<AdminUser> queryWrapper2 = new QueryWrapper<>();
-                queryWrapper2.eq( "phone", exportList.get( i ).getPhone() );
-                AdminUser storeMember1 = adminUserService.getOne( queryWrapper2 );
-                exportList.get( i ).setSubmitterName( storeMember1.getName() );
+                queryWrapper2.eq("phone", exportList.get(i).getPhone());
+                AdminUser storeMember1 = adminUserService.getOne(queryWrapper2);
+                exportList.get(i).setSubmitterName(storeMember1.getName());
             }
         }
 
@@ -435,13 +447,14 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
         mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
         mv.addObject(NormalExcelConstants.CLASS, AdminMedicalHistory.class);
         //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-        ExportParams  exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
         exportParams.setImageBasePath(upLoadPath);
         //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
-        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }
+
     private String getId(AdminMedicalHistory item) {
         try {
             return PropertyUtils.getProperty(item, "id").toString();
@@ -450,8 +463,9 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
             return null;
         }
     }
+
     @RequestMapping(value = "/exportXls2")
-    public ModelAndView exportXls2(HttpServletRequest request, AdminMedicalHistory adminMedicalHistory,String sstitle,String ssname) {
+    public ModelAndView exportXls2(HttpServletRequest request, AdminMedicalHistory adminMedicalHistory, String sstitle, String ssname) {
 //        adminMedicalHistory.setTitle( sstitle );
 //        adminMedicalHistory.setName( ssname );
 //        adminMedicalHistory.setFirstTrial( "2" );
@@ -461,14 +475,14 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
         // Step.1 组装查询条件
         QueryWrapper<AdminMedicalHistory> queryWrapper = QueryGenerator.initQueryWrapper(adminMedicalHistory, request.getParameterMap());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (sstitle != null){
-            queryWrapper.like( "title",sstitle );
+        if (sstitle != null) {
+            queryWrapper.like("title", sstitle);
         }
-        if (ssname != null){
-            queryWrapper.like( "submitter_name",ssname );
+        if (ssname != null) {
+            queryWrapper.like("submitter_name", ssname);
         }
-        queryWrapper.eq( "allocation","1" );
-        queryWrapper.eq( "first_trial","2" );
+        queryWrapper.eq("allocation", "1");
+        queryWrapper.eq("first_trial", "2");
         // Step.2 获取导出数据
         List<AdminMedicalHistory> pageList = service.list(queryWrapper);
 
@@ -484,12 +498,12 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
             exportList = pageList;
         }
         int a = exportList.size();
-        for (int i = 0; i<a;i++){
-            if (exportList.get( i ).getSubmitterName()==null){
+        for (int i = 0; i < a; i++) {
+            if (exportList.get(i).getSubmitterName() == null) {
                 QueryWrapper<AdminUser> queryWrapper2 = new QueryWrapper<>();
-                queryWrapper2.eq( "phone", exportList.get( i ).getPhone() );
-                AdminUser storeMember1 = adminUserService.getOne( queryWrapper2 );
-                exportList.get( i ).setSubmitterName( storeMember1.getName() );
+                queryWrapper2.eq("phone", exportList.get(i).getPhone());
+                AdminUser storeMember1 = adminUserService.getOne(queryWrapper2);
+                exportList.get(i).setSubmitterName(storeMember1.getName());
             }
         }
         // Step.3 AutoPoi 导出Excel
@@ -497,15 +511,16 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
         mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
         mv.addObject(NormalExcelConstants.CLASS, AdminMedicalHistory.class);
         //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-        ExportParams  exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
         exportParams.setImageBasePath(upLoadPath);
         //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
-        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }
+
     @RequestMapping(value = "/exportXls3")
-    public ModelAndView exportXls3(HttpServletRequest request, AdminMedicalHistory adminMedicalHistory,String sstitle,String ssname) {
+    public ModelAndView exportXls3(HttpServletRequest request, AdminMedicalHistory adminMedicalHistory, String sstitle, String ssname) {
 //        adminMedicalHistory.setTitle( sstitle );
 ////        adminMedicalHistory.setName( ssname );
 ////        adminMedicalHistory.setAllocation( "2" );
@@ -514,13 +529,13 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
         // Step.1 组装查询条件
         QueryWrapper<AdminMedicalHistory> queryWrapper = QueryGenerator.initQueryWrapper(adminMedicalHistory, request.getParameterMap());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (sstitle != null){
-            queryWrapper.like( "title",sstitle );
+        if (sstitle != null) {
+            queryWrapper.like("title", sstitle);
         }
-        if (ssname != null){
-            queryWrapper.like( "submitter_name",ssname );
+        if (ssname != null) {
+            queryWrapper.like("submitter_name", ssname);
         }
-        queryWrapper.eq( "allocation","2" );
+        queryWrapper.eq("allocation", "2");
         // Step.2 获取导出数据
         List<AdminMedicalHistory> pageList = service.list(queryWrapper);
 
@@ -536,12 +551,12 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
             exportList = pageList;
         }
         int a = exportList.size();
-        for (int i = 0; i<a;i++){
-            if (exportList.get( i ).getSubmitterName()==null){
+        for (int i = 0; i < a; i++) {
+            if (exportList.get(i).getSubmitterName() == null) {
                 QueryWrapper<AdminUser> queryWrapper2 = new QueryWrapper<>();
-                queryWrapper2.eq( "phone", exportList.get( i ).getPhone() );
-                AdminUser storeMember1 = adminUserService.getOne( queryWrapper2 );
-                exportList.get( i ).setSubmitterName( storeMember1.getName() );
+                queryWrapper2.eq("phone", exportList.get(i).getPhone());
+                AdminUser storeMember1 = adminUserService.getOne(queryWrapper2);
+                exportList.get(i).setSubmitterName(storeMember1.getName());
             }
         }
         // Step.3 AutoPoi 导出Excel
@@ -549,15 +564,16 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
         mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
         mv.addObject(NormalExcelConstants.CLASS, AdminMedicalHistory.class);
         //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-        ExportParams  exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
         exportParams.setImageBasePath(upLoadPath);
         //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
-        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }
+
     @RequestMapping(value = "/exportXls4")
-    public ModelAndView exportXls4(HttpServletRequest request, AdminMedicalHistory adminMedicalHistory,String sstitle,String ssname) {
+    public ModelAndView exportXls4(HttpServletRequest request, AdminMedicalHistory adminMedicalHistory, String sstitle, String ssname) {
 //        adminMedicalHistory.setTitle( sstitle );
 //        adminMedicalHistory.setName( ssname );
 //        adminMedicalHistory.setType( "2" );
@@ -566,13 +582,13 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
         // Step.1 组装查询条件
         QueryWrapper<AdminMedicalHistory> queryWrapper = QueryGenerator.initQueryWrapper(adminMedicalHistory, request.getParameterMap());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (sstitle != null){
-            queryWrapper.like( "title",sstitle );
+        if (sstitle != null) {
+            queryWrapper.like("title", sstitle);
         }
-        if (ssname != null){
-            queryWrapper.like( "submitter_name",ssname );
+        if (ssname != null) {
+            queryWrapper.like("submitter_name", ssname);
         }
-        queryWrapper.eq( "type","2" );
+        queryWrapper.eq("type", "2");
         // Step.2 获取导出数据
         List<AdminMedicalHistory> pageList = service.list(queryWrapper);
 
@@ -588,12 +604,12 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
             exportList = pageList;
         }
         int a = exportList.size();
-        for (int i = 0; i<a;i++){
-            if (exportList.get( i ).getSubmitterName()==null){
+        for (int i = 0; i < a; i++) {
+            if (exportList.get(i).getSubmitterName() == null) {
                 QueryWrapper<AdminUser> queryWrapper2 = new QueryWrapper<>();
-                queryWrapper2.eq( "phone", exportList.get( i ).getPhone() );
-                AdminUser storeMember1 = adminUserService.getOne( queryWrapper2 );
-                exportList.get( i ).setSubmitterName( storeMember1.getName() );
+                queryWrapper2.eq("phone", exportList.get(i).getPhone());
+                AdminUser storeMember1 = adminUserService.getOne(queryWrapper2);
+                exportList.get(i).setSubmitterName(storeMember1.getName());
             }
         }
         // Step.3 AutoPoi 导出Excel
@@ -601,13 +617,14 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
         mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
         mv.addObject(NormalExcelConstants.CLASS, AdminMedicalHistory.class);
         //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
-        ExportParams  exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
         exportParams.setImageBasePath(upLoadPath);
         //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
-        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }
+
     /**
      * 通过excel导入数据
      *
@@ -629,11 +646,11 @@ public class AdminMedicalHistoryController extends JeecgController<AdminMedicalH
     @AutoLog(value = "病历管理-退回")
     @ApiOperation(value = "病历管理-退回", notes = "病历管理-退回")
     @RequestMapping(value = "/returnDetail", method = {RequestMethod.PUT, RequestMethod.POST})
-    public Result<String> returnDetail(@RequestBody  String id) {
+    public Result<String> returnDetail(@RequestBody String id) {
         String[] split = id.split("=");
         String s = split[0];
         AdminMedicalHistory adminMedicalHistory = adminMedicalHistoryService.getById(s);
-        if (null==adminMedicalHistory){
+        if (null == adminMedicalHistory) {
             return Result.error("数据不存在");
         }
         adminMedicalHistory.setFirstTrial("0");

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/controller/AdminSpecialistUserController.java

@@ -122,8 +122,11 @@ public class AdminSpecialistUserController extends JeecgController<AdminUser, IA
 
     @PostMapping(value = "/num")
     public Result<Integer> num() {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String orgCode = sysUser.getOrgCode();
         QueryWrapper<AdminUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("doctor_and_specialist", "2");
+        queryWrapper.eq("sys_org_code", orgCode);
         Integer num = adminUserService.num(queryWrapper);
         return Result.OK(num);
     }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/entity/AdminCompSelect.java

@@ -119,7 +119,7 @@ public class AdminCompSelect implements Serializable {
     @ApiModelProperty(value = "专家分配数量")
     private Integer allocationNum;
 
-    @ApiModelProperty(value = "专家分配数量")
+    @ApiModelProperty(value = "姓名")
     private String name;
 
 

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/service/impl/AdminTransferAccountsServiceImpl.java

@@ -191,7 +191,7 @@ public class AdminTransferAccountsServiceImpl extends ServiceImpl<AdminTransferA
             //update-begin-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
             QueryWrapper<AdminUser> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("phone", userPhone);
-            queryWrapper.eq("is_true", "1");
+
             AdminUser storeMember1 = adminUserService.getOne(queryWrapper);
 
             if (storeMember1 == null) {

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/service/impl/AdminUserServiceImpl.java

@@ -35,8 +35,7 @@ import org.jeecg.modules.pay.sdk.base.YzhConfig;
 import org.jeecg.modules.pay.sdk.base.YzhRequest;
 import org.jeecg.modules.pay.sdk.base.YzhResponse;
 import org.jeecg.modules.pay.sdk.payment.PaymentClient;
-import org.jeecg.modules.pay.sdk.payment.domain.CreateBankpayOrderRequest;
-import org.jeecg.modules.pay.sdk.payment.domain.CreateBankpayOrderResponse;
+import org.jeecg.modules.pay.sdk.payment.domain.*;
 import org.jeecg.modules.system.util.SecurityUtil;
 import org.jeecg.modules.utils.HttpClientUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -211,43 +210,47 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             return Result.error("请确认云账户权限是否开启");
         }
 
-        CreateBankpayOrderRequest request = new CreateBankpayOrderRequest();
+        CreateBatchOrderRequest request = new CreateBatchOrderRequest();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         Date date = new Date();
         String format = sdf.format(date);
         Random random = new Random();
         int randomNumber = random.nextInt(900000) + 100000;
-        request.setOrderId("BL" + format + randomNumber);
+
+        request.setBatchId("batchaId" + format + randomNumber);
         request.setDealerId(dealer_id);
         request.setBrokerId(broker_id);
+        request.setChannel("银行卡");
+        request.setWxAppId("");
+        request.setTotalPay(String.valueOf(adminUser1.getMoney()));
+        request.setTotalCount("1");
+        request.setOrderList(getBatchOrderInfoList(adminUser1));
 
-
-        request.setRealName(adminCompSelect.getName());
-        request.setCardNo(adminCompSelect.getBackCard());
-        request.setPhoneNo(adminCompSelect.getCardholderPhone());
-        request.setIdCard(adminCompSelect.getCard());
-        request.setPay(String.valueOf(adminUser1.getMoney()));
-        request.setPayRemark(adminUser1.getNotes());
-
-//        request.setNotifyUrl(host+"/adminDoctorUser/adminUser/notifyUrl");
-        request.setNotifyUrl("http://59.110.230.108:10001/adminDoctorUser/adminUser/notifyUrl");
-        YzhResponse<CreateBankpayOrderResponse> response = null;
+        YzhResponse<CreateBatchOrderResponse> response = null;
         try {
             String requestId = BaseUtil.getRandomStr("requestId");
             // request-id：每次请求的唯一标识
             // 强烈建议平台企业自定义 request-id 并记录在日志中，如遇异常请求，便于使用 request-id 追踪问题
             // 如未自定义则使用 SDK 中的 UUID 方法自动生成，注意：UUID 方法不能保证全局唯一，可能会出现 ID 重复，推荐自行实现全局唯一 ID
-            response = clientPay.createBankpayOrder(YzhRequest.build(requestId, request));
+            response = clientPay.createBatchOrder(YzhRequest.build(requestId, request));
             if (response.isSuccess()) {// 请求成功
-                CreateBankpayOrderResponse data = response.getData();
-                baseCommonService.addLog("请求成功转账的唯一标识request-id： " + requestId + "", CommonConstant.LOG_TYPE_2, 2);
-                return Result.ok("请求成功：转账金额" + request.getPay());
+                CreateBatchOrderResponse data = response.getData();
+                System.out.println("请求成功返回批次号：" + data.getBatchId());
+                for (BatchOrderResult res : data.getResultList()) {
+                    System.out.println("订单详情");
+                    System.out.println(res);
+                    System.out.println("-------------------");
+                    baseCommonService.addLog("请求成功转账的唯一标识request-id： " + requestId + "", CommonConstant.LOG_TYPE_2, 2);
+                    return Result.ok("操作成功");
+
+                }
             } else {
                 System.out.println("HTTP Status Code：" + response.getHttpCode());
                 System.out.println("发生异常：" + response.getCode() + "-" + response.getMessage());
                 baseCommonService.addLog("发生异常转账的唯一标识request-id： " + requestId + response.getCode() + "-" + response.getMessage(), CommonConstant.LOG_TYPE_2, 2);
-                return Result.error(response.getCode() + "-" + response.getMessage());
+                return Result.error("发生异常：" + response.getCode() + "-" + response.getMessage());
             }
+            return Result.ok("操作成功");
         } catch (Exception e) {
             return Result.error("请求失败");
         }
@@ -481,9 +484,11 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
         adminCompSelect.setCardPic(adminUser.getCardPic());
         adminCompSelect.setName(adminUser.getName());
         adminCompSelect.setWisWjdc(adminUser.getWisWjdc());
+        adminCompSelect.setAllocationNum(adminUser.getAllocationNum());
         adminCompSelect.setWisMhu(adminUser.getWisMhu());
         adminCompSelectService.updateById(adminCompSelect);
 
+
     }
 
     @Override
@@ -670,12 +675,40 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
         adminCompSelect.setAvatar(adminUser.getAvatar());
         adminCompSelect.setCardPic(adminUser.getCardPic());
         adminCompSelect.setName(adminUser.getName());
+        adminCompSelect.setAllocationNum(adminUser.getAllocationNum());
         adminCompSelect.setWisWjdc(adminUser.getWisWjdc());
         adminCompSelect.setWisMhu(adminUser.getWisMhu());
         adminCompSelectService.updateById(adminCompSelect);
 
-
     }
 
+    private BatchOrderInfo[] getBatchOrderInfoList(AdminUser adminUser1) {
+        String id = adminUser1.getId();
+        AdminCompSelect adminCompSelect = adminCompSelectService.getById(id);
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        Date date = new Date();
+        String format = sdf.format(date);
+        Random random = new Random();
+        int randomNumber = random.nextInt(900000) + 100000;
+
+        BatchOrderInfo info1 = new BatchOrderInfo();
+        info1.setOrderId("BL" + format + randomNumber);
+        info1.setRealName(adminCompSelect.getCardholderName());
+        info1.setIdCard(adminCompSelect.getCard());
+        info1.setCardNo(adminCompSelect.getBackCard());
+        info1.setOpenid("");
+        info1.setPhoneNo(adminCompSelect.getCardholderPhone());
+        info1.setProjectId("");
+        info1.setPay(String.valueOf(adminUser1.getMoney()));
+        info1.setPayRemark(adminUser1.getNotes());
+        info1.setNotifyUrl("http://59.110.230.108:10001/adminDoctorUser/adminUser/notifyUrl");
 
+
+        BatchOrderInfo[] infoArry = new BatchOrderInfo[1];
+        infoArry[0] = info1;
+
+        return infoArry;
+
+    }
 }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/APIController.java

@@ -7,6 +7,7 @@ import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
 import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
 import com.aliyun.tea.TeaException;
 import com.aliyun.teautil.models.RuntimeOptions;
+import com.baomidou.mybatisplus.core.conditions.query.Query;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -730,6 +731,10 @@ public class APIController {
             QueryWrapper<AdminUser> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("phone", userPhone);
             AdminUser storeMember1 = adminUserService.getOne(queryWrapper);
+//            QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
+//            adminCompSelectQueryWrapper.eq("phone",userPhone);
+//            adminCompSelectQueryWrapper.eq("sys_org_code",storeMember1.getSysOrgCode());
+//            AdminCompSelect one = adminCompSelectService.getOne(adminCompSelectQueryWrapper);
 
             if (storeMember1 == null) {
                 result.setMessage("token校验该用户不存在");
@@ -738,6 +743,7 @@ public class APIController {
             }
             QueryWrapper<AdminMedicalHistory> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("phone", userPhone);
+            queryWrapper2.eq("sys_org_code", storeMember1.getSysOrgCode());
             queryWrapper2.orderByDesc("create_time");
             List<AdminMedicalHistory> list = adminMedicalHistoryService.list(queryWrapper2);
 
@@ -791,6 +797,7 @@ public class APIController {
 
             queryWrapper2.eq("allocation_zjphone", userPhone);
             queryWrapper2.eq("allocation", "2");
+            queryWrapper2.eq("sys_org_code", storeMember1.getSysOrgCode());
             List<AdminMedicalHistory> list = adminMedicalHistoryService.list(queryWrapper2);
 
             result.setMessage("获取专家账号病例列表成功");
@@ -1220,12 +1227,19 @@ public class APIController {
             QueryWrapper<AdminUser> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("phone", userPhone);
             AdminUser storeMember1 = adminUserService.getOne(queryWrapper);
+            String sysOrgCode = storeMember1.getSysOrgCode();
+            QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
+
+            adminCompSelectQueryWrapper.eq("phone",userPhone);
+            adminCompSelectQueryWrapper.eq("sys_org_code",sysOrgCode);
+            AdminCompSelect one = adminCompSelectService.getOne(adminCompSelectQueryWrapper);
+
             if (storeMember1 == null) {
                 result.setMessage("token校验该用户不存在");
                 baseCommonService.addLog("用户校验失败，用户不存在！", CommonConstant.LOG_TYPE_1, null);
                 return result;
             }
-            return adminUserService.agreeUserAgreement(storeMember1.getName(), storeMember1.getCard());
+            return adminUserService.agreeUserAgreement(one.getCardholderName(), one.getCard());
         } catch (Exception e) {
             result.setMessage("请求失败");
             result.setResult(null);