wip:调整医疗机构信息查询的表

entity/code.go

@@ -7,9 +7,16 @@ const (
 	CODE_MEDICAL_INSTITUTION_LEVEL = "code_level"
 	CODE_MEDICAL_INSTITUTION_TYPE  = "code_type"
 	DOMAIN_CAPITAL_RETENTION       = "capital_retention"
-	TableDomainEntClaim            = "domain_ent_claim" // 认领表
-	TableCompanyBasInfo            = "company_baseinfo" // 企业信息表
-	TableCodeArea                  = "code_area"        // 区域代码表
+	TableDomainEntClaim            = "domain_ent_claim"     // 认领表
+	TableCompanyBasInfo            = "company_baseinfo"     // 企业信息表
+	TableCodeArea                  = "code_area"            // 区域代码表
+	TableInstitutionBaseInfo       = "institution_baseinfo" // 机构信息表
+)
+
+// db
+const (
+	DbMedical = "medical_field_data"
+	DbGlobal  = "global_common_data"
 )
 
 //返回状态

rpc/medical/etc/medical.yaml

@@ -7,7 +7,7 @@ Etcd:
   Key: medical.rpc
 WebRpcPort: 8016
 MysqlMain:
-  dbName: medical_fileld_data
+  dbName: medical_field_data
   address: 192.168.3.217:4000
   userName: root
   passWord: '=PDT49#80Z!RVv52_z'

rpc/medical/internal/logic/claimeddistributorlistlogic.go

@@ -37,7 +37,7 @@ func (l *ClaimedDistributorListLogic) ClaimedDistributorList(in *medical.Claimed
 			entIds = append(entIds, common.ObjToString((*rs)[i]["ent_id"]))
 		}
 		// 查询信息
-		entRs := l.svcCtx.EntClaimSrv.GetInstitutionByIds(entIds)
+		entRs := l.svcCtx.EntClaimSrv.GetCompanyByIds(entIds)
 		// 处理成map
 		entInfos := map[string]map[string]interface{}{}
 		if entRs != nil {
@@ -46,6 +46,7 @@ func (l *ClaimedDistributorListLogic) ClaimedDistributorList(in *medical.Claimed
 				entInfos[idTmp] = (*entRs)[i]
 			}
 		}
