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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10217
+org_id = 10191
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -49,11 +49,12 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/refundnumber/post", &HisApiController{}, "get:RefundNumber")
 	//退明细
 	beego.Router("/api/refunddetail/post", &HisApiController{}, "get:RefundDetail")
+	//上传就诊信息-上传明细-预结算
+	beego.Router("/api/presettle/get", &HisApiController{}, "get:GetPreUploadInfo")
 
 	beego.Router("/api/treatment/check", &HisApiController{}, "get:CheckTreatment")
 	beego.Router("/api/org/info", &HisApiController{}, "get:GetOrgInfo")
 	beego.Router("/api/readcard", &HisApiController{}, "get:ReadCard")
-	beego.Router("/api/presettle/get", &HisApiController{}, "get:GetPreUploadInfo")
 	beego.Router("/api/310", &HisApiController{}, "get:Check310")
 	beego.Router("/api/390", &HisApiController{}, "get:Check390")
 	beego.Router("/api/patient/info", &HisApiController{}, "get:GetPatientInfo")
@@ -72,11 +73,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/insutype/check", &HisApiController{}, "get:CheckInsutype")
 	beego.Router("/api/batchsettlelist/get", &HisApiController{}, "get:GetBatchSettleList")
 	beego.Router("/api/psn/info", &HisApiController{}, "get:GetPsnNcdsInfo")
-
-	//beego.Router("/api/allopatry/get", &HisApiController{}, "get:GetAllopatry")
-	//beego.Router("/api/comfirmallopatry/post", &HisApiController{}, "post:ComfirmAllopatry")
 	beego.Router("/api/allopatry/refund", &HisApiController{}, "post:RefundAllopatry")
-
 	beego.Router("/api/check", &HisApiController{}, "get:Check")
 	beego.Router("/api/check3101", &HisApiController{}, "get:Check3101")
 	beego.Router("/api/check3102", &HisApiController{}, "get:Check3102")
@@ -1896,6 +1893,8 @@ func (c *HisApiController) ReadCard() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
 				return
 			}
+		} else if miConfig.MdtrtareaAdmvs == "440300" || miConfig.MdtrtareaAdmvs == "440305" {
+
 		}
 		break
 	}
