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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10188
+org_id = 10215
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -57,11 +57,11 @@ 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_paasid = "sg03_prd"
+# gdyb_paasid = "sg03_prd"
 # gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yrojyy"
 #gdyb_paasid = "sz_prd_yjyy"
-# gdyb_paasid = "zq_prd_yjyy"
+gdyb_paasid = "zq_prd_yjyy"
 
 
 

controllers/sg/his_api_controller.go

@@ -2934,20 +2934,16 @@ func (c *HisApiController) GetRegisterInfo() {
 	certificates, _ := c.GetInt64("certificates")
 	medical_care, _ := c.GetInt64("medical_care")
 	birthday := c.GetString("birthday")
-	//age, _ := c.GetInt64("age")
 	id_card := c.GetString("id_card")
 	register_type, _ := c.GetInt64("register")
 	doctor, _ := c.GetInt64("doctor")
 	department, _ := c.GetInt64("department")
 	gender, _ := c.GetInt64("sex")
-	//phone := c.GetString("phone")
 	registration_fee, _ := c.GetFloat("registration_fee")
 	medical_expenses, _ := c.GetFloat("medical_expenses")
 	social_type, _ := c.GetInt64("social_type")
 	med_type := c.GetString("social_type")
-
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	birthdays, _ := time.ParseInLocation(timeLayout+" 15:04:05", birthday+" 00:00:00", loc)
@@ -2967,12 +2963,10 @@ func (c *HisApiController) GetRegisterInfo() {
 	} else {
 		patient, _ = service.GetPatientByIDTwo(adminInfo.CurrentOrgId, id)
 	}
-
 	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
 	if patientPrescription.ID == 0 {
 		patientPrescription, _ = service.FindLastPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
 	}
-
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
 	if patient.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
@@ -3237,12 +3231,15 @@ func (c *HisApiController) GetRegisterInfo() {
 				}
 
 				body, ioErr := ioutil.ReadAll(resp.Body)
+
 				if ioErr != nil {
 					utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
+
 				var respJSON map[string]interface{}
+
 				if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
 					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -3250,6 +3247,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				}
 
 				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+
 				result, _ := json.Marshal(respJSON)
 
 				if err := json.Unmarshal([]byte(result), &resThree10265); err != nil {
@@ -3257,16 +3255,17 @@ func (c *HisApiController) GetRegisterInfo() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
+
 				resThree.ErrMsg = resThree10265.ErrMsg
+
 				resThree.Output = resThree10265.Output
+
 				resThree.InfRefmsgid = resThree10265.InfRefmsgid
-				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 
+				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 			} else {
-
 				result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName)
 				saveLog(result, requestLog, "2201", "挂号")
-
 				if miConfig.Code == "H15049901371" {
 
 					if err := json.Unmarshal([]byte(result), &resThree10265); err != nil {
@@ -6961,17 +6960,17 @@ func (c *HisApiController) Check310() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 
 	var user_name string
-	user_name = "xxx"
+	user_name = "高慧裕"
 	api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
 		"insutype=" + "310" +
 		"&clr_type=" + "11" +
-		"&setl_optins=" + "定点医保中心" +
-		"&stmt_begndate=" + "2021-03-01" +
-		"&stm_enddate=" + "2021-03-31" +
-		"&medfee_sumamt=" + "11521" +
-		"&fund_pay_sumamt=" + "10166.66" +
+		"&setl_optins=" + "441202" +
+		"&stmt_begndate=" + "2022-02-01" +
+		"&stm_enddate=" + "2022-02-28" +
+		"&medfee_sumamt=" + "155812.88" +
+		"&fund_pay_sumamt=" + "151026.03" +
 		"&acct_pay=" + "0" +
-		"&fixmedins_setl_cnt=" + "7" +
+		"&fixmedins_setl_cnt=" + "73" +
 		"&fixmedins_code=" + miConfig.Code +
 		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
 		"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
@@ -7016,17 +7015,17 @@ func (c *HisApiController) Check390() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 
 	var user_name string
-	user_name = "张俊杰"
+	user_name = "高慧裕"
 	api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
 		"insutype=" + "390" +
 		"&clr_type=" + "11" +
-		"&setl_optins=" + "定点医保中心" +
-		"&stmt_begndate=" + "2021-03-01" +
-		"&stm_enddate=" + "2021-03-31" +
-		"&medfee_sumamt=" + "209318.43" +
-		"&fund_pay_sumamt=" + "188029.12" +
+		"&setl_optins=" + "441202" +
+		"&stmt_begndate=" + "2022-02-01" +
+		"&stm_enddate=" + "2022-02-28" +
+		"&medfee_sumamt=" + "933920.08" +
+		"&fund_pay_sumamt=" + "904130.94" +
 		"&acct_pay=" + "0" +
-		"&fixmedins_setl_cnt=" + "48" +
+		"&fixmedins_setl_cnt=" + "396" +
 		"&fixmedins_code=" + miConfig.Code +
 		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
 		"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +