Merge branch '20211122' of http://git.shengws.com/csx/XT_New into 20211122

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/drug_stock_api_contorller.go

@@ -1696,6 +1696,7 @@ func (c *StockDrugApiController) GetDrugWarehouseOutList() {
 	types, _ := c.GetInt64("type", 0)
 	keywords := c.GetString("keywords")
 	storehouse_id, _ := c.GetInt64("storehouse_id")
+	way_type, _ := c.GetInt64("way_type")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -1739,7 +1740,7 @@ func (c *StockDrugApiController) GetDrugWarehouseOutList() {
 
 	}
 
-	warehouseOutList, total, err := service.FindAllDrugWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id)
+	warehouseOutList, total, err := service.FindAllDrugWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id, way_type)
 
 	houseList, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
 	fmt.Println(err)

controllers/gobal_config_api_controller.go

@@ -116,6 +116,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/changestocksetting/isopen", &GobalConfigApiController{}, "Get:ChangeStockSetting")
 
 	beego.Router("/api/changeadviceconfig", &GobalConfigApiController{}, "Get:ChangeAdviceConfig")
+
+	beego.Router("/api/changeprescriptionconfig", &GobalConfigApiController{}, "Get:ChangePrescriptionConfig")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1563,11 +1565,14 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 
 	stockSetting, _ := service.FindStockSettingById(adminUserInfo.CurrentOrgId)
 	adviceSetting, _ := service.FindAdviceSettingById(adminUserInfo.CurrentOrgId)
+
+	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"is_open_xt_his":         config.IsOpen,
 		"is_open_xt_his_project": project_config.IsOpen,
 		"is_open_stock":          stockSetting.IsType,
 		"is_open_advice":         adviceSetting.IsAdviceOpen,
+		"is_prescription_advice": prescriptionConfig.IsOpen,
 	})
 
 }
@@ -2395,3 +2400,38 @@ func (c *GobalConfigApiController) ChangeAdviceConfig() {
 	}
 
 }
+
+func (c *GobalConfigApiController) ChangePrescriptionConfig() {
+
+	is_open_prescription_xt_his, _ := c.GetInt64("is_open_prescription_xt_his")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	_, errcode := service.GetPrescriptionConfig(orgId)
+
+	if errcode == gorm.ErrRecordNotFound {
+
+		config := models.XtPrescriptionConfig{
+			UserOrgId: orgId,
+			IsOpen:    is_open_prescription_xt_his,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+		}
+		service.CreatePrescriptionConfig(config)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	} else if errcode == nil {
+		config := models.XtPrescriptionConfig{
+			UserOrgId: orgId,
+			IsOpen:    is_open_prescription_xt_his,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+		}
+		service.UpdatePrescriptionConfig(orgId, config)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	}
+
+}

controllers/his_api_controller.go