+
 		// 拼接信息
 		for i := 0; i < len(*rs); i++ {
 			entId := common.ObjToString((*rs)[i]["ent_id"])
@@ -53,13 +54,15 @@ func (l *ClaimedDistributorListLogic) ClaimedDistributorList(in *medical.Claimed
 			if tmp, ok := entInfos[entId]; ok {
 				info = tmp
 			}
+			area := common.ObjToString(info["area"])
+			city := common.ObjToString(info["city"])
 			resultList.List = append(resultList.List,
 				&medical.EntClaim{
 					Id:            encrypt.SE.EncodeString(fmt.Sprintf("%v", (*rs)[i]["id"])),
 					AppId:         common.ObjToString((*rs)[i]["appid"]),
 					EntId:         encrypt.SE.EncodeString(entId),
 					EntName:       common.ObjToString((*rs)[i]["ent_name"]),
-					Address:       fmt.Sprintf("%v省 %v", info["area"], info["city"]),
+					Address:       common.ObjToString(common.If(area != "", fmt.Sprintf("%v省 %v", area, city), "")),
 					EstablishDate: common.ObjToString(info["establish_date"]),
 					Capital:       common.ObjToString(info["capital"]),
 					CompanyPhone:  common.ObjToString(info["company_phone"]),

rpc/medical/internal/logic/claimedinstitutionlistlogic.go

@@ -56,19 +56,17 @@ func (l *ClaimedInstitutionListLogic) ClaimedInstitutionList(in *medical.Claimed
 			if tmp, ok := entInfos[entId]; ok {
 				info = tmp
 			}
-
+			area := common.ObjToString(info["area"])
+			city := common.ObjToString(info["city"])
 			resultList.List = append(resultList.List,
 				&medical.EntClaim{
-					Id:            encrypt.SE.EncodeString(fmt.Sprintf("%v", (*rs)[i]["id"])),
-					AppId:         common.ObjToString((*rs)[i]["appid"]),
-					EntId:         encrypt.SE.EncodeString(entId),
-					EntName:       common.ObjToString((*rs)[i]["ent_name"]),
-					Address:       fmt.Sprintf("%v省 %v", info["area"], info["city"]),
-					EstablishDate: common.ObjToString(info["establish_date"]),
-					Capital:       common.ObjToString(info["capital"]),
-					CompanyPhone:  common.ObjToString(info["company_phone"]),
-					UpdateTime:    common.ObjToString((*rs)[i]["update_time"]),
-					CreateTime:    common.ObjToString((*rs)[i]["create_time"])},
+					Id:         encrypt.SE.EncodeString(fmt.Sprintf("%v", (*rs)[i]["id"])),
+					AppId:      common.ObjToString((*rs)[i]["appid"]),
+					EntId:      encrypt.SE.EncodeString(entId),
+					EntName:    common.ObjToString((*rs)[i]["ent_name"]),
+					Address:    common.ObjToString(common.If(area != "", fmt.Sprintf("%v省 %v", area, city), "")),
+					UpdateTime: common.ObjToString((*rs)[i]["update_time"]),
+					CreateTime: common.ObjToString((*rs)[i]["create_time"])},
 			)
 		}
 		resultList.Total = int64(total)

service/claim.go

@@ -102,21 +102,22 @@ func (e *EntClaimService) InstitutionList(userId int, appId string, page int, pa
 	return e.BaseMysql.Find(entity.TableDomainEntClaim, query, field, order, (page-1)*pageSize, pageSize), int(total)
 }
 
-// GetInstitution 获取机构信息
-func (e EntClaimService) GetInstitution(id string) *map[string]interface{} {
-	query := map[string]interface{}{
-		"company_id": id,
+// GetCompanyByIds   批量获取经销商详细信息
+func (e EntClaimService) GetCompanyByIds(ids []string) *[]map[string]interface{} {
+	if len(ids) == 0 {
+		return &[]map[string]interface{}{}
 	}
-	field := "company_name,establish_date,company_address,capital,company_phone"
-	return e.GlobalCommonData.FindOne(entity.TableCompanyBasInfo, query, field, "")
+	q := "select a.company_id,a.company_name,a.establish_date,a.company_address,a.capital,a.company_phone,b.area,b.city from %v a left join %v b on a.area_code=b.code  where a.company_id in (\"%v\")  "
+	query := fmt.Sprintf(q, entity.TableCompanyBasInfo, entity.TableCodeArea, strings.Join(ids, "\" , \""))
+	return e.GlobalCommonData.SelectBySql(query)
 }
 
-// GetInstitutionByIds GetInstitution 批量获取机构详细信息
+// GetInstitutionByIds  批量获取机构详细信息
 func (e EntClaimService) GetInstitutionByIds(ids []string) *[]map[string]interface{} {
 	if len(ids) == 0 {
 		return &[]map[string]interface{}{}
 	}
-	q := "select a.company_id,a.company_name,a.establish_date,a.company_address,a.capital,a.company_phone,b.area,b.city from %v a left join %v b on a.area_code=b.code  where a.company_id in (\"%v\")  "
-	query := fmt.Sprintf(q, entity.TableCompanyBasInfo, entity.TableCodeArea, strings.Join(ids, "\" , \""))
-	return e.GlobalCommonData.SelectBySql(query)
+	q := "select a.company_id,a.mi_name,a.establish_date,b.area,b.city from %v.%v a left join %v.%v b on a.area_code=b.code  where a.company_id in (\"%v\")  "
+	query := fmt.Sprintf(q, entity.DbMedical, entity.TableInstitutionBaseInfo, entity.DbGlobal, entity.TableCodeArea, strings.Join(ids, "\" , \""))
+	return e.Mysql.SelectBySql(query)
 }

service/claim_test.go

@@ -146,10 +146,19 @@ func TestEntClaimService_IsClaimed(t *testing.T) {
 	}
 }
 
-// 获取企业基本信息
-func TestEntClaimService_GetInstitution(t *testing.T) {
+func TestName(t *testing.T) {
+	// s := encrypt.SE.DecodeString("ABCYHFBdi44OyksAl5mZHUwPiQCSTJgcXR+KygZIC8eZGhkTyw9NBkSM3dhXnEGKFxTDMY=")
+	// s1 := encrypt.SE.EncodeString("90058")
+	QWEQWE := "ABCd3ZrfT04JyY6GXxhcFwsCCc4QTBjdndgPCgFLCEwdGpzB1oiNwksNGNxXnAADlxTDQA="
+	fmt.Println(encrypt.DecodeArticleId2ByCheck(QWEQWE))
+	// fmt.Println(s)
+	// fmt.Println(s1)
+}
+
+// 获取企业的详细信息
+func TestEntClaimService_GetCompanyByIds(t *testing.T) {
 	type args struct {
-		id string
+		ids []string
 	}
 	tests := []struct {
 		name    string
@@ -157,32 +166,25 @@ func TestEntClaimService_GetInstitution(t *testing.T) {
 		wantNil bool
 	}{
 		{
-			"获取企业基本信息", args{id: "b4eb554e9e7368c17761d4f722e7cf5e"}, false,
+			"获取企业基本信息根据id批量", args{ids: []string{"6e7fa9b7f0a88110a827e8ba18ffb152", "9205b21e2142e19b1cd200688225fa5a", "eefad51cf48aa3e27c72c41d0ebe8f08"}}, false,
+		},
+		{
+			"获取企业基本信息根据id批量-2", args{ids: []string{"6e7fa9b7f0a88110a827e8ba18ffb152", "eefad51cf48aa3e27c72c41d0ebe8f08"}}, false,
 		},
 		{
-			"获取企业基本信息_2", args{id: "888"}, true,
+			"获取企业基本信息根据id批量-空id列表", args{ids: []string{}}, true,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := EntClaimSrv.GetInstitution(tt.args.id)
-			if (got == nil) != tt.wantNil {
-				t.Errorf("GetInstitution() got = %v, want %v", got == nil, tt.wantNil)
+			got := EntClaimSrv.GetCompanyByIds(tt.args.ids)
+			t.Log(got)
+			if (got == nil || len(*got) == 0) != tt.wantNil {
+				t.Errorf("InstitutionList() got = %v, want %v,%v", got == nil, tt.wantNil, got)
 			}
 		})
 	}
 }
-
-func TestName(t *testing.T) {
-	// s := encrypt.SE.DecodeString("ABCYHFBdi44OyksAl5mZHUwPiQCSTJgcXR+KygZIC8eZGhkTyw9NBkSM3dhXnEGKFxTDMY=")
-	// s1 := encrypt.SE.EncodeString("90058")
-	QWEQWE := "ABCd3ZrfT04JyY6GXxhcFwsCCc4QTBjdndgPCgFLCEwdGpzB1oiNwksNGNxXnAADlxTDQA="
-	fmt.Println(encrypt.DecodeArticleId2ByCheck(QWEQWE))
-	// fmt.Println(s)
-	// fmt.Println(s1)
-}
-
-// 获取企业的详细信息
 func TestEntClaimService_GetInstitutionByIds(t *testing.T) {
 	type args struct {
 		ids []string