银行卡信息根据公司

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

@@ -120,6 +120,12 @@ public class AdminDoctorUserController extends JeecgController<AdminUser, IAdmin
                 record.setCardPic(adminCompSelect.getCardPic());
                 record.setKsname(adminCompSelect.getKsName());
                 record.setDwname(adminCompSelect.getDwName());
+                record.setName(adminCompSelect.getName());
+                record.setCard(adminCompSelect.getCard());
+                record.setBackCard(adminCompSelect.getBackCard());
+                record.setBackName(adminCompSelect.getBackName());
+                record.setWisMhu(adminCompSelect.getWisMhu());
+                record.setWisWjdc(adminCompSelect.getWisWjdc());
                 adminUsers.add(record);
             }
 

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

@@ -111,6 +111,12 @@ public class AdminSpecialistUserController extends JeecgController<AdminUser, IA
                 record.setCardPic(adminCompSelect.getCardPic());
                 record.setKsname(adminCompSelect.getKsName());
                 record.setDwname(adminCompSelect.getDwName());
+                record.setName(adminCompSelect.getName());
+                record.setCard(adminCompSelect.getCard());
+                record.setBackCard(adminCompSelect.getBackCard());
+                record.setBackName(adminCompSelect.getBackName());
+                record.setWisMhu(adminCompSelect.getWisMhu());
+                record.setWisWjdc(adminCompSelect.getWisWjdc());
                 adminUsers.add(record);
             }
         }

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

@@ -86,5 +86,41 @@ public class AdminCompSelect implements Serializable {
     @ApiModelProperty(value = "  0是关闭  1是开启")
     private String yzh;
 
+    @Excel(name = "身份证号", width = 15)
+    @ApiModelProperty(value = "身份证号")
+    private String card;
+
+    @Excel(name = "是否完善信息（1未完善 2完善了）", width = 15)
+    @ApiModelProperty(value = "是否完善信息（1未完善 2完善了）")
+    private Integer completeInformation;
+    /**科室名称*/
+
+    @Excel(name = "银行账号", width = 15)
+    @ApiModelProperty(value = "银行账号")
+    private String backCard;
+    /**开户行*/
+    @Excel(name = "开户行", width = 15)
+    @ApiModelProperty(value = "开户行")
+    private String backName;
+
+    @Excel(name = "持卡人姓名", width = 15)
+    @ApiModelProperty(value = "持卡人姓名")
+    private String cardholderName;
+
+    @Excel(name = "银行预留手机号", width = 15)
+    @ApiModelProperty(value = "银行预留手机号")
+    private String cardholderPhone;
+
+    @ApiModelProperty(value = "是否允许病历上传1允许 2不允许")
+    private String wisMhu;
+    @ApiModelProperty(value = "是否允许问卷调查1允许 2不允许")
+    private String wisWjdc;
+
+    @ApiModelProperty(value = "专家分配数量")
+    private Integer allocationNum;
+
+    @ApiModelProperty(value = "专家分配数量")
+    private String name;
+
 
 }

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

@@ -129,7 +129,6 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
         AdminUser adminUsers = adminUserService.getOne(adminUserQueryWrapper);
 
         if (null != adminUsers) {
-
             AdminCompSelect adminCompSelect = new AdminCompSelect();
             adminCompSelect.setOrderId(adminUsers.getId());
             adminCompSelect.setPhone(phone);
@@ -140,6 +139,10 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             adminCompSelect.setAvatar(adminUser.getAvatar());
             adminCompSelect.setCardPic(adminUser.getCardPic());
             adminCompSelect.setDoctorAndSpecialist("1");
+            adminCompSelect.setCompleteInformation(1);
+            adminCompSelect.setWisMhu("允许");
+            adminCompSelect.setWisWjdc("允许");
+            adminCompSelect.setName(adminUser.getName());
             adminCompSelect.setYzh(user.getYzh());
 
 
@@ -168,6 +171,10 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             adminCompSelect.setAvatar(adminUser.getAvatar());
             adminCompSelect.setCardPic(adminUser.getCardPic());
             adminCompSelect.setDoctorAndSpecialist("1");
+            adminCompSelect.setCompleteInformation(1);
+            adminCompSelect.setWisMhu("允许");
+            adminCompSelect.setWisWjdc("允许");
+            adminCompSelect.setName(adminUser.getName());
             adminCompSelect.setYzh(user.getYzh());
 
             QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
@@ -182,6 +189,10 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             } else {
                 adminCompSelectService.save(adminCompSelect);
             }
