押金管理

controllers/data_api_controller.go

@@ -1227,7 +1227,7 @@ func (c *DataApiController) CreateSingleAdviceTemplate() {
 		AdviceName:            advice_name,
 		AdviceDesc:            advice_desc,
 		SingleDose:            single_dose,
-		SingleDoseUnit:        single_dose_unit,
+		SingleDoseUnit:        service.TypeConversion02(single_dose_unit),
 		PrescribingNumber:     prescribing_number,
 		PrescribingNumberUnit: prescribing_number_unit,
 		DeliveryWay:           delivery_way,

controllers/his_api_controller.go

@@ -4561,7 +4561,7 @@ func (c *HisApiController) GetUploadInfo() {
 			tx.Commit()
 		}
 	}()
-	if dec_way == "true" && tmp_decimal == "0" && tmp_decimal == "" {
+	if dec_way == "true" && tmp_decimal == "0" || dec_way == "true" && tmp_decimal == "" {
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金不能为0")
 		return
 	}
@@ -4870,10 +4870,13 @@ func (c *HisApiController) Refund() {
 		return
 	}
 	tmp := strconv.FormatInt(order.ID, 10)
-	err = service.MoneyIncrease(orgid, order.HisPatientId, tmp, order.Decimal)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+	//当押金不为零时产生退费记录
+	if order.Decimal != 0 {
+		err = service.MoneyIncrease(orgid, order.PatientId, tmp, order.Decimal)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "退费成功",

controllers/his_deposit_controller.go

@@ -20,6 +20,7 @@ type HisDepositApiController struct {
 
 func HisDepositApiRegistRouters() {
 	//beego.Router("/api/his/ttt", &HisDepositApiController{}, "get:TTT")                         //测试接口
+	beego.Router("/api/his/gethisusertoalive", &HisDepositApiController{}, "get:GetHisUserToAlive")  //获取病例中心，有效患者名称（去除了转出和死亡的）
 	beego.Router("/api/his/gethisuser", &HisDepositApiController{}, "get:GetHisUser")                //获取病例中心，有效患者名称
 	beego.Router("/api/his/adddeposit", &HisDepositApiController{}, "post:AddDeposit")               //新增押金
 	beego.Router("/api/his/getdepositcode", &HisDepositApiController{}, "get:GetDepositCode")        //获取新增押金编号
@@ -58,9 +59,27 @@ func HisDepositApiRegistRouters() {
 //	return
 //}
 
+//获取病例中心，有效患者名称（去除了转出和死亡的）
+func (this *HisDepositApiController) GetHisUserToAlive() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	list, err := service.GetHisUserToAlive(orgid)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+	return
+}
+
 //获取病例中心，有效患者名称
 func (this *HisDepositApiController) GetHisUser() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
+	token := this.Ctx.Request.Header.Get("Cookie")
+	fmt.Println(token)
+	this.Ctx.SetCookie("ppp", "lilili")
+	this.Ctx.SetCookie("ppp01", "lilili01")
 	list, err := service.GetHisUser(orgid)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
@@ -205,7 +224,9 @@ func (this *HisDepositApiController) RechargeDetails() {
 		}
 	}
 	if start_time == "" && end_time == "" {
-		stime, etime = service.GetMondayOfWeek()
+		//如果为空查询全部的
+		_, etime = service.GetMondayOfWeek()
+		stime = 0
 	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
@@ -259,7 +280,8 @@ func (this *HisDepositApiController) RechargeSummary() {
 		}
 	}
 	if start_time == "" && end_time == "" {
-		stime, etime = service.GetMondayOfWeek()
+		_, etime = service.GetMondayOfWeek()
+		stime = 0
 	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
@@ -372,6 +394,8 @@ func (this *HisDepositApiController) DepositFlow() {
 	check := map[string][]string{
 		"id":             {"must", "int", "id"},
 		"deposit_status": {"must", "int", "deposit_status"},
+		"page":           {"must", "string", "page"},
+		"limit":          {"must", "string", "limit"},
 	}
 	_, err := checks(this, &check)
 	if err != nil {
@@ -383,19 +407,23 @@ func (this *HisDepositApiController) DepositFlow() {
 	tmp, _ := service.GetHisUserName(orgid, id)
 	name := tmp.Name
 	deposit_status, _ := this.GetInt64("deposit_status", 0) //押金类型
-	if deposit_status > 3 {
+	if deposit_status > 4 {
 		utils.ErrorLog("押金类型错误,deposit_status:", deposit_status)
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金类型错误")
 		return
 	}
 	start_time := this.GetString("start_time", "") //开始时间
 	end_time := this.GetString("end_time", "")     //结束时间
+	page, _ := this.GetInt64("page")               //页码
+	limit, _ := this.GetInt64("limit")             //每一页查出来的条数
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var stime int64 //开始时间
 	var etime int64 //结束时间
 	if start_time == "" && end_time == "" {
-		stime, etime = service.GetMonth()
+		//如果为空则查全部的
+		_, etime = service.GetMonth()
+		stime = 0
 	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
@@ -405,7 +433,7 @@ func (this *HisDepositApiController) DepositFlow() {
 	//获取该角色当前时间段的余额
 	decimal := service.GetMoneyforTime(id, orgid, etime)
 	//获取列表
-	deposirhistory, errs := service.GetFlowList(id, orgid, stime, etime, deposit_status)
+	deposirhistory, total, errs := service.GetFlowList(page, limit, id, orgid, stime, etime, deposit_status)
 	if errs != nil {
 		utils.ErrorLog("获取列表失败，原因为:", errs.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, errs.Error())
@@ -423,6 +451,7 @@ func (this *HisDepositApiController) DepositFlow() {
 		"list":    deposirhistory,
 		"name":    name,
 		"decimal": decimal,
+		"total":   total,
 	})
 	return
 }
@@ -475,6 +504,7 @@ func (this *HisDepositApiController) GetUserList() {
 //扣费明细查询
 func (this *HisDepositApiController) DeductionDetails() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
+	orgid = 9675
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	keyword := this.GetString("keyword")
@@ -498,7 +528,8 @@ func (this *HisDepositApiController) DeductionDetails() {
 		}
 	}
 	if start_time == "" && end_time == "" {
-		stime, etime = service.GetMondayOfWeek()
+		_, etime = service.GetMondayOfWeek()
+		stime = 0
 	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
@@ -526,7 +557,8 @@ func (this *HisDepositApiController) DeductionDetails() {
 		details.Decimal = list[i].Deposit
 		details.ChargeDate = fmt.Sprintf(time.Unix(list[i].Ctime, 0).Format("2006-01-02 15:04:05"))
 		details.Chargetype = service.CodeToChargetype(orgid, details.Code)
-		details.Total = service.MedicalTotal(orgid, list[i].HisPatientId, details.Code)
+		details.Total = service.MedicalTotal(orgid, tmp_id)
+		details.ButtonShow = service.IsButtonShow(list[i].DepositCode, orgid, list[i].HisPatientId)
 		detailslist = append(detailslist, details)
 	}
 
@@ -540,6 +572,7 @@ func (this *HisDepositApiController) DeductionDetails() {
 //扣费汇总
 func (this *HisDepositApiController) DeSummary() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
+	orgid = 9675
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	keyword := this.GetString("keyword")
@@ -563,7 +596,8 @@ func (this *HisDepositApiController) DeSummary() {
 		}
 	}
 	if start_time == "" && end_time == "" {
-		stime, etime = service.GetMondayOfWeek()
+		_, etime = service.GetMondayOfWeek()
+		stime = 0
 	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
@@ -583,7 +617,8 @@ func (this *HisDepositApiController) DeSummary() {
 		sum = sum.Add(list[i].Deposit)
 		details.Name = namemap[list[i].HisPatientId]
 		details.Decimal = list[i].Deposit
-		details.Total = service.MedicalTotal(orgid, list[i].HisPatientId, list[i].DepositCode)
+		tmp_id, _ := strconv.ParseInt(list[i].DepositCode, 10, 64)
+		details.Total = service.MedicalTotal(orgid, tmp_id)
 		detailslist = append(detailslist, details)
 	}
 	maplist := make(map[string]models.DeductionSummary)
@@ -611,7 +646,7 @@ func (this *HisDepositApiController) DeSummary() {
 		Finlist = append(Finlist, maplist[tmpslice[i]])
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": detailslist,
+		"list": Finlist,
 		"sum":  sum,
 	})
 	return
@@ -835,6 +870,8 @@ func (this *HisDepositApiController) RefundList() {
 	check := map[string][]string{
 		"refundtype":  {"must", "int", "refundtype"},
 		"examinetype": {"must", "int", "examinetype"},
+		"page":        {"must", "string", "page"},
+		"limit":       {"must", "string", "limit"},
 	}
 	_, err := checks(this, &check)
 	if err != nil {
@@ -847,6 +884,8 @@ func (this *HisDepositApiController) RefundList() {
 	keyword := this.GetString("keyword")           //获取搜索框
 	refundtype, _ := this.GetInt64("refundtype")   //获取退款类型
 	examinetype, _ := this.GetInt64("examinetype") //获取审核状态
+	page, _ := this.GetInt64("page")               //页码
+	limit, _ := this.GetInt64("limit")             //每一页查出来的条数
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
 	var stime int64 //开始时间
@@ -868,6 +907,7 @@ func (this *HisDepositApiController) RefundList() {
 	}
 	if start_time == "" && end_time == "" {
 		stime, etime = service.GetMondayOfWeek()
+		stime = 0
 	} else {
 		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
@@ -875,7 +915,8 @@ func (this *HisDepositApiController) RefundList() {
 		etime = etmp.Unix()
 	}
 	depo := []models.RefundList{}
-	depo, err = service.RefundList(orgid, stime, etime, refundtype, examinetype, keyword, slicekey)
+	var total int64
+	depo, total, err = service.RefundList(page, limit, orgid, stime, etime, refundtype, examinetype, keyword, slicekey)
 	if err != nil {
 		utils.ErrorLog("查询失败，原因为：", err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -891,10 +932,14 @@ func (this *HisDepositApiController) RefundList() {
 		}
 		if depo[i].DepositStatus == 4 {
 			depo[i].Name = "-"
+			tmpcode, _ := strconv.ParseInt(depo[i].DepositCode, 10, 64)
+			depo[i].DepositCode = service.FindcodeToid(tmpcode)
 		}
+
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": depo,
+		"list":  depo,
+		"total": total,
 	})
 	return
 }

controllers/his_hospital_api_controller.go

@@ -4,6 +4,7 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
+	"XT_New/utils"
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/shopspring/decimal"
@@ -742,6 +743,7 @@ func (this *HisHospitalApiController) GetZHOutHospitalCheck() {
 		IsMedicineInsurance: 1,
 		PType:               1,
 		MedfeeSumamt:        total,
+		PsnPartAmt:          total,
 	}
 	err := service.CreateOrder(order)
 	if err != nil {
@@ -768,8 +770,41 @@ func (c *HisHospitalApiController) GetSettleInfo() {
 	private_price, _ := c.GetFloat("private_price")
 	fapiao_code := c.GetString("fapiao_code")
 	fapiao_number := c.GetString("fapiao_number")
-	record, _ := service.GetInHospitalRecord(in_hospital_id)
-	order, _ := service.GetHisOrderByID(order_id)
+
+	id, _ := c.GetInt64("patient_id")
+	dec_way := c.GetString("dec_way") //是否使用押金支付bool类型
+	tmp_decimal := c.GetString("tmp_decimal")
+	var decimal float64 //本次使用的押金
+	var errmsg error
+	tx := service.XTWriteDB().Begin() //开了事务
+	//只检测扣费函数SpendDeposit有没有返回错误，如果有则回滚所有以TX结尾的方法（去掉TX即为原先的方法）
+	defer func() {
+		if errmsg != nil {
+			utils.ErrorLog("事务失败,原因为: %v", errmsg.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	if dec_way == "true" && tmp_decimal == "0" || dec_way == "true" && tmp_decimal == "" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金不能为0")
+		return
+	}
+	if len(tmp_decimal) > 0 {
+		if tmp_decimal[0] == 45 {
+			c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金不能为负数")
+			return
+		}
+	}
+	tt, errs := strconv.ParseFloat(tmp_decimal, 64)
+	if errs != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金金额错误")
+		return
+	}
+	decimal = tt
+
+	record, _ := service.GetInHospitalRecordTX(in_hospital_id, tx)
+	order, _ := service.GetHisOrderByIDTX(order_id, tx)
 	chrg_bchno := order.Number
 	if record.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -793,9 +828,21 @@ func (c *HisHospitalApiController) GetSettleInfo() {
 	order.PrivatePrice = private_price
 	order.MdtrtId = record.Number
 	order.MedfeeSumamt = order.MedfeeSumamt
+	order.Decimal = decimal
 	//order.SetlTime =
-	err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
-	err = service.UpDateOrder(order)
+	err := service.UpdataOrderStatusTwoTX(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId, tx)
+	err = service.UpDateOrderTX(order, tx)
+	//判断是否使用了押金
+	if dec_way == "true" {
+		tmpstring := strconv.FormatInt(order.ID, 10)
+		//扣押金
+		errmsg = service.SpendDeposit(c.GetAdminUserInfo().CurrentOrgId, id, c.GetAdminUserInfo().AdminUser.Id, tmpstring, decimal)
+		if errmsg != nil {
+			c.ServeFailJsonSend(enums.ErrorCodeParamWrong, errmsg.Error())
+			//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
+			return
+		}
+	}
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "结算成功",
@@ -807,19 +854,27 @@ func (c *HisHospitalApiController) GetSettleInfo() {
 }
 func (c *HisHospitalApiController) ZHRefund() {
 	order_id, _ := c.GetInt64("order_id")
+	order, _ := service.GetHisOrderByID(order_id)
 	adminUser := c.GetAdminUserInfo()
-	var order models.HisOrder
-	order, _ = service.GetHisOrderByID(order_id)
-
+	orgid := c.GetAdminUserInfo().CurrentOrgId
 	err := service.UpdataHospitalOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "", "")
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "退费成功",
-		})
-	} else {
+	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
+	tmp := strconv.FormatInt(order.ID, 10)
+	//当押金不为零时产生退费记录
+	if order.Decimal != 0 {
+		err = service.MoneyIncrease(orgid, order.PatientId, tmp, order.Decimal)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "退费成功",
+	})
 
 }
 func (this *HisHospitalApiController) GetZHOutHospitalUnCheck() {

controllers/mobile_api_controllers/login_api_controller.go

@@ -148,7 +148,6 @@ func (this *LoginAPIController) LoginByPwd() {
 		token := utils.GenerateLoginToken(mobile)
 		expiration, _ := beego.AppConfig.Int64("mobile_token_expiration_second")
 		this.Ctx.SetCookie("token_cookie", token, expiration, "/")
-
 		var configList interface{}
 		var dict_config_list interface{}
 

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -443,38 +443,47 @@ func (this *NewLoginApiController) LoginByCs() {
 						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 						return
 					}
-					orgJSON := respJSON["data"].(map[string]interface{})["org"].(map[string]interface{})
-					orgJSONBytes, _ := json.Marshal(orgJSON)
 					var org models.Org
-					if err := json.Unmarshal(orgJSONBytes, &org); err != nil {
-						utils.ErrorLog("解析机构失败：%v", err)
-						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
+					if respJSON["data"].(map[string]interface{})["org"] != nil {
+						orgJSON := respJSON["data"].(map[string]interface{})["org"].(map[string]interface{})
+						orgJSONBytes, _ := json.Marshal(orgJSON)
+						if err := json.Unmarshal(orgJSONBytes, &org); err != nil {
+							utils.ErrorLog("解析机构失败：%v", err)
+							this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 					}
-					appJSON := respJSON["data"].(map[string]interface{})["app"].(map[string]interface{})
-					appJSONBytes, _ := json.Marshal(appJSON)
 					var app models.OrgApp
-					if err := json.Unmarshal(appJSONBytes, &app); err != nil {
-						utils.ErrorLog("解析应用失败：%v", err)
-						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
+					if respJSON["data"].(map[string]interface{})["app"] != nil {
+						appJSON := respJSON["data"].(map[string]interface{})["app"].(map[string]interface{})
+						appJSONBytes, _ := json.Marshal(appJSON)
+						if err := json.Unmarshal(appJSONBytes, &app); err != nil {
+							utils.ErrorLog("解析应用失败：%v", err)
+							this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 					}
-					appRoleJSON := respJSON["data"].(map[string]interface{})["app_role"].(map[string]interface{})
-					appRoleJSONBytes, _ := json.Marshal(appRoleJSON)
 					var appRole models.App_Role
-					if err := json.Unmarshal(appRoleJSONBytes, &appRole); err != nil {
-						utils.ErrorLog("解析AppRole失败：%v", err)
-						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
+					if respJSON["data"].(map[string]interface{})["app_role"] != nil {
+						appRoleJSON := respJSON["data"].(map[string]interface{})["app_role"].(map[string]interface{})
+						appRoleJSONBytes, _ := json.Marshal(appRoleJSON)
+						if err := json.Unmarshal(appRoleJSONBytes, &appRole); err != nil {
+							utils.ErrorLog("解析AppRole失败：%v", err)
+							this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 					}
-					subscibeJSON := respJSON["data"].(map[string]interface{})["subscibe"].(map[string]interface{})
-					subscibeJSONBytes, _ := json.Marshal(subscibeJSON)
 					var subscibe models.ServeSubscibe
-					if err := json.Unmarshal(subscibeJSONBytes, &subscibe); err != nil {
-						utils.ErrorLog("解析Subscibe失败：%v", err)
-						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
+					if respJSON["data"].(map[string]interface{})["subscibe"] != nil {
+						subscibeJSON := respJSON["data"].(map[string]interface{})["subscibe"].(map[string]interface{})
+						subscibeJSONBytes, _ := json.Marshal(subscibeJSON)
+						if err := json.Unmarshal(subscibeJSONBytes, &subscibe); err != nil {
+							utils.ErrorLog("解析Subscibe失败：%v", err)
+							this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
 					}
+
 					service.GetOrgSubscibeState(&subscibe)
 					templateInfo, _ := service.GetOrgInfoTemplate(org.Id)
 

controllers/patient_api_controller.go

@@ -1281,16 +1281,29 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			singleDose, _ := strconv.ParseFloat(adviceNameM["single_dose"].(string), 64)
 			advice.SingleDose = singleDose
 		}
+		if adviceNameM["single_dose"] != nil && reflect.TypeOf(adviceNameM["single_dose"]).String() == "float64" {
+			singleDose := adviceNameM["single_dose"].(float64)
+			advice.SingleDose = singleDose
+		}
 
 		if adviceNameM["single_dose_unit"] != nil && reflect.TypeOf(adviceNameM["single_dose_unit"]).String() == "string" {
 			singleDoseUnit, _ := adviceNameM["single_dose_unit"].(string)
 			advice.SingleDoseUnit = singleDoseUnit
 		}
+		if adviceNameM["single_dose_unit"] != nil && reflect.TypeOf(adviceNameM["single_dose_unit"]).String() == "float64" {
+			tmp := adviceNameM["single_dose_unit"].(float64)
+			singleDoseUnit := service.TypeConversion(tmp)
+			advice.SingleDoseUnit = singleDoseUnit
+		}
 
 		if adviceNameM["prescribing_number"] != nil && reflect.TypeOf(adviceNameM["prescribing_number"]).String() == "string" {
 			prescribingNumber, _ := strconv.ParseFloat(adviceNameM["prescribing_number"].(string), 64)
 			advice.PrescribingNumber = prescribingNumber
 		}
+		if adviceNameM["prescribing_number"] != nil && reflect.TypeOf(adviceNameM["prescribing_number"]).String() == "float64" {
+			prescribingNumber := adviceNameM["prescribing_number"].(float64)
+			advice.PrescribingNumber = prescribingNumber
+		}
 
 		if adviceNameM["prescribing_number_unit"] != nil && reflect.TypeOf(adviceNameM["prescribing_number_unit"]).String() == "string" {
 			prescribingNumberUnit, _ := adviceNameM["prescribing_number_unit"].(string)
@@ -3073,11 +3086,20 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 		singleDose, _ := strconv.ParseFloat(dataBody["single_dose"].(string), 64)
 		advice.SingleDose = singleDose
 	}
+	if dataBody["single_dose"] != nil && reflect.TypeOf(dataBody["single_dose"]).String() == "float64" {
+		singleDose := dataBody["single_dose"].(float64)
+		advice.SingleDose = singleDose
+	}
 
 	if dataBody["single_dose_unit"] != nil && reflect.TypeOf(dataBody["single_dose_unit"]).String() == "string" {
 		singleDoseUnit, _ := dataBody["single_dose_unit"].(string)
 		advice.SingleDoseUnit = singleDoseUnit
 	}
+	if dataBody["single_dose_unit"] != nil && reflect.TypeOf(dataBody["single_dose_unit"]).String() == "float64" {
+		tmp := dataBody["single_dose_unit"].(float64)
+		singleDoseUnit := service.TypeConversion(tmp)
+		advice.SingleDoseUnit = singleDoseUnit
+	}
 
 	if dataBody["drug_spec"] != nil && reflect.TypeOf(dataBody["drug_spec"]).String() == "string" {
 		drugSpec, _ := strconv.ParseFloat(dataBody["drug_spec"].(string), 64)
@@ -3093,6 +3115,10 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 		prescribingNumber, _ := strconv.ParseFloat(dataBody["prescribing_number"].(string), 64)
 		advice.PrescribingNumber = prescribingNumber
 	}
+	if dataBody["prescribing_number"] != nil && reflect.TypeOf(dataBody["prescribing_number"]).String() == "float64" {
+		prescribingNumber := dataBody["prescribing_number"].(float64)
+		advice.PrescribingNumber = prescribingNumber
+	}
 
 	if dataBody["prescribing_number_unit"] != nil && reflect.TypeOf(dataBody["prescribing_number_unit"]).String() == "string" {
 		prescribingNumberUnit, _ := dataBody["prescribing_number_unit"].(string)

models/his_deposit_models.go

@@ -131,6 +131,7 @@ type Details struct {
 	Total      decimal.Decimal `json:"total"`       //医疗费总额
 	Decimal    decimal.Decimal `json:"decimal"`     //押金支付金额
 	ChargeDate string          `json:"charge_date"` //收费日期
+	ButtonShow int64           `json:"button_show"` //查看详情按钮是否显示，0隐藏，1显示
 }
 
 //扣费汇总

service/his_deposit_service.go

@@ -28,6 +28,12 @@ func GetHisUser(orgid int64) (hisname []models.GetHisName, err error) {
 	return
 }
 
+//获取his中的有效患者去除了转出和死亡的
+func GetHisUserToAlive(orgid int64) (hisname []models.GetHisName, err error) {
+	err = XTReadDB().Model(&models.GetHisName{}).Where("status = 1 and user_org_id = ? and lapseto = 1", orgid).Find(&hisname).Error
+	return
+}
+
 //获取his中的有效患者
 func GetHisUserName(orgid, id int64) (hisname models.GetHisName, err error) {
 	err = XTReadDB().Model(&models.GetHisName{}).Where("status = 1 and user_org_id = ? and id = ?", orgid, id).Find(&hisname).Error
@@ -203,6 +209,7 @@ func GetMonth() (int64, int64) {
 	return timeMonthStartUnix1, timeMonthEndUnix1
 }
 
+//获取创建者的姓名
 func GetCreateidName(id int64) string {
 	var tmp models.CreateUser
 	XTReadDB().Select("name").Where("id = ?", id).Find(&tmp)
@@ -221,14 +228,7 @@ func UpDecimalHistory(id int64) (err error) {
 			tx.Commit()
 		}
 	}()
-	//改状态
-	err = tx.Model(models.DepositHistory{}).Where("id = ?", id).Updates(map[string]interface{}{
-		"trial_status": 1,
-		"mtime":        time.Now().Unix(),
-	}).Error
-	if err != nil {
-		return
-	}
+
 	//查记录x2
 	var history models.DepositHistory
 	var detmp models.Deposit
@@ -240,6 +240,15 @@ func UpDecimalHistory(id int64) (err error) {
 	if err != nil {
 		return
 	}
+	//改状态,=====剩余押金
+	err = tx.Model(models.DepositHistory{}).Where("id = ?", id).Updates(map[string]interface{}{
+		"trial_status":    1,
+		"surplus_deposit": detmp.Deposit.Add(history.Deposit),
+		"mtime":           time.Now().Unix(),
+	}).Error
+	if err != nil {
+		return
+	}
 	//相加
 	err = tx.Model(&models.Deposit{}).Where("id = ? and status = 1", detmp.ID).Updates(map[string]interface{}{
 		"mtime":   time.Now().Unix(),
@@ -282,12 +291,13 @@ func GetMoneyforTime(id, orgid, etime int64) decimal.Decimal {
 }
 
 //押金流水
-func GetFlowList(id, orgid, stime, etime, deposit_status int64) (deposit []models.DepositHistory, err error) {
+func GetFlowList(page, limit, id, orgid, stime, etime, deposit_status int64) (deposit []models.DepositHistory, total int64, err error) {
 	s := "status = 1 and trial_status = 1 and user_org_id = ? and his_patient_id = ? and mtime >= ? and mtime <= ?"
+	offset := (page - 1) * limit
 	if deposit_status != 0 {
-		s = s + " and deposit_status = " + string(deposit_status)
+		s = s + " and deposit_status = " + strconv.FormatInt(deposit_status, 10)
 	}
-	err = XTReadDB().Model(&models.DepositHistory{}).Where(s, orgid, id, stime, etime).Order("mtime desc").Find(&deposit).Error
+	err = XTReadDB().Model(&models.DepositHistory{}).Where(s, orgid, id, stime, etime).Count(&total).Offset(offset).Order("mtime desc").Limit(limit).Find(&deposit).Error
 	return
 }
 
@@ -298,7 +308,7 @@ func GetUserList(page, limit, orgid int64, keyword string, slicekey []int64) (m
 	if len(keyword) > 0 {
 		db = db.Where(" his_patient_id = ? ", keyword)
 	}
-	err = db.Count(&total).Offset(offset).Order("mtime desc").Find(&m).Error
+	err = db.Count(&total).Offset(offset).Order("mtime desc").Limit(limit).Find(&m).Error
 	return
 }
 
@@ -320,17 +330,23 @@ func DeductionList(orgid, stime, etime int64, keyword string, slicekey []int64)
 }
 
 //获取医疗费总额
-func MedicalTotal(orgid, patient_id int64, code string) decimal.Decimal {
+func MedicalTotal(orgid, id int64) decimal.Decimal {
 	tmp := models.HisChargeSettleOrder{}
-	XTReadDB().Model(&models.HisChargeSettleOrder{}).Where("mdtrt_id = ? and patient_id = ? and user_org_id = ? and status = 1 and order_status = 2", code, patient_id, orgid).Find(&tmp)
+	//and status = 1 and order_status = 2
+	XTReadDB().Model(&models.HisChargeSettleOrder{}).Where("id = ? and user_org_id = ? ", id, orgid).Find(&tmp)
 	return decimal.NewFromFloat(tmp.MedfeeSumamt)
 }
 
 //根据就诊号查询出医收费类型
 func CodeToChargetype(orgid int64, code string) (s string) {
 	tmp := models.HisPrintPatient{}
+	tmp_hhcr := models.HisHospitalCheckRecordTwo{}
 	XTReadDB().Model(&models.HisPrintPatient{}).Where("number = ? and user_org_id = ?", code, orgid).Find(&tmp)
 	//tmp.BalanceAccountsType
+	if tmp.BalanceAccountsType == 0 {
+		XTReadDB().Model(&models.HisHospitalCheckRecordTwo{}).Where("number = ? and user_org_id = ?", code, orgid).Find(&tmp_hhcr)
+		tmp.BalanceAccountsType = tmp_hhcr.BalanceAccountsType
+	}
 	switch tmp.BalanceAccountsType {
 	case 1:
 		s = "医保"
@@ -351,6 +367,7 @@ func CodeToChargetype(orgid int64, code string) (s string) {
 	default:
 		s = "类型未定义"
 	}
+
 	return
 }
 
@@ -430,6 +447,9 @@ func RefundApplication(orgid, his_patient_id, trial_status, createid int64, code
 	tmp := models.Deposit{}
 	err = tx.Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", his_patient_id, orgid).Find(&tmp).Error
 	if err != nil {
+		if err.Error() == "record not found" {
+			err = fmt.Errorf("没有可退押金，保存失败")
+		}
 		return
 	}
 	//判断是否可以退款
@@ -638,8 +658,9 @@ func ChangeRefund(orgid, his_patient_id, trial_status, id int64, code string, de
 }
 
 //退款分页
-func RefundList(orgid, stime, etime, refundtype, examinetype int64, keyword string, slicekey []int64) (depo []models.RefundList, err error) {
+func RefundList(page, limit, orgid, stime, etime, refundtype, examinetype int64, keyword string, slicekey []int64) (depo []models.RefundList, total int64, err error) {
 	db := XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and user_org_id = ? ", orgid).Where("ctime >= ? and ctime <= ?", stime, etime)
+	offset := (page - 1) * limit
 	//退款类型
 	switch refundtype {
 	case 0:
@@ -670,7 +691,7 @@ func RefundList(orgid, stime, etime, refundtype, examinetype int64, keyword stri
 		keyword = "%" + keyword + "%"
 		db = db.Where(tmp, keyword)
 	}
-	err = db.Order("ctime desc").Find(&depo).Error
+	err = db.Count(&total).Offset(offset).Order("ctime desc").Limit(limit).Find(&depo).Error
 	return
 
 }
@@ -747,6 +768,22 @@ func FindnumberToid(id int64) (number string) {
 	return tmp.Number
 }
 
+//扣费明细列表，查看详情按钮是否显示，0隐藏，1显示
+func IsButtonShow(code string, orgid, his_patient_id int64) (tmp int64) {
+	var total int
+	XTReadDB().Model(&models.RefundList{}).Where(" user_org_id = ? and his_patient_id = ? and deposit_code = ? and deposit_status = 4 and status = 1", orgid, his_patient_id, code).Count(&total)
+	if total == 0 {
+		return 1
+	} else {
+		//预防万一,多加一个验证
+		if total%2 == 0 {
+			return 1
+		} else {
+			return 0
+		}
+	}
+}
+
 //把其他的类型转换成decimal.Decimal类型
 func ToDecimal(i interface{}) (d decimal.Decimal, err error) {
 	switch i.(type) {
@@ -763,3 +800,97 @@ func ToDecimal(i interface{}) (d decimal.Decimal, err error) {
 	}
 	return
 }
+
+func TypeConversion(tmp float64) (s string) {
+	switch tmp {
+	case 1:
+		s = "g"
+	case 2:
+		s = "mg"
+	case 3:
+		s = "u"
+	case 4:
+		s = "ml"
+	case 5:
+		s = "万U"
+	case 6:
+		s = "枚"
+	case 7:
+		s = "粒"
+	case 8:
+		s = "片"
+	case 9:
+		s = "支"
+	case 10:
+		s = "μg"
+	case 11:
+		s = "iu"
+	case 12:
+		s = "包"
+	case 13:
+		s = "袋"
+	case 14:
+		s = "万"
+	case 15:
+		s = "万iu"
+	case 16:
+		s = "丸"
+	case 17:
+		s = "盒"
+	case 18:
+		s = "瓶"
+	case 19:
+		s = "瓶（袋）"
+	case 20:
+		s = "次"
+	}
+	return s
+}
+
+func TypeConversion02(tmp string) (s string) {
+	switch tmp {
+	case "1":
+		s = "g"
+	case "2":
+		s = "mg"
+	case "3":
+		s = "u"
+	case "4":
+		s = "ml"
+	case "5":
+		s = "万U"
+	case "6":
+		s = "枚"
+	case "7":
+		s = "粒"
+	case "8":
+		s = "片"
+	case "9":
+		s = "支"
+	case "10":
+		s = "μg"
+	case "11":
+		s = "iu"
+	case "12":
+		s = "包"
+	case "13":
+		s = "袋"
+	case "14":
+		s = "万"
+	case "15":
+		s = "万iu"
+	case "16":
+		s = "丸"
+	case "17":
+		s = "盒"
+	case "18":
+		s = "瓶"
+	case "19":
+		s = "瓶（袋）"
+	case "20":
+		s = "次"
+	default:
+		s = tmp
+	}
+	return s
+}

service/his_hospital_service.go

@@ -271,6 +271,10 @@ func GetInHospitalRecord(id int64) (record models.HisHospitalCheckRecord, err er
 	err = readDb.Model(&models.HisHospitalCheckRecord{}).Where("id = ? AND status = 1", id).First(&record).Error
 	return
 }
+func GetInHospitalRecordTX(id int64, tx *gorm.DB) (record models.HisHospitalCheckRecord, err error) {
+	err = readDb.Model(&models.HisHospitalCheckRecord{}).Where("id = ? AND status = 1", id).First(&record).Error
+	return
+}
 
 func GetInHospitalRecordByNumber(number string) (record models.HisHospitalCheckRecord, err error) {
 	err = readDb.Model(&models.HisHospitalCheckRecord{}).Where("number = ? AND status = 1", number).First(&record).Error

service/his_service.go

@@ -1249,6 +1249,10 @@ func UpDateOrder(order models.HisOrder) (err error) {
 	err = writeDb.Save(&order).Error
 	return
 }
+func UpDateOrderTX(order models.HisOrder, tx *gorm.DB) (err error) {
+	err = writeDb.Save(&order).Error
+	return
+}
 
 func UpdataOrderStatusTwo(number string, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 2, "mtime": time.Now().Unix()}).Error

service/role_service.go

@@ -593,6 +593,7 @@ func SaveFuncRolePurviewIds(orgID int64, appID int64, roleID int64, funcPurviewI
 }
 
 func ModifyAdminUserInfo(adminUserID int64, orgID int64, appID int64, name string, avatar string, newPassword string) error {
+
 	tx := writeUserDb.Begin()
 	editInfoErr := tx.Exec("update sgj_user_admin_role set user_name = ?, avatar = ?, mtime = ? where admin_user_id = ? and org_id = ?", name, avatar, time.Now().Unix(), adminUserID, orgID).Error
 	if editInfoErr != nil {
@@ -606,6 +607,15 @@ func ModifyAdminUserInfo(adminUserID int64, orgID int64, appID int64, name strin
 			return editPwdErr
 		}
 	}
+	//这里加上
+	err := tx.Model(&models.AdminUser{}).Where("id = ?", adminUserID).Updates(map[string]interface{}{
+		"mtime": time.Now().Unix(),
+		"name":  name,
+	}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
 	tx.Commit()
 	return nil
 }

service/self_drug_service.go

@@ -551,6 +551,7 @@ type Drugs struct {
 	Dose                  float64  `gorm:"column:dose" json:"dose" form:"dose"`
 	DoseUnit              string   `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	MaxUnit               string   `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	DrugDoseUnit          int64    `grom:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
 }
 
 func (Drugs) TableName() string {