Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -3639,14 +3639,59 @@ func (c *HisApiController) GetUploadDiag() {
 
 }
 
+type QueryResult struct {
+	Name           string
+	Code           string
+	List_type_code string
+}
+
 func (c *HisApiController) GetCheckCode() {
-	name := c.GetString("name")
-	codg := c.GetString("codg")
-	list_type_code := c.GetString("list_type_code")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
+	ids_str := c.GetString("ids")
+	record_type, _ := c.GetInt64("record_type") //1.药品 2.耗材  3.项目
+
+	ids_arr := strings.Split(ids_str, ",")
+	var queryResult []QueryResult
+	ids := make([]int64, 0)
+	for _, item := range ids_arr {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		ids = append(ids, id)
+	}
+	if record_type == 1 {
+		drugs, _ := service.GetBatchDrugList(ids)
+		for _, item := range drugs {
+			result := QueryResult{
+				Name:           item.DrugName,
+				Code:           item.MedicalInsuranceNumber,
+				List_type_code: item.MedicalInsuranceNumber,
+			}
+			queryResult = append(queryResult, result)
+		}
 
-	adminUser := c.GetAdminUserInfo()
+	} else if record_type == 2 {
+		goods, _ := service.GetBatchGoodInformationList(ids)
+
+		for _, item := range goods {
+			result := QueryResult{
+				Name:           item.GoodName,
+				Code:           item.MedicalInsuranceNumber,
+				List_type_code: item.MedicalInsuranceNumber,
+			}
+			queryResult = append(queryResult, result)
+		}
+	} else if record_type == 3 {
+		projects, _ := service.GetBathchMyPorjecgList(ids)
+		for _, item := range projects {
+			result := QueryResult{
+				Name:           item.ProjectName,
+				Code:           item.MedicalCode,
+				List_type_code: item.MedicalCode,
+			}
+			queryResult = append(queryResult, result)
+		}
+	}
 
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	adminUser := c.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 
@@ -3668,22 +3713,61 @@ func (c *HisApiController) GetCheckCode() {
 	}
 
 	if config.IsOpen == 1 {
-		result := service.Gdyb3301(baseParams, name, codg, list_type_code, "", "")
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
+		for _, item := range queryResult {
+			result := service.Gdyb3301(baseParams, item.Name, item.Code, item.List_type_code, "2021-04-26", "")
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
 		}
-
 	}
-
 }
 func (c *HisApiController) UnCheckCode() {
-	name := c.GetString("name")
-	codg := c.GetString("codg")
-	list_type_code := c.GetString("list_type_code")
+	ids_str := c.GetString("ids")
+	record_type, _ := c.GetInt64("record_type") //1.药品 2.耗材  3.项目
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	ids_arr := strings.Split(ids_str, ",")
+	var queryResult []QueryResult
+	ids := make([]int64, 0)
+	for _, item := range ids_arr {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		ids = append(ids, id)
+	}
+	if record_type == 1 {
+		drugs, _ := service.GetBatchDrugList(ids)
+		for _, item := range drugs {
+			result := QueryResult{
+				Name:           item.DrugName,
+				Code:           item.MedicalInsuranceNumber,
+				List_type_code: item.MedicalInsuranceNumber,
+			}
+			queryResult = append(queryResult, result)
+		}
+
+	} else if record_type == 2 {
+		goods, _ := service.GetBatchGoodInformationList(ids)
+
+		for _, item := range goods {
+			result := QueryResult{
+				Name:           item.GoodName,
+				Code:           item.MedicalInsuranceNumber,
+				List_type_code: item.MedicalInsuranceNumber,
+			}
+			queryResult = append(queryResult, result)
+		}
+	} else if record_type == 3 {
+		projects, _ := service.GetBathchMyPorjecgList(ids)
+		for _, item := range projects {
+			result := QueryResult{
+				Name:           item.ProjectName,
+				Code:           item.MedicalCode,
+				List_type_code: item.MedicalCode,
+			}
+			queryResult = append(queryResult, result)
+		}
+	}
 
 	adminUser := c.GetAdminUserInfo()
 
@@ -3708,12 +3792,15 @@ func (c *HisApiController) UnCheckCode() {
 	}
 
 	if config.IsOpen == 1 {
-		result := service.Gdyb3302(baseParams, name, codg, list_type_code)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
-		} else {
-			fmt.Println(err)
+		for _, item := range queryResult {
+
+			result := service.Gdyb3302(baseParams, item.Name, item.Code, item.List_type_code)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
 		}
 
 	}

models/gdyb_models.go

@@ -9,7 +9,7 @@ type GdybPsnRecord struct {
 	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Status        int64  `gorm:"column:status" json:"status" form:"status"`
 	IsCancel      int64  `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
-	TrtDclaDetlSn int64  `gorm:"column:trt_dcla_detl_sn" json:"trt_dcla_detl_sn" form:"trt_dcla_detl_sn"`
+	TrtDclaDetlSn string `gorm:"column:trt_dcla_detl_sn" json:"trt_dcla_detl_sn" form:"trt_dcla_detl_sn"`
 	DoctorId      int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
 	DepartmentId  int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
 	Insutype      string `gorm:"column:insutype" json:"insutype" form:"insutype"`

routers/router.go

@@ -1,7 +1,8 @@
 package routers
 
 import (
-	"gdyb/controllers/sz"
+	"gdyb/controllers/sg"
+	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"

service/gdyb_service.go

@@ -120,8 +120,8 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)
@@ -131,7 +131,7 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", "test_hosp")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1416,16 +1416,16 @@ func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3301"
-
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3301"
+	//
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3301"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error()
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", "test_hosp")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1471,16 +1471,16 @@ func Gdyb3302(baseParams *models.BaseParams, name string, codg string, list_type
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3302"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3302"
 
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/5203"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3302"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error()
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", "test_hosp")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1534,14 +1534,16 @@ func Gdyb2505(psnNo string, doctor string, org_name string, fixmedins_code strin
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2505"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2505"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2505"
+
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error()
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", "test_hosp")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1583,8 +1585,8 @@ func Gdyb2506(psnNo string, doctor string, org_name string, fixmedins_code strin
 	}
 	reader := bytes.NewReader(bytesData)
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2506"
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2506"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2506"
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
 	request, err := http.NewRequest("POST", url, reader)
@@ -1594,7 +1596,7 @@ func Gdyb2506(psnNo string, doctor string, org_name string, fixmedins_code strin
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", "test_hosp")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1653,7 +1655,9 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2503"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2503"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2503"
+
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -1661,7 +1665,7 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", "test_hosp")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1703,14 +1707,16 @@ func Gdyb2504(psnNo string, org_name string, doctor string, fixmedins_code strin
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2504"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2504"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2504"
+
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error()
 	}
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "sg03_prd")
+	request.Header.Set("x-tif-paasid", "test_hosp")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)