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

conf/app.conf

@@ -44,8 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-
-org_id = 9919
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -54,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

controllers/sg/his_api_controller.go

@@ -1020,7 +1020,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			if count <= 0 {
 				api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + IdCardNo + "&insutype=" +
-					"390" + "&psn_no=" + res.Output.Baseinfo.PsnNo +
+					insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
 					"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(int64(id_card_type), 10)
 				resp, requestErr := http.Get(api)
@@ -1503,7 +1503,7 @@ func (c *HisApiController) GetUploadInfo() {
 				fmt.Println(insutype)
 
 				api := "http://127.0.0.1:9532/" + "gdyb/eight?cert_no=" + cert_no + "&insutype=" +
-					"390" + "&psn_no=" + psn_no + "&chrg_bchno=" + chrg_bchno + "&mdtrt_id=" + mdtrt_id +
+					insutype + "&psn_no=" + psn_no + "&chrg_bchno=" + chrg_bchno + "&mdtrt_id=" + mdtrt_id +
 					"&total=" + allTotal + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" +
 					miConfig.SecretKey + "&med_type=" + strconv.FormatInt(patientPrescription.RegisterType, 10) + "&id_card_type=" + strconv.FormatInt(int64(his.IdCardType), 10)
 				resp, requestErr := http.Get(api)

service/gdyb_service.go

@@ -695,17 +695,16 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 		if item.HospApprFlag != -1 {
 			if item.HospApprFlag == 1 {
-				feedetailInfo["hosp_appr_flag"] = 0 // 医院审批标志
+				feedetailInfo["hosp_appr_flag"] = "0" // 医院审批标志
 			} else if item.HospApprFlag == 2 {
-				feedetailInfo["hosp_appr_flag"] = 1 // 医院审批标志
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
 			} else if item.HospApprFlag == 3 {
-				feedetailInfo["hosp_appr_flag"] = 2 // 医院审批标志
+				feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
 			} else {
-				feedetailInfo["hosp_appr_flag"] = 1 // 医院审批标志
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
 			}
-
 		} else {
-			feedetailInfo["hosp_appr_flag"] = "" // 医院审批标志
+			feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
 		}
 
 		feedetailInfo["tcmdrug_used_way"] = "" // 中药使用方式