@@ -4547,9 +4547,41 @@ func (c *HisApiController) GetUploadInfo() {
 	reg_type, _ := c.GetInt64("p_type")
 	order_id, _ := c.GetInt64("order_id")
 
-	his, _ := service.GetHisPatientByIdThree(his_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)
+	fmt.Println(errs)
+	//if errs != nil {
+	//	c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金金额错误")
+	//	return
+	//}
+	decimal = tt
 
-	tempOrder, _ := service.GetHisOrderByID(order_id)
+	his, _ := service.GetHisPatientByIdThreeTX(his_patient_id, tx)
+
+	tempOrder, _ := service.GetHisOrderByIDTX(order_id, tx)
 
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
 	if err != nil {
@@ -4765,16 +4797,28 @@ func (c *HisApiController) GetUploadInfo() {
 				Type:             types,
 				ItemId:           item_id,
 			}
-			service.CreateOrderInfo(info)
+			service.CreateOrderInfoTX(info, tx)
 		}
 		his.Diagnosis = diagnosis_id
 		his.SickType = sick_type
 		his.RegisterType = reg_type
 		his.MedicalTreatmentType = reg_type
-		service.UpdataHisPateint(&his)
-		err = service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
-		err = service.UpDateHisPrescriptionInfoNumber(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime, his_patient_id)
-		err = service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
+		service.UpdataHisPateintTX(&his, tx)
+		err = service.UpDatePrescriptionNumberTX(adminUser.CurrentOrgId, ids, chrg_bchno, tx)
+		err = service.UpDateHisPrescriptionInfoNumberTX(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime, his_patient_id, tx)
+		err = service.UpdataOrderStatusTwoTX(chrg_bchno, adminUser.CurrentOrgId, 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": "结算成功",
@@ -4819,15 +4863,24 @@ func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	order, _ := service.GetHisOrderByID(order_id)
 	adminUser := c.GetAdminUserInfo()
+	orgid := c.GetAdminUserInfo().CurrentOrgId
 	err := service.UpdataOrderStatus(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 (c *HisApiController) RefundNumber() {

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/his_summary_controller.go

@@ -15,7 +15,7 @@ func HisSummaryApiRegistRouters() {
 
 	beego.Router("/api/gethissummarydetaillist", &HisSummaryApiController{}, "Get:GetHisSummaryDetailList")
 	beego.Router("/api/his/getgatherdetailist", &HisSummaryApiController{}, "Get:GetGatherDetaiList")
-
+	beego.Router("/api/his/getdetailpatients", &HisSummaryApiController{}, "Get:GetDetailPatients")
 }
 
 func (this *HisSummaryApiController) GetHisSummaryDetailList() {
@@ -42,9 +42,24 @@ func (this *HisSummaryApiController) GetHisSummaryDetailList() {
 	endRecordDateTime := endTime.Unix()
 
 	list, err := service.GetHisSummaryDetailList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
+
+	his_patient, _ := service.GetHisSummaryPatientInfo(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+
+	order, _ := service.GetHisLastOrder(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+
+	his_record_patient, _ := service.GetHisSummaryPatientInfoSix(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+
+	//获取所有的科室
+	hisDepatment, _ := service.GetHisDepatment(adminUser.CurrentOrgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": list,
+			"list":               list,
+			"patient":            patient,
+			"his_patient":        his_patient,
+			"hisDepatment":       hisDepatment,
+			"order":              order,
+			"his_record_patient": his_record_patient,
 		})
 		return
 	} else {
@@ -77,13 +92,531 @@ func (this *HisSummaryApiController) GetGatherDetaiList() {
 	}
 	endRecordDateTime := endTime.Unix()
 
-	list, err := service.GetAdviceGatherDetaiList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+	list, err := service.GetHisSummaryDetailList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
+
+	his_patient, _ := service.GetHisSummaryPatientInfo(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+
+	order, _ := service.GetHisLastOrder(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+
+	his_record_patient, _ := service.GetHisSummaryPatientInfoSix(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+
+	//获取所有的科室
+	hisDepatment, _ := service.GetHisDepatment(adminUser.CurrentOrgId)
+
+	var medicalInsuranceLevel = "医保等级"
+	medicalInsuranceLevelParent, _ := service.GetDrugDataConfig(0, medicalInsuranceLevel)
+	medicalInsuranceLevelList, _ := service.GetParentDataConfig(medicalInsuranceLevelParent.ID, adminUser.CurrentOrgId)
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminUser.CurrentOrgId)
+	var costClassify = "费用类别"
+	costClassifyParent, _ := service.GetDrugDataConfig(0, costClassify)
+	costClassifyList, _ := service.GetParentDataConfig(costClassifyParent.ID, adminUser.CurrentOrgId)
+	doctorlist, _ := service.GetAllDoctorSix(adminUser.CurrentOrgId, adminUser.CurrentAppId)
+
+	//获取最后一次排班
+	schedule, _ := service.GetHisSchedule(patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+	bedNumber, _ := service.GetAllBedNumberSix(adminUser.CurrentOrgId)
+	orderInfo, _ := service.GetHisLastOrder(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":                      list,
+			"patient":                   patient,
+			"his_patient":               his_patient,
+			"hisDepatment":              hisDepatment,
+			"order":                     order,
+			"his_record_patient":        his_record_patient,
+			"medicalInsuranceLevelList": medicalInsuranceLevelList,
+			"drugTypeList":              drugTypeList,
+			"costClassifyList":          costClassifyList,
+			"doctorlist":                doctorlist,
+			"schedule":                  schedule,
+			"bedNumber":                 bedNumber,
+			"orderInfo":                 orderInfo,
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
 
-	detailList, _ := service.GetProjectGatherDetailList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+	}
+}
+
+//func (this *HisSummaryApiController) GetGatherDetaiList() {
+//
+//	start_time := this.GetString("start_time")
+//	end_time := this.GetString("end_time")
+//	keyword := this.GetString("keyword")
+//	item_type, _ := this.GetInt64("type")
+//	patient_id, _ := this.GetInt64("patient_id")
+//	adminUser := this.GetAdminUserInfo()
+//
+//	timeLayout := "2006-01-02"
+//	loc, _ := time.LoadLocation("Local")
+//	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+//	if err != nil {
+//
+//	}
+//	startRecordDateTime := startTime.Unix()
+//
+//	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+//	if err != nil {
+//
+//	}
+//	endRecordDateTime := endTime.Unix()
+//
+//	//查询该病人这段时间的记录单号
+//	orderInfo, _ := service.GetGatherHisOrder(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+//
+//	org_id := this.GetAdminUserInfo().CurrentOrgId
+//	appid := this.GetAdminUserInfo().CurrentAppId
+//	var order_info []*service.HisOrderInfo
+//
+//	var MdtrtId string
+//
+//	patient, _ := service.GetPatientByID(org_id, patient_id)
+//	for _, item := range orderInfo {
+//		orderinfo, _ := service.GetHisOrderDetailByNumber(item.Number, org_id)
+//		MdtrtId = item.MdtrtId
+//		for _, it := range orderinfo {
+//
+//			order_info = append(order_info, it)
+//		}
+//	}
+//	his, _ := service.GetHisPatientInfoFive(org_id, patient_id, startRecordDateTime, endRecordDateTime)
+//
+//	record, _ := service.GetInHospitalRecordByNumber(MdtrtId)
+//
+//	//获取所有客户
+//	adminInfo, _ := service.GetAllDoctorSix(org_id, appid)
+//
+//	//获取最后一次排班
+//	schedule, _ := service.GetHisSchedule(patient_id, org_id, startRecordDateTime, endRecordDateTime)
+//
+//	bedNumber, _ := service.GetAllBedNumberSix(org_id)
+//	var bedCostTotal float64 = 0 //床位总费
+//
+//	var operationCostTotal float64 = 0 //手术费
+//
+//	var otherCostTotal float64 = 0 //其他费用
+//
+//	var materialCostTotal float64 = 0 //材料费
+//
+//	var westernMedicineCostTotal float64 = 0 //西药费
+//
+//	var chineseTraditionalMedicineCostTotal float64 = 0 //中成药
+//
+//	var checkCostTotal float64 = 0 //检查费
+//
+//	var laboratoryCostTotal float64 = 0 //化验费
+//
+//	var treatCostTotal float64 = 0 //治疗费用
+//
+//	var zhenChaCostTotal float64 = 0 //其他费用
+//
+//	decimal.DivisionPrecision = 2
+//	var BalanceAccountsType int64
+//	if his.ID > 0 {
+//		BalanceAccountsType = his.BalanceAccountsType
+//	} else {
+//		BalanceAccountsType = record.BalanceAccountsType
+//	}
+//
+//	his_patient, _ := service.GetHisSummaryPatientInfo(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+//
+//	//获取所有的科室
+//	hisDepatment, _ := service.GetHisDepatment(adminUser.CurrentOrgId)
+//
+//	//统计
+//	prescription, _ := service.GetHisPrescriptionTenty(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, keyword, item_type)
+//
+//	//orderlist, _ := service.GetHisChargeOrder(adminUser.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, keyword, item_type)
+//
+//	var medicalInsuranceLevel = "医保等级"
+//	medicalInsuranceLevelParent, _ := service.GetDrugDataConfig(0, medicalInsuranceLevel)
+//	medicalInsuranceLevelList, _ := service.GetParentDataConfig(medicalInsuranceLevelParent.ID, adminUser.CurrentOrgId)
+//	if BalanceAccountsType != 2 && BalanceAccountsType > 0 {
+//		for _, item := range order_info {
+//			if org_id == 10215 {
+//				if item.MedChrgitmType == "01" { //床位费
+//					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//				if item.MedChrgitmType == "02" { //诊察费
+//					zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.MedChrgitmType == "03" { //检查费
+//					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//
+//				if item.MedChrgitmType == "04" { //化验费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+//					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//
+//				if item.MedChrgitmType == "06" { //手术费
+//					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "08" { //材料费
+//					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "09" { //西药费
+//					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "11" { //中成费
+//					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
+//					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//			} else if org_id == 10188 || org_id == 10217 {
+//				if item.MedChrgitmType == "01" { //床位费
+//					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.MedChrgitmType == "02" { //诊察费
+//					zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//				if item.MedChrgitmType == "03" { //检查费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "04" { //化验费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+//					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "06" { //手术费
+//					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "08" { //材料费
+//					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "09" { //西药费
+//					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "11" { //中成费
+//					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
+//					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//			} else {
+//
+//				if item.MedChrgitmType == "01" { //床位费
+//					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//
+//				if item.MedChrgitmType == "03" { //检查费
+//					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "04" { //化验费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//
+//				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+//					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "06" { //手术费
+//					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "08" { //材料费
+//					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "09" { //西药费
+//					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "11" { //中成费
+//					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
+//					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//
+//			}
+//		}
+//		this.ServeSuccessJSON(map[string]interface{}{
+//			"order":                               orderInfo,
+//			"order_info":                          order_info,
+//			"patient":                             patient,
+//			"admin_info":                          adminInfo,
+//			"his_hospital":                        record,
+//			"bedCostTotal":                        bedCostTotal,
+//			"operationCostTotal":                  operationCostTotal,
+//			"otherCostTotal":                      otherCostTotal,
+//			"materialCostTotal":                   materialCostTotal,
+//			"westernMedicineCostTotal":            westernMedicineCostTotal,
+//			"chineseTraditionalMedicineCostTotal": chineseTraditionalMedicineCostTotal,
+//			"checkCostTotal":                      checkCostTotal,
+//			"zhenChaCostTotal":                    zhenChaCostTotal,
+//			"laboratoryCostTotal":                 laboratoryCostTotal,
+//			"treatCostTotal":                      treatCostTotal,
+//			"his_patient":                         his_patient,
+//			"hisDepatment":                        hisDepatment,
+//			"prescription":                        prescription,
+//			"schedule":                            schedule,
+//			"bedNumber":                           bedNumber,
+//		})
+//	} else {
+//		for _, item := range order_info {
+//
+//			item.FulamtOwnpayAmt = item.DetItemFeeSumamt
+//			if item.HisDoctorAdviceInfo.ID > 0 && item.HisPrescriptionProject.ID == 0 { //药品
+//				item.MedChrgitmType = "09"
+//			}
+//			if item.HisPrescriptionProject.ID > 0 && item.HisDoctorAdviceInfo.ID == 0 {
+//				if item.HisPrescriptionProject.Type == 2 {
+//					if this.GetAdminUserInfo().CurrentOrgId == 10215 {
+//						switch item.HisPrescriptionProject.VMHisProject.CostClassify {
+//						case 0:
+//							item.MedChrgitmType = "0"
+//							break
+//						case 1:
+//							item.MedChrgitmType = "14"
+//							break
+//						case 2:
+//							item.MedChrgitmType = "05"
+//
+//							break
+//						case 3:
+//							item.MedChrgitmType = "03"
+//
+//							break
+//						case 4:
+//							item.MedChrgitmType = "03"
+//
+//							break
+//						case 5:
+//							item.MedChrgitmType = "08"
+//
+//							break
+//						case 6:
+//							item.MedChrgitmType = "14"
+//
+//							break
+//						case 7:
+//							item.MedChrgitmType = "14"
+//
+//							break
+//						case 8:
+//							item.MedChrgitmType = "03"
+//							break
+//						case 9:
+//							item.MedChrgitmType = "14"
+//							break
+//						case 10:
+//							item.MedChrgitmType = "14"
+//							break
+//						case 11:
+//							item.MedChrgitmType = "06"
+//							break
+//						case 12:
+//							item.MedChrgitmType = "12"
+//							break
+//						case 13:
+//							item.MedChrgitmType = "01"
+//							break
+//						case 14:
+//							item.MedChrgitmType = "04"
+//							break
+//						case 15:
+//							item.MedChrgitmType = "14"
+//							break
+//
+//						}
+//
+//					} else {
+//						switch item.HisPrescriptionProject.VMHisProject.CostClassify {
+//
+//						case 1:
+//							item.MedChrgitmType = "14"
+//							break
+//						case 2:
+//							item.MedChrgitmType = "05"
+//
+//							break
+//						case 3:
+//							item.MedChrgitmType = "04"
+//
+//							break
+//						case 4:
+//							item.MedChrgitmType = "14"
+//
+//							break
+//						case 5:
+//							item.MedChrgitmType = "08"
+//
+//							break
+//						case 6:
+//							item.MedChrgitmType = "14"
+//
+//							break
+//						case 7:
+//							item.MedChrgitmType = "14"
+//
+//							break
+//						case 8:
+//							item.MedChrgitmType = "03"
+//							break
+//						case 9:
+//							item.MedChrgitmType = "14"
+//							break
+//						}
+//					}
+//				} else if item.HisPrescriptionProject.Type == 3 {
+//					item.MedChrgitmType = "08"
+//				}
+//			}
+//		}
+//
+//		for _, item := range order_info {
+//			if org_id == 10215 {
+//				if item.MedChrgitmType == "01" { //床位费
+//					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//				if item.MedChrgitmType == "02" { //诊察费
+//					zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "03" { //检查费
+//					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "04" { //化验费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+//					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "06" { //手术费
+//					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "08" { //材料费
+//					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "09" { //西药费
+//					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "11" { //中成费
+//					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
+//					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//			} else {
+//
+//				if item.MedChrgitmType == "01" { //床位费
+//					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "03" { //检查费
+//					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "04" { //化验费
+//					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+//					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "06" { //手术费
+//					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "08" { //材料费
+//					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "09" { //西药费
+//					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "11" { //中成费
+//					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//				if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
+//					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//
+//			}
+//
+//		}
+//
+//		this.ServeSuccessJSON(map[string]interface{}{
+//			"order":                               orderInfo,
+//			"order_info":                          order_info,
+//			"patient":                             patient,
+//			"admin_info":                          adminInfo,
+//			"his_hospital":                        record,
+//			"bedCostTotal":                        bedCostTotal,
+//			"operationCostTotal":                  operationCostTotal,
+//			"otherCostTotal":                      otherCostTotal,
+//			"materialCostTotal":                   materialCostTotal,
+//			"westernMedicineCostTotal":            westernMedicineCostTotal,
+//			"chineseTraditionalMedicineCostTotal": chineseTraditionalMedicineCostTotal,
+//			"checkCostTotal":                      checkCostTotal,
+//			"zhenChaCostTotal":                    zhenChaCostTotal,
+//			"laboratoryCostTotal":                 laboratoryCostTotal,
+//			"treatCostTotal":                      treatCostTotal,
+//			"his_patient":                         his_patient,
+//			"hisDepatment":                        hisDepatment,
+//			"prescription":                        prescription,
+//			"balanceAccountsType":                 BalanceAccountsType,
+//			"medicalInsuranceLevelList":           medicalInsuranceLevelList,
+//			"schedule":                            schedule,
+//			"bedNumber":                           bedNumber,
+//		})
+//
+//	}
+//}
+
+func (this *HisSummaryApiController) GetDetailPatients() {
+
+	keyword := this.GetString("keyword")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	patients, err := service.GetDetailPatients(keyword, orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"detailList": detailList,
-			"list":       list,
+			"patient": patients,
 		})
 		return
 	} else {

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/mobile_api_controllers/patient_api_controller.go

@@ -724,9 +724,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								prescribing_number_total = count
 							}
 
-							fmt.Println("开医嘱数量", prescribing_number_total)
-							fmt.Println("剩余库存", total)
-
 							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "3",
@@ -744,27 +741,55 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								return
 							}
 							if prescribing_number_total <= total {
-								if medical.IsUse == 2 {
-									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-									//查询默认仓库
-									houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-									//查询默认仓库剩余多少库存
-									list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-									var sum_count int64
-									var sum_in_count int64
-									for _, it := range list {
-										baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-										if it.MaxUnit == baseDrug.MaxUnit {
-											it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-											it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+
+								//查询是否出库按钮开启
+								adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+								if adviceSetting.IsAdviceOpen == 1 {
+									//查询是否出库按钮开启
+									prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+									if prescriptionConfig.IsOpen == 1 {
+										if medical.IsUse == 2 {
+											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+											//查询默认仓库
+											houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+											//查询默认仓库剩余多少库存
+											list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+											var sum_count int64
+											var sum_in_count int64
+											for _, it := range list {
+												baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+												if it.MaxUnit == baseDrug.MaxUnit {
+													it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+													it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+												}
+												sum_count += it.StockMaxNumber + it.StockMinNumber
+												sum_in_count += it.WarehousingCount
+											}
+											service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
 										}
-										sum_count += it.StockMaxNumber + it.StockMinNumber
-										sum_in_count += it.WarehousingCount
 									}
-									service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+								} else {
+									if medical.IsUse == 2 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+										//查询默认仓库
+										houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+										//查询默认仓库剩余多少库存
+										list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+										var sum_count int64
+										var sum_in_count int64
+										for _, it := range list {
+											baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+											if it.MaxUnit == baseDrug.MaxUnit {
+												it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+												it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+											}
+											sum_count += it.StockMaxNumber + it.StockMinNumber
+											sum_in_count += it.WarehousingCount
+										}
+										service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+									}
 								}
 							}
-
 						}
 					}
 				}

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)
@@ -1778,41 +1791,92 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					return
 				}
 				if prescribing_number_total <= total {
-					if medical.IsUse == 2 {
-						service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
-						//查询默认仓库
-						houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-						//查询默认仓库剩余多少库存
-						list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-						var sum_count int64
-						var sum_in_count int64
-						for _, it := range list {
-							baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-							if it.MaxUnit == baseDrug.MaxUnit {
-								it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-								it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+
+					//查询是否门诊处方和临时医嘱同步到透析医嘱的开关是否开启
+
+					adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+					if adviceSetting.IsAdviceOpen == 1 {
+
+						//查询是否出库按钮开启
+						prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+						if prescriptionConfig.IsOpen == 1 {
+							if medical.IsUse == 2 {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+								//查询默认仓库
+								houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+								//查询默认仓库剩余多少库存
+								list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								var sum_count int64
+								var sum_in_count int64
+								for _, it := range list {
+									baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+									if it.MaxUnit == baseDrug.MaxUnit {
+										it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+										it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+									}
+									sum_count += it.StockMaxNumber + it.StockMinNumber
+									sum_in_count += it.WarehousingCount
+								}
+								service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+								break
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+								})
+								return
+							}
+							if medical.IsUse == 1 {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+								})
+								return
+							}
+						} else {
+							if medical.IsUse == 1 {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+								})
+								return
 							}
-							sum_count += it.StockMaxNumber + it.StockMinNumber
-							sum_in_count += it.WarehousingCount
 						}
-						service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
-						break
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "1",
-							"advice": advice,
-						})
-						return
-					}
-					if medical.IsUse == 1 {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "1",
-							"advice": advice,
-						})
-						return
-					}
 