@@ -1995,10 +1994,8 @@ type CustomFundPay struct {
 }
 
 func (c *HisApiController) GetSettleList() {
-
 	order_id, _ := c.GetInt64("order_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-
 	order, _ := service.GetHisOrderByIDTwo(order_id)
 	roles, _ := service.GetDoctorListTwo(c.GetAdminUserInfo().CurrentOrgId)
 	his, _ := service.GetHisPatientByNumber(order.MdtrtId)
@@ -5761,7 +5758,19 @@ func (c *HisApiController) GetUploadInfo() {
 
 		} else if miConfig.MdtrtareaAdmvs == "350500" {
 			result, requestLog = service.FJyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time, doctor_info.UserName, roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
-
+			saveLog(result, requestLog, "2203", "上传就诊信息")
+			var respJSON2 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			userJSONBytes2, _ := json.Marshal(respJSON2)
+			if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 		} else {
 			if miConfig.MdtrtareaAdmvs == "440781" { //
 				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
@@ -6000,7 +6009,29 @@ func (c *HisApiController) GetUploadInfo() {
 
 				} else if miConfig.MdtrtareaAdmvs == "350500" {
 
-					//result, request_log := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), patientPrescription.DoctorId, sickConfig.CountryCode)
+					result, request_log := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+					var dat map[string]interface{}
+					if err := json.Unmarshal([]byte(result), &dat); err == nil {
+						fmt.Println(dat)
+					} else {
+						fmt.Println(err)
+					}
+					saveLog(result, request_log, "2204", "上传费用明细")
+					userJSONBytes, _ := json.Marshal(dat)
+
+					if err := json.Unmarshal(userJSONBytes, &resFour10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+
+					res.InfRefmsgid = resFour10265.InfRefmsgid
+					res.Output = resFour10265.Output
+					res.ErrMsg = resFour10265.ErrMsg
+					res.Cainfo = resFour10265.Cainfo
+					res.WarnMsg = resFour10265.WarnMsg
+					infocode, _ := strconv.ParseInt(resFour10265.Infcode, 10, 64)
+					res.Infcode = infocode
 
 				} else {
 
@@ -6382,6 +6413,33 @@ func (c *HisApiController) GetUploadInfo() {
 							infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
 							res.Infcode = infocode
 
+						} else if miConfig.MdtrtareaAdmvs == "350500" {
+
+							result2, src_resquest = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+
+							//result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
+							var dat map[string]interface{}
+							if err := json.Unmarshal([]byte(result2), &dat); err == nil {
+								fmt.Println(dat)
+							} else {
+								fmt.Println(err)
+							}
+							saveLog(result2, src_resquest, "2207", "结算")
+							userJSONBytes, _ := json.Marshal(dat)
+							if err := json.Unmarshal(userJSONBytes, &resSeven10265); err != nil {
+								utils.ErrorLog("解析失败：%v", err)
+								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+								return
+							}
+
+							res.InfRefmsgid = resSeven10265.InfRefmsgid
+							res.Output = resSeven10265.Output
+							res.ErrMsg = resSeven10265.ErrMsg
+							res.Cainfo = resSeven10265.Cainfo
+							res.WarnMsg = resSeven10265.WarnMsg
+							infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+							res.Infcode = infocode
+
 						} else {
 							if miConfig.Code == "H15049901371" {
 								//赤峰地区国家医保医疗类别
@@ -6794,6 +6852,21 @@ func (c *HisApiController) GetUploadInfo() {
 				infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
 				res.Infcode = infocode
 
+			} else if miConfig.MdtrtareaAdmvs == "350500" {
+				result2, src_resquest = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
+				saveLog(result2, src_resquest, "2207", "结算")
+				userJSONBytes, _ := json.Marshal(dat)
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 			} else {
 
 				var src_resquest string
@@ -7601,24 +7674,6 @@ func (c *HisApiController) GetPreUploadInfo() {
 		}
 
 	} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
-		//江苏地区国家医保医疗类别
-		//职工透析：医疗类别选特殊情况门诊9933
-		//居民血透门慢： 医疗类别选门诊慢病1402
-		//var med_type string
-		//if his.Insutype == "310" {
-		//	if reg_type == 14 {
-		//		med_type = "9933"
-		//	} else if reg_type == 11 {
-		//		med_type = "11"
-		//
-		//	}
-		//} else if his.Insutype == "390" {
-		//	if reg_type == 14 {
-		//		med_type = "1402"
-		//	} else if reg_type == 11 {
-		//		med_type = "11"
-		//	}
-		//}
 
 		data := make(map[string]interface{})
 		client := &http.Client{}
@@ -7693,6 +7748,22 @@ func (c *HisApiController) GetPreUploadInfo() {
 		infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
 		res2.Infcode = infocode
 
+	} else if miConfig.MdtrtareaAdmvs == "350500" {
+		result, requestLog := service.FJyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time, doctor_info.UserName, roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+		saveLog(result, requestLog, "2203", "上传就诊信息")
+		var respJSON2 map[string]interface{}
+		if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		userJSONBytes2, _ := json.Marshal(respJSON2)
+		if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
 	} else {
 		var result string
 		var requestLog string
@@ -7918,6 +7989,23 @@ func (c *HisApiController) GetPreUploadInfo() {
 				infocode, _ := strconv.ParseInt(resFour10265.Infcode, 10, 64)
 				res.Infcode = infocode
 
+			} else if miConfig.MdtrtareaAdmvs == "350500" {
+
+				result, request_log := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(result), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
+				saveLog(result, request_log, "2204", "上传费用明细")
+				userJSONBytes, _ := json.Marshal(dat)
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
 			} else {
 
 				if miConfig.Code == "H15049901371" {
@@ -8272,6 +8360,22 @@ func (c *HisApiController) GetPreUploadInfo() {
 						infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
 						res.Infcode = infocode
 
+					} else if miConfig.MdtrtareaAdmvs == "350500" {
+
+						result, request_log := service.FJyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+						var dat map[string]interface{}
+						if err := json.Unmarshal([]byte(result), &dat); err == nil {
+							fmt.Println(dat)
+						} else {
+							fmt.Println(err)
+						}
+						saveLog(result, request_log, "2206", "预结算")
+						userJSONBytes, _ := json.Marshal(dat)
+						if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 					} else {
 
 						var result string
@@ -8466,212 +8570,6 @@ func (c *HisApiController) GetPreUploadInfo() {
 	}
 }
 
-//func (c *HisApiController) GetSettleInfo() {
-//	id, _ := c.GetInt64("id")
-//	order_id, _ := c.GetInt64("order_id")
-//
-//	record_time := c.GetString("record_time")
-//	pay_way, _ := c.GetInt64("pay_way")
-//	pay_price, _ := c.GetFloat("pay_price")
-//	pay_card_no := c.GetString("pay_card_no")
-//	discount_price, _ := c.GetFloat("discount_price")
-//	preferential_price, _ := c.GetFloat("preferential_price")
-//	reality_price, _ := c.GetFloat("reality_price")
-//	found_price, _ := c.GetFloat("found_price")
-//	medical_insurance_price, _ := c.GetFloat("medical_insurance_price")
-//	private_price, _ := c.GetFloat("private_price")
-//	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
-//	admin_user_id, _ := c.GetInt64("admin_user_id")
-//
-//	timeLayout := "2006-01-02"
-//	loc, _ := time.LoadLocation("Local")
-//	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
-//	if err != nil {
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-//		return
-//	}
-//	recordDateTime := theTime.Unix()
-//	adminUser := c.GetAdminUserInfo()
-//
-//	var prescriptions []*models.HisPrescription
-//
-//	data := make(map[string]interface{})
-//	if settle_accounts_type == 1 { //日结
-//		prescriptions, _ = service.GetHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
-//		data["pre"] = prescriptions
-//
-//	} else { //月结
-//		start_time_str := c.GetString("start_time")
-//		end_time_str := c.GetString("end_time")
-//		timeLayout := "2006-01-02"
-//		loc, _ := time.LoadLocation("Local")
-//		theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
-//		if err != nil {
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-//			return
-//		}
-//		recordStartTime := theStartTime.Unix()
-//		theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
-//		if err != nil {
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-//			return
-//		}
-//		recordEndTime := theEndTime.Unix()
-//		prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
-//		data["pre"] = prescriptions
-//
-//	}
-//
-//	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-//
-//	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
-//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-//	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
-//	strconv.FormatInt(his.PatientId, 10)
-//
-//	order_src, _ := service.GetHisOrderByID(order_id)
-//
-//	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-//	if config.IsOpen == 1 { //对接了医保，走医保流程
-//
-//		var total float64
-//		for _, item := range prescriptions {
-//			if item.Type == 1 { //药品
-//				for _, subItem := range item.HisDoctorAdviceInfo {
-//					total = total + (subItem.Price * subItem.PrescribingNumber)
-//				}
-//			}
-//			if item.Type == 2 { //项目
-//				for _, subItem := range item.HisPrescriptionProject {
-//					total = total + (subItem.Price * float64(subItem.Count))
-//				}
-//			}
-//		}
-//
-//		for _, item := range prescriptions {
-//			for _, subItem := range item.HisAdditionalCharge {
-//				total = total + (subItem.Price * float64(subItem.Count))
-//			}
-//		}
-//
-//		allTotal := fmt.Sprintf("%.2f", total)
-//		var rf []*ResultFive
-//		json.Unmarshal([]byte(his.Iinfo), &rf)
-//		psn_no := order_src.PsnNo
-//		mdtrt_id := order_src.MdtrtId
-//		chrg_bchno := order_src.Number
-//		cert_no := order_src.Certno
-//		insutype := rf[0].Insutype
-//
-//		if his.IdCardType == 1 {
-//			cert_no = his.MedicalInsuranceNumber
-//		} else {
-//			cert_no = his.Certno
-//		}
-//
-//		result, src_resquest := service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, strconv.FormatFloat(total, 'E', -1, 64) ,miConfig.OrgName,roles.UserName,miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(patientPrescription.RegisterType, 10),his.IdCardType, order_src.FulamtOwnpayAmt,order_src.OverlmtSelfPay,order_src.PreselfpayAmt,order_src.InscpScpAmt)
-//		var dat map[string]interface{}
-//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-//			fmt.Println(dat)
-//		} else {
-//			fmt.Println(err)
-//		}
-//
-//		userJSONBytes, _ := json.Marshal(dat)
-//
-//
-//
-//		var res ResultSeven
-//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-//			utils.ErrorLog("解析失败：%v", err)
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//			return
-//		}
-//		if res.Infcode == -1 {
-//			errlog := &models.HisOrderError{
-//				UserOrgId:  adminUser.CurrentOrgId,
-//				Ctime:      time.Now().Unix(),
-//				Mtime:      time.Now().Unix(),
-//				Number:     chrg_bchno,
-//				ErrMsg:     res.ErrMsg,
-//				Status:     1,
-//				PatientId:  id,
-//				RecordTime: recordDateTime,
-//				Stage:      6,
-//			}
-//			service.CreateErrMsgLog(errlog)
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
-//			return
-//		} else {
-//			order_src.OrderStatus = 2
-//			order_src.PayWay = pay_way
-//			order_src.PayPrice = pay_price
-//			order_src.PayCardNo = pay_card_no
-//			order_src.DiscountPrice = discount_price
-//			order_src.PreferentialPrice = preferential_price
-//			order_src.RealityPrice = reality_price
-//			order_src.FoundPrice = found_price
-//			order_src.MedicalInsurancePrice = medical_insurance_price
-//			order_src.PrivatePrice = private_price
-//			order_src.MdtrtId = res.Output.Setlinfo.MdtrtID
-//			order_src.SetlId = res.Output.Setlinfo.SetlID
-//			order_src.PsnNo = res.Output.Setlinfo.PsnNo
-//			order_src.PsnName = res.Output.Setlinfo.PsnName
-//			order_src.PsnCertType = res.Output.Setlinfo.PsnCertType
-//			order_src.Certno = res.Output.Setlinfo.Certno
-//			order_src.Gend = res.Output.Setlinfo.Gend
-//			order_src.Naty = res.Output.Setlinfo.Naty
-//			order_src.Age = res.Output.Setlinfo.Age
-//			order_src.Insutype = res.Output.Setlinfo.Insutype
-//			order_src.PsnType = res.Output.Setlinfo.PsnType
-//			order_src.CvlservFlag = res.Output.Setlinfo.CvlservFlag
-//			order_src.SetlTime = res.Output.Setlinfo.SetlTime
-//			order_src.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
-//			order_src.MedType = res.Output.Setlinfo.MedType
-//			order_src.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
-//			order_src.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
-//			order_src.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay
-//			order_src.PreselfpayAmt = res.Output.Setlinfo.PreselfpayAmt
-//			order_src.InscpScpAmt = res.Output.Setlinfo.InscpScpAmt
-//			order_src.ActPayDedc = res.Output.Setlinfo.ActPayDedc
-//			order_src.HifpPay = res.Output.Setlinfo.HifpPay
-//			order_src.CvlservPay = res.Output.Setlinfo.CvlservPay
-//			order_src.PoolPropSelfpay = res.Output.Setlinfo.PoolPropSelfpay
-//			order_src.HifesPay = res.Output.Setlinfo.HifesPay
-//			order_src.HifobPay = res.Output.Setlinfo.HifobPay
-//			order_src.MafPay = res.Output.Setlinfo.MafPay
-//			order_src.OthPay = res.Output.Setlinfo.OthPay
-//			order_src.FundPaySumamt = res.Output.Setlinfo.FundPaySumamt
-//			order_src.PsnPartAmt = res.Output.Setlinfo.PsnPartAmt
-//			order_src.AcctPay = res.Output.Setlinfo.AcctPay
-//			order_src.PsnCashPay = res.Output.Setlinfo.PsnCashPay
-//			order_src.HospPartAmt = res.Output.Setlinfo.HospPartAmt
-//			order_src.Balc = res.Output.Setlinfo.Balc
-//			order_src.AcctMulaidPay = res.Output.Setlinfo.AcctMulaidPay
-//			order_src.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
-//			order_src.ClrOptins = res.Output.Setlinfo.ClrOptins
-//			order_src.ClrWay = res.Output.Setlinfo.ClrWay
-//			order_src.Creator = order_src.Creator
-//			order_src.Modify = roles.ID
-//			order_src.RequestLog = src_resquest
-//			setlDetail, _ := json.Marshal(res.Output.Setldetail)
-//			detailStr := string(setlDetail)
-//			order_src.SetlDetail = detailStr
-//			err = service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
-//			err = service.UpDateOrder(order_src)
-//
-//			if err == nil {
-//				c.ServeSuccessJSON(map[string]interface{}{
-//					"msg": "结算成功",
-//				})
-//			} else {
-//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
-//				return
-//			}
-//		}
-//	}
-//}
-
 //退款
 func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
@@ -8778,6 +8676,24 @@ func (c *HisApiController) Refund() {
 			infocode, _ := strconv.ParseInt(resSixteen10265.Infcode, 10, 64)
 			res.Infcode = infocode
 
+		} else if miConfig.MdtrtareaAdmvs == "350500" {
+			result, src_resquest = service.FJyb2208(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			saveLog(result, src_resquest, "2208", "退费")
+
+			userJSONBytes, _ := json.Marshal(dat)
+
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		} else {
 
 			if miConfig.Code == "H15049901371" {
@@ -8915,6 +8831,22 @@ func (c *HisApiController) Refund() {
 				infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
 				res2.Infcode = infocode
 
+			} else if miConfig.MdtrtareaAdmvs == "350500" {
+				result2, src_request := service.FJyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
+
+				saveLog(result2, src_request, "2205", "撤销明细")
+				userJSONBytes, _ := json.Marshal(dat)
+				if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 			} else {
 
 				if miConfig.Code == "H15049901371" {
@@ -9116,6 +9048,23 @@ func (c *HisApiController) RefundNumber() {
 			infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
 			res2.Infcode = infocode
 
+		} else if miConfig.MdtrtareaAdmvs == "350500" {
+
+			result, request := service.FJyb2202(his.PsnNo, his.Number, his.IptOtpNo, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			saveLog(result, request, "2202", "退号")
+			userJSONBytes, _ := json.Marshal(dat)
+			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		} else {
 			var api3 string
 
@@ -9211,7 +9160,7 @@ func (c *HisApiController) RefundNumber() {
 }
 func (c *HisApiController) RefundDetail() {
 	order_id, _ := c.GetInt64("order_id")
-	//admin_user_id, _ := c.GetInt64("admin_user_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
 
 	//his_patient_id, _ := c.GetInt64("his_patient_id")
 
@@ -9223,7 +9172,7 @@ func (c *HisApiController) RefundDetail() {
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	adminUser := c.GetAdminUserInfo()
-	//roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
 	fmt.Println(err)
 	if err != nil {
@@ -9350,9 +9299,43 @@ func (c *HisApiController) RefundDetail() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
+		} else if miConfig.MdtrtareaAdmvs == "350500" {
+			result2, src_request := service.FJyb2205(his.PsnNo, his.Number, order.Number, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result2), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+
+			saveLog(result2, src_request, "2205", "撤销明细")
+			userJSONBytes, _ := json.Marshal(dat)
+			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res2.Infcode == 0 {
+				err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "", "")
+				if err == nil {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "撤销明细成功",
+					})
+					return
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"code": -10,
+					"msg":  res2.ErrMsg,
+				})
+			}
+
 		} else {
 			api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
-				"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+				"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp2, requestErr2 := http.Get(api2)
 			if requestErr2 != nil {
@@ -10224,6 +10207,20 @@ func (c *HisApiController) GetSettleAccounts() {
 			infocode, _ := strconv.ParseInt(resEleven10265.Infcode, 10, 64)
 			res.Infcode = infocode
 
+		} else if miConfig.MdtrtareaAdmvs == "350500" {
+			result := service.FJyb5203(baseParams, businessParams, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			userJSONBytes, _ := json.Marshal(dat)
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 		} else if miConfig.MdtrtareaAdmvs == "150499" {
 			fmt.Println("~~~~~~~")
 
@@ -12323,3 +12320,37 @@ func Remove0000(s string) string {
 	}
 	return string(str)
 }
+
+func (c *HisApiController) GetELeCertInfo(code string, operator_id string, operator_name string) (string, string) {
+	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
+	readCard := DllDef.MustFindProc("EcQuery")
+	pCardInfo := make([]byte, 8192)
+	pBusiCardInfo := make([]byte, 8192)
+
+	data := make(map[string]interface{})
+	//pData := make(map[string]interface{})
+
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["businessType"] = "01101"
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "血透室"
+	//
+	data["data"] = inputData
+	data["transType"] = "ec.query"
+	data["orgId"] = code
+	bytesData, _ := json.Marshal(data)
+	pCardInfo = bytesData
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	fmt.Println(ret2)
+	//fmt.Println(DeleteExtraSpace(string(bytesData)))
+	//fmt.Println(DeleteExtraSpace(string(pBusiCardInfo)))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
+	if ret2 != 0 {
+		return "", ""
+	}
+	return DeleteExtraSpace(string(bytesData)), DeleteExtraSpace(string(pBusiCardInfo))
+}

service/fj_service.go

@@ -546,7 +546,7 @@ func FJyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func FJyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag int64, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string) {
+func FJyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -652,7 +652,7 @@ func FJyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 
 }
 
-func FJyb5203(baseParams models.BaseParams, businessParams models.BusinessParams, med_type string, url string, app_id string, app_secret string, sign_key string, enc_key string) string {
+func FJyb5203(baseParams models.BaseParams, businessParams models.BusinessParams, url string, app_id string, app_secret string, sign_key string, enc_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -668,7 +668,6 @@ func FJyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData["setl_id"] = businessParams.SetlId
 	inputData["mdtrt_id"] = businessParams.MdtrtId
 	//inputData["med_type"] = med_type
-	fmt.Println(med_type)
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)