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/sg/his_api_controller.go

@@ -3328,14 +3328,14 @@ func (c *HisApiController) GetUploadInfo() {
 					var med_type string
 					if his.Insutype == "390" {
 						if reg_type == 14 {
-							med_type = "14"
+							med_type = "140104"
 						} else if reg_type == 11 {
 							med_type = "11"
 
 						}
 					} else if his.Insutype == "310" {
 						if reg_type == 14 {
-							med_type = "990502"
+							med_type = "140104"
 						} else if reg_type == 11 {
 							med_type = "11"
 						}
@@ -3831,7 +3831,7 @@ func (c *HisApiController) GetUploadInfo() {
 									}
 								} else if his.Insutype == "310" {
 									if reg_type == 14 {
-										med_type = "990502"
+										med_type = "140104"
 									} else if reg_type == 11 {
 										med_type = "11"
 									}
@@ -4126,13 +4126,13 @@ func (c *HisApiController) GetUploadInfo() {
 					var med_type string
 					if his.Insutype == "390" {
 						if reg_type == 14 {
-							med_type = "14"
+							med_type = "140104"
 						} else if reg_type == 11 {
 							med_type = "11"
 						}
 					} else if his.Insutype == "310" {
 						if reg_type == 14 {
-							med_type = "990502"
+							med_type = "140104"
 						} else if reg_type == 11 {
 							med_type = "11"
 						}
@@ -4911,13 +4911,13 @@ func (c *HisApiController) GetPreUploadInfo() {
 				var med_type string
 				if his.Insutype == "390" {
 					if reg_type == 14 {
-						med_type = "14"
+						med_type = "140104"
 					} else if reg_type == 11 {
 						med_type = "11"
 					}
 				} else if his.Insutype == "310" {
 					if reg_type == 14 {
-						med_type = "990502"
+						med_type = "140104"
 					} else if reg_type == 11 {
 						med_type = "11"
 					}
@@ -5350,13 +5350,13 @@ func (c *HisApiController) GetPreUploadInfo() {
 							var med_type string
 							if his.Insutype == "390" {
 								if reg_type == 14 {
-									med_type = "14"
+									med_type = "140104"
 								} else if reg_type == 11 {
 									med_type = "11"
 								}
 							} else if his.Insutype == "310" {
 								if reg_type == 14 {
-									med_type = "990502"
+									med_type = "140104"
 								} else if reg_type == 11 {
 									med_type = "11"
 								}

controllers/zh/zh_his_api_controller.go

@@ -780,7 +780,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		struct2401.MdtrtCertNo = res2.Output.Baseinfo.Certno
 		if miConfig.Code == "H15049901371" {
 			if med_type == 14 {
-				struct2401.MedType = "990502"
+				struct2401.MedType = "140104"
 			} else if med_type == 11 {
 				struct2401.MedType = "11"
 
@@ -1220,7 +1220,7 @@ func (c *ZHHisApiController) GetSettleInfo() {
 		order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
 		order.SetlTime = res.Output.Setlinfo.SetlTime
 		order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
-		if res.Output.Setlinfo.MedType == "990502" {
+		if res.Output.Setlinfo.MedType == "140104" {
 
 			order.MedType = "14"
 
@@ -1354,7 +1354,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	}
 	if miConfig.Code == "H15049901371" {
 		if record.MedType == 14 {
-			data["med_type"] = "990502"
+			data["med_type"] = "140104"
 
 		} else if record.MedType == 11 {