+					} else {
+						if medical.IsUse == 2 {
+							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+							//查询默认仓库
+							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+							//查询默认仓库剩余多少库存
+							list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+							var sum_count int64
+							var sum_in_count int64
+							for _, it := range list {
+								baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+								if it.MaxUnit == baseDrug.MaxUnit {
+									it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+									it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+								}
+								sum_count += it.StockMaxNumber + it.StockMinNumber
+								sum_in_count += it.WarehousingCount
+							}
+							service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+							break
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "1",
+								"advice": advice,
+							})
+							return
+						}
+						if medical.IsUse == 1 {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "1",
+								"advice": advice,
+							})
+							return
+						}
+					}
 				}
-
 			}
 		}
 
@@ -3073,11 +3137,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 +3166,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)

controllers/role_controller.go

@@ -1211,6 +1211,7 @@ func (this *RoleAPIController) EditAdmin() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserNotExist)
 		return
 	}
+	appRole.OrgId = this.GetAdminUserInfo().CurrentOrgId
 	appRole.Department = department
 	appRole.DepartmentId = department_id
 	appRole.UserName = name
@@ -1255,6 +1256,8 @@ func (this *RoleAPIController) EditAdmin() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 
 	} else {
+		//判断当前角色是否为机构管理员
+
 		this.ServeSuccessJSON(map[string]interface{}{
 			"approle": appRole,
 		})

controllers/stock_in_api_controller.go

@@ -1530,6 +1530,7 @@ func (c *StockManagerApiController) GetWarehouseOutList() {
 	types, _ := c.GetInt64("type", 0)
 	keywords := c.GetString("keywords")
 	storehouse_id, _ := c.GetInt64("storehouse_id")
+	way_type, _ := c.GetInt64("way_type")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -1571,7 +1572,7 @@ func (c *StockManagerApiController) GetWarehouseOutList() {
 		}
 
 	}
-	warehouseOutList, total, err := service.FindAllWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id)
+	warehouseOutList, total, err := service.FindAllWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id, way_type)
 	houselist, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
 	fmt.Println(err)
 	if err == nil {

models/device_models.go

@@ -1120,3 +1120,18 @@ func (PatientDialysisOrder) TableName() string {
 
 	return "xt_dialysis_order"
 }
+
+type ScheduleDeviceNumber struct {
+	ID      int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number  string `gorm:"column:number" json:"number" form:"number"`
+	GroupId int64  `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	ZoneId  int64  `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	Status  int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (ScheduleDeviceNumber) TableName() string {
+	return "xt_device_number"
+}

models/his_charge_models.go

@@ -1,15 +1,16 @@
 package models
 
 type HisChargePrescriptionProject struct {
-	ID         int64  `gorm:"column:id" json:"id" form:"id"`
-	ProjectId  int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status     int64  `gorm:"column:status" json:"status" form:"status"`
-	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	RecordDate int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Count      string `gorm:"column:count" json:"count" form:"count"`
-	Type       int64  `gorm:"column:type" json:"type" form:"type"`
-
+	ID                int64             `gorm:"column:id" json:"id" form:"id"`
+	ProjectId         int64             `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	UserOrgId         int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status            int64             `gorm:"column:status" json:"status" form:"status"`
+	PatientId         int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate        int64             `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Count             string            `gorm:"column:count" json:"count" form:"count"`
+	Type              int64             `gorm:"column:type" json:"type" form:"type"`
+	Unit              string            `gorm:"column:unit" json:"unit" form:"unit"`
+	Remark            string            `gorm:"column:remark" json:"remark" form:"remark"`
 	HisChargeProject  HisChargeProject  `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
 	HisChargeGoodInfo HisChargeGoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
 }
@@ -19,13 +20,16 @@ func (HisChargePrescriptionProject) TableName() string {
 }
 
 type HisChargeDoctorAdviceInfo struct {
-	ID         int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	AdviceName string `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
-	Status     int64  `gorm:"column:status" json:"status" form:"status"`
-	DrugId     int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Drug       Drug   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	ID                    int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceName            string `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	PrescribingNumberUnit string `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	Status                int64  `gorm:"column:status" json:"status" form:"status"`
+	DrugId                int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Remark                string `gorm:"column:remark" json:"remark" form:"remark"`
+	AdviceDate            int64  `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	Drug                  Drug   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 }
 
 func (HisChargeDoctorAdviceInfo) TableName() string {
@@ -92,6 +96,10 @@ type HisChargeOrder struct {
 	OrderStatus        int64                 `gorm:"column:order_status" json:"order_status" form:"order_status"`
 	MdtrtId            string                `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
 	PatientId          int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HifesPay           float64               `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	MafPay             float64               `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	FundPaySumamt      float64               `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	AcctPay            float64               `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
 	HisChargeOrderInfo []*HisChargeOrderInfo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
 }
 
@@ -160,9 +168,11 @@ func (HisChargeSettleOrder) TableName() string {
 }
 
 type HisChargeProject struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	ProjectName string `gorm:"column:project_name" json:"project_name" form:"project_name"`
-	Unit        string `gorm:"column:unit" json:"unit" form:"unit"`
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	ProjectName     string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Unit            string `gorm:"column:unit" json:"unit" form:"unit"`
+	MedicalCoverage int64  `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
+	CostClassify    int64  `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
 }
 
 func (HisChargeProject) TableName() string {
@@ -170,11 +180,13 @@ func (HisChargeProject) TableName() string {
 }
 
 type HisChargeGoodInfo struct {
-	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
-	GoodName           string `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	GoodUnit           int64  `gorm:"column:good_unit" json:"good_unit"`
-	SpecificationnName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	RegisterNumber     string `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	ID                    int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodName              string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodUnit              int64  `gorm:"column:good_unit" json:"good_unit"`
+	SpecificationnName    string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	RegisterNumber        string `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	PackingUnit           string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	MedicalInsuranceLevel int64  `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
 }
 
 func (HisChargeGoodInfo) TableName() 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显示
 }
 
 //扣费汇总

models/his_summary_models.go

@@ -1,5 +1,7 @@
 package models
 
+import "time"
+
 type HisPrescriptionModeTemplate struct {
 	ID        int64  `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
@@ -132,3 +134,247 @@ type HisPrescriptionProjectModeTemplate struct {
 func (HisPrescriptionProjectModeTemplate) TableName() string {
 	return "his_prescription_project_mode_template"
 }
+
+type VmHisOrderInfo struct {
+	ID                     int64                       `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber            string                      `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate             int64                       `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId               int64                       `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt       float64                     `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt                    float64                     `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric                   float64                     `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId              int64                       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PricUplmtAmt           float64                     `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	SelfpayProp            float64                     `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	FulamtOwnpayAmt        float64                     `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt             float64                     `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt          float64                     `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	BasMednFlag            string                      `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
+	MedChrgitmType         string                      `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	HiNegoDrugFlag         string                      `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
+	Status                 int64                       `gorm:"column:status" json:"status" form:"status"`
+	Memo                   string                      `gorm:"column:memo" json:"memo" form:"memo"`
+	FeedetlSn              string                      `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Mtime                  int64                       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	InscpScpAmt            float64                     `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	DrtReimFlag            string                      `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
+	Ctime                  int64                       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ListSpItemFlag         string                      `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
+	ChldMedcFlag           string                      `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	LmtUsedFlag            string                      `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ChrgitmLv              string                      `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId              int64                       `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId           int64                       `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	OrderId                int64                       `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ProjectId              int64                       `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type                   int64                       `gorm:"column:type" json:"type" form:"type"`
+	ItemId                 int64                       `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	SettleType             int64                       `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	HisPrescriptionProject []*VmHisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"vmproject"`
+	HisDoctorAdviceInfo    []*VmHisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"vmadvice"`
+}
+
+func (VmHisOrderInfo) TableName() string {
+	return "his_order_info"
+}
+
+type VmHisPrescriptionProject struct {
+	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64 `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              string  `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string  `gorm:"column:day" json:"day" form:"day"`
+	Remark             string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string  `gorm:"column:unit" json:"unit" form:"unit"`
+	Type               int64   `gorm:"column:type" json:"type" form:"type"`
+	Doctor             int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime      int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff     int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState     int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime          int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState         int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker            int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime          int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId             int64   `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	FrequencyType      int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount           int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay            string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+}
+
+func (VmHisPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}
+
+type VmHisDoctorAdviceInfo struct {
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId          int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64   `gorm:"column:day" json:"day" form:"day"`
+	Diagnosis             int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Way                   int64   `gorm:"column:way" json:"way" form:"way"`
+	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	AdviceId              int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+}
+
+func (VmHisDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}
+
+type GatherHisOrder struct {
+	ID                      int64     `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId               int64     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId            int64     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate      int64     `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime                   int64     `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64     `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                  int64     `gorm:"column:status" json:"status" form:"status"`
+	Number                  string    `gorm:"column:number" json:"number" form:"number"`
+	PatientId               int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode                 int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg                 string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo                  string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg                  string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime             string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid             string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus             int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId                 string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId                  string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo                   string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName                 string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType             string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                  string    `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                    string    `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                    string    `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                    time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                     float64   `gorm:"column:age" json:"age" form:"age"`
+	Insutype                string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType                 string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag             string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime                string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType           string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType                 string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt            float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt         float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay          float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt           float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt             float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc              float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay                 float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay              float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay         float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay                float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay                float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay                float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                  float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                  float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt           float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt              float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay                 float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay              float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt             float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                    float64   `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay           float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId            string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins               string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                  string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType                 string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail              string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	PayWay                  int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice                float64   `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo               string    `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice           float64   `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice       float64   `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice            float64   `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice              float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice   float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice            float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	IsMedicineInsurance     int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	SettleType              int64     `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime         int64     `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime           int64     `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+	Creator                 int64     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                  int64     `gorm:"column:modify" json:"modify" form:"modify"`
+	SzChargeInfo            string    `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
+	SzProjectInfo           string    `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
+	SzMedicineInsuranceInfo string    `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
+	AccountPrice            float64   `gorm:"column:account_price" json:"account_price" form:"account_price"`
+	MzNumber                string    `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	OrgSetlNumber           string    `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
+	YiliaoNumber            string    `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
+	RefundLog               string    `gorm:"column:refund_log" json:"refund_log" form:"refund_log"`
+	DetailLog               string    `gorm:"column:detail_log" json:"detail_log" form:"detail_log"`
+	RequestLog              string    `gorm:"column:request_log" json:"request_log" form:"request_log"`
+	RefundRequestLog        string    `gorm:"column:refund_request_log" json:"refund_request_log" form:"refund_request_log"`
+	FaPiaoCode              string    `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber            string    `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	PType                   int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	IsPre                   int64     `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis               string    `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	FaPiaoBatchnumberId     int64     `gorm:"column:fa_piao_batchnumber_id" json:"fa_piao_batchnumber_id" form:"fa_piao_batchnumber_id"`
+	Decimal                 float64   `gorm:"column:decimal" json:"decimal" form:"decimal"`
+}
+
+func (GatherHisOrder) TableName() string {
+	return "his_order"
+}

models/stock_models.go

@@ -1358,3 +1358,16 @@ type XtAdviceSetting struct {
 func (XtAdviceSetting) TableName() string {
 	return "xt_advice_setting"
 }
+
+type XtPrescriptionConfig struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtPrescriptionConfig) TableName() string {
+	return "xt_prescription_config"
+}

service/device_service.go

@@ -761,3 +761,9 @@ func GetPatientIdOne(patient_id int64, orgId int64) (models.XtPatientsNew, error
 
 	}
 }
