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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 10265
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,10 +53,10 @@ call_domain = https://hf.sgjyun.com
 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_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
-# gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
+gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
 gdyb_paasid = "sg03_prd"
 #gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yjyy"

controllers/zh/zh_his_api_controller.go

@@ -780,7 +780,15 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		struct2401.MdtrtCertNo = res2.Output.Baseinfo.Certno
 		if miConfig.Code == "H15049901371" {
 			if med_type == 14 {
-				struct2401.MedType = "140104"
+				if insutype == "390" {
+
+					struct2401.MedType = "9933"
+
+				} else if insutype == "310" {
+
+					struct2401.MedType = "990502"
+
+				}
 			} else if med_type == 11 {
 				struct2401.MedType = "11"
 			}
@@ -1352,7 +1360,15 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	}
 	if miConfig.Code == "H15049901371" {
 		if record.MedType == 14 {
-			data["med_type"] = "140104"
+			if record.InsutypeType == "390" {
+
+				data["med_type"] = "9933"
+
+			} else if record.InsutypeType == "310" {
+
+				data["med_type"] = "990502"
+
+			}
 
 		} else if record.MedType == 11 {
 

service/gdyb_service.go

@@ -357,7 +357,6 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	signature := setSignature(timestamp, nonce, secret_key)
 	tempTime := time.Unix(timestamp, 0)
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
-	timeFormatOne = "2021-12-31 15:04:05"
 
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, opera, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
@@ -548,7 +547,6 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	signature := setSignature(timestamp, nonce, secret_key)
 	tempTime := time.Unix(timestamp, 0)
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
-	timeFormatOne = "2021-12-31 15:04:05"
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
@@ -841,7 +839,6 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	//timeFormat := tempTime.Format("20060102150405")
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 	//chrgBchno := rand.Intn(100000) + 10000
-	timeFormatOne = "2021-12-31 15:04:05"
 	var customs []*Custom
 
 	for _, item := range hisPrescription {