+            adminUser.setName("");
+            adminUser.setDwname("");
+            adminUser.setKsname("");
+            adminUser.setCardPic("");
             this.save(adminUser);
 
         }
@@ -447,19 +458,22 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
     }
 
     @Override
-    public void     updateByUser(AdminUser adminUser) {
+    public void updateByUser(AdminUser adminUser) {
         String phone = adminUser.getPhone();
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
-        adminCompSelectQueryWrapper.eq("phone",phone);
-        adminCompSelectQueryWrapper.eq("sys_org_code",sysUser.getOrgCode());
-        adminCompSelectQueryWrapper.eq("doctor_and_specialist","1");
+        adminCompSelectQueryWrapper.eq("phone", phone);
+        adminCompSelectQueryWrapper.eq("sys_org_code", sysUser.getOrgCode());
+        adminCompSelectQueryWrapper.eq("doctor_and_specialist", "1");
         AdminCompSelect adminCompSelect = adminCompSelectService.getOne(adminCompSelectQueryWrapper);
-        if (null!=adminCompSelect){
+        if (null != adminCompSelect) {
             adminCompSelect.setKsName(adminUser.getKsname());
             adminCompSelect.setDwName(adminUser.getDwname());
             adminCompSelect.setAvatar(adminUser.getAvatar());
             adminCompSelect.setCardPic(adminUser.getCardPic());
+            adminCompSelect.setName(adminUser.getName());
+            adminCompSelect.setWisWjdc(adminUser.getWisWjdc());
+            adminCompSelect.setWisMhu(adminUser.getWisMhu());
             adminCompSelectService.updateById(adminCompSelect);
         }
         adminUserService.updateById(adminUser);
@@ -508,6 +522,12 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             adminCompSelect.setAvatar(adminUser.getAvatar());
             adminCompSelect.setCardPic(adminUser.getCardPic());
             adminCompSelect.setDoctorAndSpecialist("2");
+            adminCompSelect.setCompleteInformation(1);
+            adminCompSelect.setYzh(user.getYzh());
+            adminCompSelect.setCompleteInformation(1);
+            adminCompSelect.setWisMhu("允许");
+            adminCompSelect.setWisWjdc("允许");
+            adminCompSelect.setName(adminUser.getName());
             adminCompSelect.setYzh(user.getYzh());
 
             QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
@@ -518,7 +538,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             List<AdminCompSelect> list = adminCompSelectService.list(adminCompSelectQueryWrapper);
 
             if (null != list && list.size() > 0) {
-                    return Result.error("该手机号已存在该公司,请更换手机号进行注册");
+                return Result.error("该手机号已存在该公司,请更换手机号进行注册");
             } else {
                 adminCompSelectService.save(adminCompSelect);
             }
@@ -535,6 +555,12 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             adminCompSelect.setAvatar(adminUser.getAvatar());
             adminCompSelect.setCardPic(adminUser.getCardPic());
             adminCompSelect.setDoctorAndSpecialist("2");
+            adminCompSelect.setCompleteInformation(1);
+            adminCompSelect.setYzh(user.getYzh());
+            adminCompSelect.setCompleteInformation(1);
+            adminCompSelect.setWisMhu("允许");
+            adminCompSelect.setWisWjdc("允许");
+            adminCompSelect.setName(adminUser.getName());
             adminCompSelect.setYzh(user.getYzh());
 
             QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
@@ -549,6 +575,11 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             } else {
                 adminCompSelectService.save(adminCompSelect);
             }
+            adminUser.setName("");
+            adminUser.setDwname("");
+            adminUser.setKsname("");
+            adminUser.setCardPic("");
+
             this.save(adminUser);
 
         }
@@ -597,19 +628,37 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
         QueryWrapper<AdminUser> adminUserQueryWrapper = new QueryWrapper<>();
         adminUserQueryWrapper.eq("phone", adminUser.getPhone());
         adminUserQueryWrapper.eq("sys_org_code", sysOrgCode);
+
         AdminUser one = adminUserService.getOne(adminUserQueryWrapper);
         if (null != one) {
-            one.setCard(adminUserVO.getCard());
-            one.setCardholderName(adminUserVO.getName());
-            one.setBackCard(adminUserVO.getBackCard());
-            one.setCardholderPhone(adminUserVO.getCardholderPhone());
-            one.setDwname(adminUserVO.getDwname());
-            one.setKsname(adminUserVO.getKsname());
-            one.setCompleteInformation(2);
+//            one.setCard(adminUserVO.getCard());
+//            one.setCardholderName(adminUserVO.getName());
+//            one.setBackCard(adminUserVO.getBackCard());
+//            one.setCardholderPhone(adminUserVO.getCardholderPhone());
+//            one.setDwname(adminUserVO.getDwname());
+//            one.setKsname(adminUserVO.getKsname());
+//            one.setCompleteInformation(2);
             one.setDoctorAndSpecialist(adminUserVO.getDoctorAndSpecialist());
-            one.setCardPic(adminUserVO.getCardPic());
+//            one.setCardPic(adminUserVO.getCardPic());
             this.updateById(one);
         }
+        QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
+        adminCompSelectQueryWrapper.eq("phone", adminUser.getPhone());
+        adminCompSelectQueryWrapper.eq("sys_org_code", sysOrgCode);
+        AdminCompSelect adminCompSelect = adminCompSelectService.getOne(adminCompSelectQueryWrapper);
+        if (null != adminCompSelect) {
+            adminCompSelect.setCard(adminUserVO.getCard());
+            adminCompSelect.setCardholderName(adminUserVO.getName());
+            adminCompSelect.setBackCard(adminUserVO.getBackCard());
+            adminCompSelect.setCardholderPhone(adminUserVO.getCardholderPhone());
+            adminCompSelect.setDwName(adminUserVO.getDwname());
+            adminCompSelect.setKsName(adminUserVO.getKsname());
+            adminCompSelect.setCompleteInformation(2);
+            adminCompSelect.setDoctorAndSpecialist(adminUserVO.getDoctorAndSpecialist());
+            adminCompSelect.setCardPic(adminUserVO.getCardPic());
+            adminCompSelectService.updateById(adminCompSelect);
+        }
+
 
     }
 
