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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 #
 copyrequestbody = true
@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9504
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,7 +53,7 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-gdyb_paasid = "sg03_prd"
+gdyb_paasid = "jm_sc_yjyy"
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = syh

controllers/sg/gdyb_controller.go

@@ -163,7 +163,7 @@ func (c *GdybController) PostFour() {
 	secret_key := c.GetString("secret_key")
 
 	var result string
-	if insuplc_admdvs == "440700" { //
+	if insuplc_admdvs == "440781" { //
 		result = service.Gdyb2203A(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name)
 	} else {
 		result = service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name)

controllers/sg/his_api_controller.go

@@ -11,7 +11,6 @@ import (
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
-	"github.com/axgle/mahonia"
 	"github.com/jinzhu/gorm"
 	"github.com/shopspring/decimal"
 	"io"
@@ -3629,7 +3628,7 @@ func (c *HisApiController) GetCheckCode() {
 				ID:             item.ID,
 				Name:           item.DrugName,
 				Code:           item.MedicalInsuranceNumber,
-				List_type_code: item.MedicalInsuranceNumber,
+				List_type_code: "101",
 			}
 			queryResult = append(queryResult, result)
 		}
@@ -3642,7 +3641,7 @@ func (c *HisApiController) GetCheckCode() {
 				ID:             item.ID,
 				Name:           item.GoodName,
 				Code:           item.MedicalInsuranceNumber,
-				List_type_code: item.MedicalInsuranceNumber,
+				List_type_code: "301",
 			}
 			queryResult = append(queryResult, result)
 		}
@@ -3653,7 +3652,7 @@ func (c *HisApiController) GetCheckCode() {
 				ID:             item.ID,
 				Name:           item.ProjectName,
 				Code:           item.MedicalCode,
-				List_type_code: item.MedicalCode,
+				List_type_code: "201",
 			}
 			queryResult = append(queryResult, result)
 		}
@@ -3683,14 +3682,20 @@ func (c *HisApiController) GetCheckCode() {
 
 	if config.IsOpen == 1 {
 		for _, item := range queryResult {
-			result := service.Gdyb3301(baseParams, item.Name, item.Code, item.List_type_code, "2021-04-26", "")
+			var result string
+			if record_type == 1 {
+				result = service.Gdyb3301(baseParams, item.Name, item.Code, item.List_type_code, "2021-04-26", "", item.List_type_code)
+			} else if record_type == 2 {
+				result = service.Gdyb3301(baseParams, item.Name, item.Code, item.List_type_code, "2021-04-26", "", item.List_type_code)
+			} else if record_type == 3 {
+				result = service.Gdyb3301(baseParams, item.Name, item.Code, item.List_type_code, "2021-04-26", "", 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)
 			}
-
 			userJSONBytes, _ := json.Marshal(dat)
 			var res ResultSix
 			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
@@ -3738,7 +3743,7 @@ func (c *HisApiController) UnCheckCode() {
 				ID:             item.ID,
 				Name:           item.DrugName,
 				Code:           item.MedicalInsuranceNumber,
-				List_type_code: item.MedicalInsuranceNumber,
+				List_type_code: "101",
 			}
 			queryResult = append(queryResult, result)
 		}
@@ -3751,7 +3756,7 @@ func (c *HisApiController) UnCheckCode() {
 				ID:             item.ID,
 				Name:           item.GoodName,
 				Code:           item.MedicalInsuranceNumber,
-				List_type_code: item.MedicalInsuranceNumber,
+				List_type_code: "301",
 			}
 			queryResult = append(queryResult, result)
 		}
@@ -3762,7 +3767,7 @@ func (c *HisApiController) UnCheckCode() {
 				ID:             item.ID,
 				Name:           item.ProjectName,
 				Code:           item.MedicalCode,
-				List_type_code: item.MedicalCode,
+				List_type_code: "201",
 			}
 			queryResult = append(queryResult, result)
 		}
@@ -3792,15 +3797,20 @@ func (c *HisApiController) UnCheckCode() {
 
 	if config.IsOpen == 1 {
 		for _, item := range queryResult {
-
-			result := service.Gdyb3302(baseParams, item.Name, item.Code, item.List_type_code)
+			var result string
+			if record_type == 1 {
+				result = service.Gdyb3302(baseParams, item.Name, item.Code, item.List_type_code)
+			} else if record_type == 2 {
+				result = service.Gdyb3302(baseParams, item.Name, item.Code, item.List_type_code)
+			} else if record_type == 3 {
+				result = service.Gdyb3302(baseParams, item.Name, item.Code, item.List_type_code)
+			}
 			var dat2 map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat2); err == nil {
 				fmt.Println(dat2)
 			} else {
 				fmt.Println(err)
 			}
-
 			userJSONBytes, _ := json.Marshal(dat2)
 			var res ResultSix
 			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
@@ -3813,7 +3823,6 @@ func (c *HisApiController) UnCheckCode() {
 					service.UpdateDrugByIdDetail(item.ID)
 				} else if record_type == 2 {
 					service.UpdateGoodInfoById(item.ID)
-
 				} else if record_type == 3 {
 					service.UpdateMyProjectById(item.ID)
 				}
@@ -4046,7 +4055,6 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	sick, _ := service.FindSickById(sick_id)
-	//role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	doctor, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, doctor_id)
 	if config.IsOpen == 1 {
 		result := service.Gdyb2503(psn_no, insutype, miConfig.OrgName, doctor.UserName, miConfig.Code, strconv.FormatInt(doctor.ID, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sick.ClassName, sick.CountryCode)
@@ -4261,19 +4269,3 @@ func RemoveRepeatedCode(arr []string) (newArr []string) {
 	}
 	return
 }
-
-type Charset string
-
-const (
-	UTF8    = Charset("UTF-8")
-	GB18030 = Charset("GB18030")
-)
-
-func ConvertToString(src string, srcCode string, tagCode string) string {
-	srcCoder := mahonia.NewDecoder(srcCode)
-	srcResult := srcCoder.ConvertString(src)
-	tagCoder := mahonia.NewDecoder(tagCode)
-	_, cdata, _ := tagCoder.Translate([]byte(srcResult), true)
-	result := string(cdata)
-	return result
-}

service/gdyb_service.go

@@ -1526,7 +1526,7 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 	return str
 }
 
-func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type_code string, start_time string, ent_time string) string {
+func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type_code string, start_time string, ent_time string, list_type string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1539,7 +1539,7 @@ func Gdyb3301(baseParams *models.BaseParams, name string, codg string, list_type
 	inputMessage["infno"] = "3301" // 交易编码
 	inputData["fixmedins_hilist_id"] = codg
 	inputData["fixmedins_hilist_name"] = name
-	inputData["list_type"] = list_type_code
+	inputData["list_type"] = list_type
 	inputData["med_list_codg"] = codg
 	inputData["begndate"] = start_time
 	inputData["enddate"] = ent_time