+
+func GetAllBedNumberSix(orgId int64) (devicenumber []*models.ScheduleDeviceNumber, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgId).Find(&devicenumber).Error
+	return devicenumber, err
+}

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

@@ -1251,6 +1251,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
@@ -1728,24 +1732,23 @@ func (HisPrescriptionProject) TableName() string {
 }
 
 type HisOrderInfo struct {
-	ID               int64   `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
-	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
-	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
-	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
-	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
-	Status           int64   `gorm:"column:status" json:"status" form:"status"`
-	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
-	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
-	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
-	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
-
+	ID                     int64                  `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber            string                 `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate             int64                  `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId               int64                  `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt       float64                `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt                    float64                `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric                   float64                `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId              int64                  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MedChrgitmType         string                 `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	Status                 int64                  `gorm:"column:status" json:"status" form:"status"`
+	FeedetlSn              string                 `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	ChldMedcFlag           string                 `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	ChrgitmLv              string                 `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId              int64                  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId              int64                  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId                 int64                  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	FulamtOwnpayAmt        float64                `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
 	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
 }

service/his_summary_service.go

@@ -8,147 +8,21 @@ import (
 
 func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (patients []*models.ChargePatient, err error) {
 
-	if len(keyword) == 0 {
-		switch item_type {
-		case 0:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
-							Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Preload("Drug", "status = 1").Where("status = 1")
-							}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
-
-			break
-		case 1:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
-
-			break
-		case 2:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and order.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
-
-			break
-		case 3:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? and p.id =?", org_id, patient_id).Group("id").Find(&patients).Error
-
-			break
-
-		}
-
-	} else {
-		keyword := "%" + keyword + "%"
-		switch item_type {
-		case 0:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
-
-			break
-		case 1:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and AND orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
-
-			break
-		case 2:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and  orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,project_name,unit").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
-
-			break
-		case 3:
-			err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
-					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
-						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-							return db.Preload("Drug", "status = 1").Where("status = 1")
-						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
-							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
-								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
-							}).Where("status = 1 ")
-						})
-					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
-			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
-
-			break
-
-		}
-
-	}
+	err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
+			Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
+					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Preload("Drug", "status = 1").Where("status = 1 ")
+					}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type,unit,remark").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,project_name,unit,medical_coverage,cost_classify").Where("status = 1 ")
+					}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
+						return db.Select("id,good_name,good_unit,specification_name,packing_unit,medical_insurance_level").Where("status = 1 ")
+					}).Where("status = 1 ")
+				})
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+	}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
 
 	return
 
@@ -264,12 +138,12 @@ func DelelteHisPrescriptionInfoModeTemplate(id int64, user_org_id int64) (err er
 	return
 }
 
-func GetAdviceGatherDetaiList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (orderInfo []*models.HisOrderInfo, err error) {
+func GetAdviceGatherDetaiList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (orderInfo []*models.VmHisOrderInfo, err error) {
 
 	db := XTReadDB().Model(&orderInfo).Where("status = 1")
 
 	if org_id > 0 {
-		db = db.Where("user_org_id = ?", org_id)
+		db = db.Where("user_org_id = ? and advice_id > 0", org_id)
 	}
 	if start_time > 0 {
 		db = db.Where("ctime >=?", start_time)
@@ -277,15 +151,15 @@ func GetAdviceGatherDetaiList(keyword string, item_type int64, patient_id int64,
 	if end_time > 0 {
 		db = db.Where("ctime <=?", end_time)
 	}
-	err = db.Group("advice_id").Find(&orderInfo).Error
+	err = db.Preload("VmHisDoctorAdviceInfo", "patient_id = ? and advice_date>=? and advice_date<=?", patient_id, start_time, end_time).Group("advice_id").Scan(&orderInfo).Error
 	return orderInfo, err
 }
 
-func GetProjectGatherDetailList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (orderInfo []*models.HisOrderInfo, err error) {
+func GetProjectGatherDetailList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (orderInfo []*models.VmHisOrderInfo, err error) {
 	db := XTReadDB().Model(&orderInfo).Where("status = 1")
 
 	if org_id > 0 {
-		db = db.Where("user_org_id = ?", org_id)
+		db = db.Where("user_org_id = ? and project_id > 0", org_id)
 	}
 	if start_time > 0 {
 		db = db.Where("ctime >=?", start_time)
@@ -293,6 +167,165 @@ func GetProjectGatherDetailList(keyword string, item_type int64, patient_id int6
 	if end_time > 0 {
 		db = db.Where("ctime <=?", end_time)
 	}
-	err = db.Group("project_id").Find(&orderInfo).Error
+	err = db.Group("project_id").Preload("HisPrescriptionProject", "patient_id = ? and record_date>=? and record_date<=?", patient_id, start_time, end_time).Find(&orderInfo).Error
 	return orderInfo, err
 }
+
+func GetGatherHisOrder(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (order []*models.GatherHisOrder, err error) {
+
+	db := XTReadDB().Model(&order).Where("status = 1")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("settle_accounts_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("settle_accounts_date<=?", end_time)
+	}
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if len(keyword) > 0 {
+
+	}
+
+	err = db.Find(&order).Error
+
+	return order, err
+}
+
+func GetGatherHisOrderTwo(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (models.GatherHisOrder, error) {
+
+	hisOrder := models.GatherHisOrder{}
+	db := XTReadDB().Model(&hisOrder).Where("status = 1")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("settle_accounts_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("settle_accounts_date<=?", end_time)
+	}
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if len(keyword) > 0 {
+
+	}
+
+	err = db.Last(&hisOrder).Error
+
+	return hisOrder, err
+}
+
+func GetHisSummaryPatientInfo(org_id int64, patient_id int64, start_time int64, end_time int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date >= ? AND  record_date <= ? AND patient_id = ?", org_id, start_time, end_time, patient_id).Last(&info).Error
+	return
+}
+
+func GetHisSummaryPatientInfoSix(org_id int64, patient_id int64, start_time int64, end_time int64) (info models.HisHospitalCheckRecord, err error) {
+	err = readDb.Model(&models.HisHospitalCheckRecord{}).Where("user_org_id = ? AND status = 1 AND record_date >= ? AND  record_date <= ? AND patient_id = ?", org_id, start_time, end_time, patient_id).Last(&info).Error
+	return
+}
+
+func GetDetailPatients(keywords string, org_id int64) (patients []*models.ChargePatientTwo, err error) {
+	if len(keywords) == 0 {
+		err = readDb.Model(&models.ChargePatientTwo{}).Where("user_org_id = ? AND status = 1", org_id).Find(&patients).Error
+	}
+
+	if len(keywords) > 0 {
+		keyword := "%" + keywords + "%"
+		err = readDb.Model(&models.ChargePatientTwo{}).Where("user_org_id = ? AND status = 1 and name like ?", org_id, keyword).Find(&patients).Error
+	}
+
+	return
+}
+
+func GetHisDepatment(user_org_id int64) (hisdepartment []*models.XtHisDepartment, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&hisdepartment).Error
+	return hisdepartment, err
+}
+
+func GetHisPatientInfoFive(org_id int64, patient_id int64, startime int64, endtime int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 and patient_id = ? AND record_date >= ? and record_date <=?", org_id, patient_id, startime, endtime).Last(&info).Error
+	return
+}
+
+func GetHisPrescriptionTenty(org_id int64, patient_id int64, start_time int64, end_time int64, keyword string, item_type int64) (prescription []*models.HisPrescription, err error) {
+
+	db := readDb.Model(&models.HisPrescription{}).Where("status = 1")
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("record_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("record_date <=?", end_time)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if len(keyword) > 0 {
+		err = db.Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+		}).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).Find(&prescription).Error
+	} else {
+		err = db.Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+		}).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).
+			Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).Find(&prescription).Error
+	}
+
+	return
+}
+
+func GetHisLastOrder(org_id int64, patient_id int64, start_time int64, end_time int64) (models.HisOrder, error) {
+
+	order := models.HisOrder{}
+
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and ctime>=? and ctime<=? and fa_piao_number<> ''", org_id, patient_id, start_time, end_time).Last(&order).Error
+	return order, err
+}
+
+func GetHisSchedule(patient_id int64, org_id int64, start_time int64, end_time int64) (schedule []*models.XtSchedule, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and schedule_date >=? and schedule_date<=? and status = 1", patient_id, org_id, start_time, end_time).Find(&schedule).Error
+	return schedule, err
+}
+
+func GetHisChargeOrder(org_id int64, patient_id int64, start_time int64, end_time int64, keyword string, item_type int64) (order []*models.HisChargeOrder, err error) {
+
+	db := XTReadDB().Model(&order).Where("status = 1")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("settle_accounts_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("settle_accounts_date<=?", end_time)
+	}
+	err = db.Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("HisChargePrescriptionProject", "status=1").Preload("HisChargeDoctorAdviceInfo", "status=1")
+	}).Error
+	return order, err
+}

service/role_service.go

@@ -279,6 +279,21 @@ func SaveAppRole(appRole *models.App_Role) error {
 		tx.Rollback()
 		return err
 	}
+	var tmp models.Org
+	//根据机构id查询管理员id
+	tx.Model(&models.Org{}).Where("status = 1 and id = ?", appRole.OrgId).Find(&tmp)
+	//如果相等则修改管理员的姓名
+	if tmp.Creator == appRole.AdminUserId {
+		err = tx.Model(&models.AdminUser{}).Where("id = ?", appRole.AdminUserId).Updates(map[string]interface{}{
+			"mtime": time.Now().Unix(),
+			"name":  appRole.UserName,
+		}).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+
 	return tx.Commit().Error
 }
 
@@ -593,6 +608,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 +622,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 {

service/stock_service.go

@@ -1530,7 +1530,7 @@ func FindAllWarehouseOutList(orgId int64, page int64, limit int64, startTime int
 
 }
 
-func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64) (list []*models.WarehouseOut, total int64, err error) {
+func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, way_type int64) (list []*models.WarehouseOut, total int64, err error) {
 	db := readDb.Model(&models.WarehouseOut{})
 	db = db.Where("xt_warehouse_out.org_id = ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.type = ?", orgId, types)
 
@@ -1549,6 +1549,18 @@ func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime
 	if storehouse_id > 0 {
 		db = db.Where("xt_warehouse_out.storehouse_id = ?", storehouse_id)
 	}
+	if way_type == 0 {
+		db = db.Where("xt_warehouse_out.is_sys = 0 || xt_warehouse_out.is_sys = 1 || xt_warehouse_out.is_sys = 12")
+	}
+	if way_type == 1 {
+		db = db.Where("xt_warehouse_out.is_sys = 0")
+	}
+	if way_type == 2 {
+		db = db.Where("xt_warehouse_out.is_sys = 1")
+	}
+	if way_type == 3 {
+		db = db.Where("xt_warehouse_out.is_sys = 12")
+	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	if orgId == 10191 {
@@ -1586,7 +1598,7 @@ func FindAllDrugWarehouseOutList(orgId int64, page int64, limit int64, startTime
 
 }
 
-func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64) (list []*models.DrugWarehouseOut, total int64, err error) {
+func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, way_type int64) (list []*models.DrugWarehouseOut, total int64, err error) {
 	db := readDb.Model(&models.DrugWarehouseOut{})
 	db = db.Where("xt_drug_warehouse_out.org_id = ? AND xt_drug_warehouse_out.status = 1 ", orgId)
 
@@ -1606,6 +1618,19 @@ func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startT
 	if storehouse_id > 0 {
 		db = db.Where("xt_drug_warehouse_out.storehouse_id = ?", storehouse_id)
 	}
+
+	if way_type == 0 {
+		db = db.Where("xt_drug_warehouse_out.is_sys = 0 || xt_drug_warehouse_out.is_sys = 1 || xt_drug_warehouse_out.is_sys = 12")
+	}
+	if way_type == 1 {
+		db = db.Where("xt_drug_warehouse_out.is_sys = 0")
+	}
+	if way_type == 2 {
+		db = db.Where("xt_drug_warehouse_out.is_sys = 1")
+	}
+	if way_type == 3 {
+		db = db.Where("xt_drug_warehouse_out.is_sys = 12")
+	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	if orgId == 10191 {
@@ -6513,3 +6538,35 @@ func FindAdviceSettingById(orgid int64) (models.XtAdviceSetting, error) {
 	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&setting).Error
 	return setting, err
 }
+
+func GetPrescriptionConfig(orgid int64) (*models.XtPrescriptionConfig, error) {
+
+	config := models.XtPrescriptionConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &config, nil
+}
+
+func CreatePrescriptionConfig(prescriptionConfig models.XtPrescriptionConfig) error {
+
+	err := XTWriteDB().Create(&prescriptionConfig).Error
+	return err
+}
+
+func UpdatePrescriptionConfig(orgid int64, config models.XtPrescriptionConfig) error {
+
+	err := XTWriteDB().Model(&config).Where("user_org_id = ? and status = 1", orgid).Update(map[string]interface{}{"is_open": config.IsOpen, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func FindPrescriptionConfigById(orgid int64) (models.XtPrescriptionConfig, error) {
+	config := models.XtPrescriptionConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+
+	return config, err
+}

service/warhouse_service.go

@@ -4325,7 +4325,8 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
-
+		fmt.Println("maxNumber2323232233232332332323232323233232", maxNumber)
+		fmt.Println("minNumber3223233232323233232332322332", minNumber)
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
@@ -4353,7 +4354,11 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 		} else {
 			if minNumber > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				} else {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
 			}
 
 			if minNumber == 0 && maxNumber != 1 {