@@ -618,15 +667,16 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
         String phone = adminUser.getPhone();
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
-        adminCompSelectQueryWrapper.eq("phone",phone);
-        adminCompSelectQueryWrapper.eq("sys_org_code",sysUser.getOrgCode());
-        adminCompSelectQueryWrapper.eq("doctor_and_specialist","2");
+        adminCompSelectQueryWrapper.eq("phone", phone);
+        adminCompSelectQueryWrapper.eq("sys_org_code", sysUser.getOrgCode());
+        adminCompSelectQueryWrapper.eq("doctor_and_specialist", "2");
         AdminCompSelect adminCompSelect = adminCompSelectService.getOne(adminCompSelectQueryWrapper);
-        if (null!=adminCompSelect){
+        if (null != adminCompSelect) {
             adminCompSelect.setKsName(adminUser.getKsname());
             adminCompSelect.setDwName(adminUser.getDwname());
             adminCompSelect.setAvatar(adminUser.getAvatar());
             adminCompSelect.setCardPic(adminUser.getCardPic());
+            adminCompSelect.setName(adminUser.getName());
             adminCompSelectService.updateById(adminCompSelect);
         }
         adminUserService.updateById(adminUser);

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

@@ -502,6 +502,11 @@ public class APIController {
             AdminCompSelect one = adminCompSelectService.getOne(adminCompSelectQueryWrapper);
             if (null!=one){
                 storeMember1.setYzh(one.getYzh());
+                storeMember1.setCompleteInformation(one.getCompleteInformation());
+                storeMember1.setName(one.getName());
+                storeMember1.setKsname(one.getKsName());
+                storeMember1.setDwname(one.getDwName());
+                storeMember1.setCard(one.getCard());
             }
 
             if (storeMember1 == null) {