1111

controllers/sg/his_api_controller.go

@@ -2736,19 +2736,15 @@ func (c *HisApiController) GetCheckAccount() {
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_type)
 
-	decimal.DivisionPrecision = 2
 	var medfee_sumamt float64
 	var acct_pay float64
 	var fund_pay_sumamt float64
 	fixmedins_setl_cnt := int64(len(orders))
-
 	for _, item := range orders {
-		medfee_sumamt, _ = decimal.NewFromFloat(medfee_sumamt).Add(decimal.NewFromFloat(item.MedfeeSumamt)).Float64()
-		acct_pay, _ = decimal.NewFromFloat(acct_pay).Add(decimal.NewFromFloat(item.AcctPay)).Float64()
-		fund_pay_sumamt, _ = decimal.NewFromFloat(fund_pay_sumamt).Add(decimal.NewFromFloat(item.FundPaySumamt)).Float64()
-
+		medfee_sumamt = medfee_sumamt + item.MedfeeSumamt
+		acct_pay = medfee_sumamt + item.AcctPay
+		fund_pay_sumamt = fund_pay_sumamt + item.FundPaySumamt
 	}
-
 	var user_name string
 	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	if role.ID == 0 {
@@ -2869,6 +2865,12 @@ func (c *HisApiController) GetCheckDetailAccount() {
 	var fund_pay_sumamt float64
 	fixmedins_setl_cnt := int64(len(orders))
 
+	for _, item := range orders {
+		medfee_sumamt = medfee_sumamt + item.MedfeeSumamt
+		psn_cash_pay = psn_cash_pay + item.PsnCashPay
+		fund_pay_sumamt = fund_pay_sumamt + item.FundPaySumamt
+	}
+
 	for _, item := range orders {
 		medfee_sumamt, _ = decimal.NewFromFloat(medfee_sumamt).Add(decimal.NewFromFloat(item.MedfeeSumamt)).Float64()
 		psn_cash_pay, _ = decimal.NewFromFloat(psn_cash_pay).Add(decimal.NewFromFloat(item.PsnCashPay)).Float64()

enums/error_code.go

@@ -452,7 +452,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeCalOrderException:       "结算失败",
 	ErrorCodeGdybOneException:        "获取人员信息失败",
 	ErrorCodeRegisterThreeException:  "就诊信息上传失败",
-	ErrorCodeRegisterRepeatException: "一天只能挂号一次",
+	ErrorCodeRegisterRepeatException: "患者一天只能挂号一次",
 	ErrorCodeAmountAccountException:  "结算失败",
 
 	ErrorCodeReadCardException:  "读卡失败",

routers/router.go

@@ -2,6 +2,7 @@ package routers
 
 import (
 	"gdyb/controllers/sg"
+	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/plugins/cors"

service/his_service.go

@@ -858,7 +858,7 @@ func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo,
 }
 
 func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype string, clr_type string) (orders []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND is_medicine_insurance = 1 AND settle_accounts_date <= ? AND settle_accounts_date >= ? AND insutype = ?", org_id, end_time, start_time, insutype, clr_type).Find(&orders).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND is_medicine_insurance = 1 AND settle_accounts_date <= ? AND settle_accounts_date >= ? AND insutype = ?", org_id, end_time, start_time, insutype).Find(&orders).Error
 	return
 }
 

service/sz_his_service.go

@@ -12,11 +12,12 @@ import (
 	_ "unsafe"
 )
 
-func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_code string, account string, verify_code string, serial_number string, mz_number string) string {
+func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_code string, account string, verify_code string, serial_number string, mz_number string, version_code string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
-	inputMessage["transType"] = "MZ002" // 交易编码
+	inputMessage["transType"] = "MZ002"         // 交易编码
+	inputMessage["transVersion"] = version_code // 交易编码
 
 	inputData["akc190"] = mz_number
 	inputData["aaz500"] = account
@@ -25,6 +26,8 @@ func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_co
 	inputData["akf001"] = dept_code
 	inputData["bkc368"] = "2"
 	inputData["akc264"] = 10.00
+	inputData["bke384"] = inputMessage["serialNumber"]
+
 	inputData["listsize"] = 1
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
@@ -39,8 +42,6 @@ func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_co
 	feedetailInfo["aae019"] = 10.00
 	feedetail = append(feedetail, feedetailInfo)
 	inputData["inputlist"] = feedetail
-
-	inputData["bke384"] = inputMessage["serialNumber"]
 	inputMessage["transBody"] = inputData
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
@@ -73,12 +74,13 @@ func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_co
 	str := string(respBytes)
 	return str
 }
