Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/gdyb_controller.go

@@ -127,7 +127,6 @@ func (c *GdybController) PostThree() {
 	doctor := c.GetString("doctor")
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-
 	secret_key := c.GetString("secret_key")
 
 	result := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key)

service/gdyb_service.go

@@ -53,8 +53,9 @@ 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_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -62,7 +63,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", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -119,8 +120,9 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2201"
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2201"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2201"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -128,7 +130,7 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -176,7 +178,9 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	}
 	reader := bytes.NewReader(bytesData)
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2202"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2202"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2202"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -184,7 +188,9 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	//request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
+
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -255,7 +261,9 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	}
 	reader := bytes.NewReader(bytesData)
 
-	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/2203"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2203"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -263,7 +271,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -457,8 +465,9 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		return ""
 	}
 	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2204"
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2204"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2204"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -466,7 +475,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -515,8 +524,9 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2205"
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2205"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2205"
 	request, err := http.NewRequest("POST", url, reader)
 	fmt.Println(err)
 
@@ -527,7 +537,7 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -583,7 +593,9 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	}
 	reader := bytes.NewReader(bytesData)
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2206"
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2206"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2206"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -591,7 +603,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -647,8 +659,9 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2207"
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -656,7 +669,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -704,8 +717,9 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2208"
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2208"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2208"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -713,7 +727,7 @@ func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -770,8 +784,9 @@ func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3201"
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3201"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3201"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -779,7 +794,7 @@ func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -837,8 +852,9 @@ func Gdyb9101(baseParams models.BaseParams, file_name string, file_byte []byte)
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/9101"
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/9101"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/9101"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -846,7 +862,7 @@ func Gdyb9101(baseParams models.BaseParams, file_name string, file_byte []byte)
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -890,8 +906,9 @@ func Gdyb9102(baseParams models.BaseParams, file_name string, file_qury_no strin
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/9102"
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/9102"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/9102"
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -899,7 +916,7 @@ func Gdyb9102(baseParams models.BaseParams, file_name string, file_qury_no strin
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -949,15 +966,16 @@ func Gdyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3202"
 
-	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3202"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3202"
 	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", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)
@@ -1000,15 +1018,16 @@ func Gdyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 		return err.Error()
 	}
 	reader := bytes.NewReader(bytesData)
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5203"
 
-	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/5203"
 	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", "test_hosp")
+	request.Header.Set("x-tif-paasid", "sg03_prd")
 	request.Header.Set("x-tif-signature", signature)
 	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 	request.Header.Set("x-tif-nonce", nonce)

service/his_service.go

@@ -590,6 +590,10 @@ func UpdataOrderStatus(id int64, number string, user_org_id int64) (err error) {
 
 }
 
+func UpdataRegStatus(patient_id int64, record_time int64, org_id int64) {
+	writeDb.Model(&models.HisPatient{}).Where("patient_id = ? AND status = 1 AND record_date =? AND user_org_id = ?", patient_id, record_time, org_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
+
+}
 func GetAdminUserInfoByID(org_id int64, admin_user_id int64) (role models.UserAdminRole, err error) {
 	err = readUserDb.Model(&models.UserAdminRole{}).Where("org_id = ? AND status = 1 AND admin_user_id = ?", org_id, admin_user_id).First(&role).Error
 	return