-func SzybFY001(doctor string, doctor_code string, fixmedins_code string, datas []*models.CustomDetail, verify_code string, serial_number string, mz_number string) string {
+func SzybFY001(doctor string, doctor_code string, fixmedins_code string, datas []*models.CustomDetail, verify_code string, serial_number string, mz_number string, version_code string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
-	inputMessage["transType"] = "FY001" // 交易编码
-	inputMessage["transChannel"] = "10" // 交易编码
+	inputMessage["transType"] = "FY001"         // 交易编码
+	inputMessage["transChannel"] = "10"         // 交易编码
+	inputMessage["transVersion"] = version_code // 交易编码
 
 	inputData["akc190"] = mz_number
 	inputData["bke384"] = serial_number
@@ -144,11 +146,12 @@ func SzybFY001(doctor string, doctor_code string, fixmedins_code string, datas [
 	str := string(respBytes)
 	return str
 }
-func SzybFY002(doctor string, doctor_code string, fixmedins_code string, datas []*models.CustomDetail, verify_code string, serial_number string, mz_number string) string {
+func SzybFY002(doctor string, doctor_code string, fixmedins_code string, datas []*models.CustomDetail, verify_code string, serial_number string, mz_number string, version_code string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
-	inputMessage["transType"] = "FY002" // 交易编码
+	inputMessage["transType"] = "FY002"         // 交易编码
+	inputMessage["transVersion"] = version_code // 交易编码
 
 	inputData["akc190"] = mz_number
 	inputData["bke384"] = serial_number
@@ -198,11 +201,12 @@ func SzybFY002(doctor string, doctor_code string, fixmedins_code string, datas [
 	str := string(respBytes)
 	return str
 }
-func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total float64, verify_code string, serial_number string, mz_number string) string {
+func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total float64, verify_code string, serial_number string, mz_number string, version_code string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
-	inputMessage["transType"] = "FY004" // 交易编码
+	inputMessage["transType"] = "FY004"         // 交易编码
+	inputMessage["transVersion"] = version_code // 交易编码
 
 	inputData["akc190"] = mz_number
 	inputData["aka130"] = "11"
@@ -246,12 +250,14 @@ func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total f
 	str := string(respBytes)
 	return str
 }
-func SzybFY005(doctor string, doctor_code string, fixmedins_code string, dept_code string, total float64, account string, verify_code string, serial_number string, mz_number string) string {
+func SzybFY005(doctor string, doctor_code string, fixmedins_code string, total float64, account string, verify_code string, serial_number string, mz_number string, version_code string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "FY005" // 交易编码
 
+	inputMessage["transVersion"] = version_code // 交易编码
+
 	inputData["aaz500"] = account
 	inputData["bzz269"] = "000000"
 	inputData["akc190"] = mz_number
@@ -298,11 +304,12 @@ func SzybFY005(doctor string, doctor_code string, fixmedins_code string, dept_co
 	str := string(respBytes)
 	return str
 }
-func SzybJY001(doctor string, doctor_code string, fixmedins_code string, setl_number string, mz_number string, verify_code string) string {
+func SzybJY001(doctor string, doctor_code string, fixmedins_code string, setl_number string, mz_number string, verify_code string, version_code string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, setl_number)
 	inputData := make(map[string]interface{})
-	inputMessage["transType"] = "JY001" // 交易编码
+	inputMessage["transType"] = "JY001"         // 交易编码
+	inputMessage["transVersion"] = version_code // 交易编码
 
 	inputData["akc190"] = mz_number
 	inputData["bke384"] = setl_number
@@ -341,11 +348,12 @@ func SzybJY001(doctor string, doctor_code string, fixmedins_code string, setl_nu
 	str := string(respBytes)
 	return str
 }
-func SzybJY002(doctor string, doctor_code string, fixmedins_code string, setl_number string, mz_number string, verify_code string, new_setl_number string) string {
+func SzybJY002(doctor string, doctor_code string, fixmedins_code string, setl_number string, mz_number string, verify_code string, new_setl_number string, version_code string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, new_setl_number)
 	inputData := make(map[string]interface{})
-	inputMessage["transType"] = "JY002" // 交易编码
+	inputMessage["transType"] = "JY002"         // 交易编码
+	inputMessage["transVersion"] = version_code // 交易编码
 
 	inputData["akc190"] = mz_number
 	inputData["bke384"] = setl_number
@@ -384,13 +392,14 @@ func SzybJY002(doctor string, doctor_code string, fixmedins_code string, setl_nu
 	str := string(respBytes)
 	return str
 }
-func SzybJY003(doctor string, doctor_code string, fixmedins_code string, setl_number string, mz_number string, verify_code string) string {
+func SzybJY003(doctor string, doctor_code string, fixmedins_code string, setl_number string, mz_number string, verify_code string, version_code string) string {
 
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, setl_number)
 
 	inputData := make(map[string]interface{})
-	inputMessage["transType"] = "JY003" // 交易编码
+	inputMessage["transType"] = "JY003"         // 交易编码
+	inputMessage["transVersion"] = version_code // 交易编码
 
 	inputData["akc190"] = mz_number
 	inputData["bke384"] = setl_number
@@ -456,11 +465,9 @@ func SetSZInputMessage(doctor string, doctor_code string, fixmedins_code string,
 	inputMessage["operatorName"] = doctor         // 操作员名字
 	inputMessage["operatorPass"] = ""             // 定点协议机构操作人员编码
 	inputMessage["serialNumber"] = number
-
 	inputMessage["transReturnCode"] = ""                                           //
 	inputMessage["transReturnMessage"] = ""                                        //
 	inputMessage["transTime"] = year + month + day + hour + min + sec + ":" + msec //
-	inputMessage["transVersion"] = "V0.3"                                          //
 	inputMessage["verifyCode"] = verify_code                                       //
 	inputMessage["transChannel"] = "10"                                            //