历史排班

controllers/base_api_controller.go

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id 10344
+		subscibe.OrgId = 10510 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,8 +92,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 10510 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 11211 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id小英10344或4
+		subscibe.OrgId = 10510 //机构id小英10344或4或10666
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,8 +337,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 10510 //机构id小英10344或4或10666
+		adminUserInfo.CurrentAppId = 11211 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -542,7 +542,7 @@ func (c *DialysisApiController) PostPrescription() {
 			}
 
 			if schedulePatient.ScheduleType == 2 {
-				advice.StartTime = recordDate.Unix() + 11*60*60
+				advice.StartTime = recordDate.Unix() + 9*60*60
 			}
 		}
 		// 抗凝剂名称
@@ -1523,7 +1523,7 @@ func (c *DialysisApiController) PostSoulution() {
 			}
 
 			if schedulePatient.ScheduleType == 2 {
-				advice.StartTime = recordDate.Unix() + 11*60*60
+				advice.StartTime = recordDate.Unix() + 9*60*60
 			}
 		}
 		// 抗凝剂名称

controllers/his_api_controller.go

@@ -3301,8 +3301,6 @@ func (c *HisApiController) CreateHisPrescription() {
 						advices := items["advices"].([]interface{})
 						//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
 						groupNo := int64(0)
-						ctime := time.Now().Unix()
-						mtime := ctime
 						if len(advices) > 0 {
 							for _, advice := range advices {
 								tx := db.Begin()
@@ -3326,8 +3324,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								s.RecordDate = theTime3.Unix()
 								s.StartTime = tempPrescription.PreTime
 								s.Groupno = groupNo
-								s.CreatedTime = ctime
-								s.UpdatedTime = mtime
+
 								s.PatientId = patient_id
 								s.HisPatientId = his_patient_id
 								s.StartTime = pTime
@@ -3380,127 +3377,181 @@ func (c *HisApiController) CreateHisPrescription() {
 									// 查询该药品最后一次出库记录
 									druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(s.DrugId, patient_id, recordDateTime, s.ID)
 
+									var is_user_total int64
+									var no_user_total int64
+
+									//fmt.Println("s-------------------------------------------", s.PrescribingNumber)
+									//fmt.Println("s.PrescribingNumberUnit------------------", s.PrescribingNumberUnit)
+									//fmt.Println("drug.MaxUnit", drug.MaxUnit)
+									//fmt.Println("drug.MinUnit", drug.MinUnit)
+
+									if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+										prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+										prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+
+										no_user_total += prescribingNumberSevenTy * drug.MinNumber
+									}
+
+									if s.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+										prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+										prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+										no_user_total += prescribingNumberSevenTy
+									}
+
+									if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+
+										prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+										prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+										no_user_total += prescribingNumberSevenTy
+									}
 									if len(druginfo) > 0 {
-										//回退库存
 										for _, it := range druginfo {
 											if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-
-												service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
-
+												it.Count = it.Count * drug.MinNumber
+												is_user_total += it.Count
 											}
-											if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-
-												service.ModifyDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
 
+											if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+												is_user_total += it.Count
 											}
-											if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
 
-												service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+											if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+												is_user_total += it.Count
 
 											}
 										}
 
-										//删除记录
-										service.DeleteNewDrugAutoWarehouseSeven(s.DrugId, patient_id, recordDateTime, s.ID)
-
 									}
 
-									service.CreateHisDoctorAdviceOne(&s, tx)
-
-									advicelast, _ := service.GetLastHisAdvicesList(s.PatientId, s.AdviceDate, s.UserOrgId, tx)
-
-									//出库
-									if drug.IsUse == 2 {
-										creater := adminInfo.AdminUser.Id
-										newadviceInfo := &models.HisDoctorAdviceInfo{
-											ID:                    advicelast.ID,
-											UserOrgId:             s.UserOrgId,
-											PatientId:             s.PatientId,
-											HisPatientId:          s.HisPatientId,
-											AdviceType:            s.AdviceType,
-											AdviceDate:            s.AdviceDate,
-											StartTime:             s.StartTime,
-											AdviceName:            s.AdviceName,
-											AdviceDesc:            s.AdviceDesc,
-											ReminderDate:          s.ReminderDate,
-											SingleDose:            s.SingleDose,
-											SingleDoseUnit:        s.SingleDoseUnit,
-											PrescribingNumber:     s.PrescribingNumber,
-											PrescribingNumberUnit: s.PrescribingNumberUnit,
-											DeliveryWay:           s.DeliveryWay,
-											ExecutionFrequency:    s.ExecutionFrequency,
-											AdviceDoctor:          s.AdviceDoctor,
-											Status:                s.Status,
-											CreatedTime:           s.CreatedTime,
-											UpdatedTime:           s.UpdatedTime,
-											AdviceAffirm:          s.AdviceAffirm,
-											Remark:                s.Remark,
-											StopTime:              s.StopTime,
-											StopReason:            s.StopReason,
-											StopDoctor:            s.StopDoctor,
-											StopState:             s.StopState,
-											ParentId:              s.ParentId,
-											ExecutionTime:         s.ExecutionTime,
-											ExecutionStaff:        s.ExecutionStaff,
-											ExecutionState:        s.ExecutionState,
-											Checker:               s.Checker,
-											RecordDate:            s.RecordDate,
-											DialysisOrderId:       s.DialysisOrderId,
-											CheckTime:             s.CheckTime,
-											CheckState:            s.CheckState,
-											DrugSpec:              s.DrugSpec,
-											DrugSpecUnit:          s.DrugSpecUnit,
-											Groupno:               s.Groupno,
-											RemindType:            s.RemindType,
-											FrequencyType:         s.FrequencyType,
-											DayCount:              s.DayCount,
-											WeekDay:               s.WeekDay,
-											TemplateId:            s.TemplateId,
-											Modifier:              s.Modifier,
-											DrugId:                s.DrugId,
-											Price:                 s.Price,
-											PrescriptionId:        s.PrescriptionId,
-											MedListCodg:           s.MedListCodg,
-											FeedetlSn:             s.FeedetlSn,
-											Day:                   s.DayCount,
-											ChildDoctorAdvice:     nil,
-											Drug:                  models.Drug{},
-											Diagnosis:             s.Diagnosis,
-											Way:                   s.Way,
-											HospApprFlag:          s.HospApprFlag,
-											LmtUsedFlag:           s.LmtUsedFlag,
-											HisOrderInfo:          models.HisOrderInfo{},
-											IsMedicine:            s.IsMedicine,
-											ExecutionFrequencyId:  s.ExecutionFrequencyId,
-											Child:                 nil,
-											IsSettle:              s.IsSettle,
-											IsMobile:              s.IsMobile,
-											IsSelfDrug:            s.IsSelfDrug,
-											DrugWayCount:          s.DrugWayCount,
+									//fmt.Println("is_user_total-----------------------------", is_user_total)
+									//fmt.Println("no_user_total-----------------------------", no_user_total)
+
+									if is_user_total != no_user_total {
+
+										if len(druginfo) > 0 {
+											//回退库存
+											for _, it := range druginfo {
+												if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+													service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+
+												}
+												if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+													service.ModifyDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+
+												}
+												if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+
+													service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+
+												}
+											}
+
+											//删除记录
+											service.DeleteNewDrugAutoWarehouseSeven(s.DrugId, patient_id, recordDateTime, s.ID)
+
 										}
 
-										service.NewHisDrugsDelivery(s.UserOrgId, creater, newadviceInfo, tx)
+										service.CreateHisDoctorAdviceOne(&s, tx)
+
+										advicelast, _ := service.GetLastHisAdvicesList(s.PatientId, s.AdviceDate, s.UserOrgId, tx)
+
+										//出库
+										if drug.IsUse == 2 {
+											creater := adminInfo.AdminUser.Id
+											newadviceInfo := &models.HisDoctorAdviceInfo{
+												ID:                    advicelast.ID,
+												UserOrgId:             s.UserOrgId,
+												PatientId:             s.PatientId,
+												HisPatientId:          s.HisPatientId,
+												AdviceType:            s.AdviceType,
+												AdviceDate:            s.AdviceDate,
+												StartTime:             s.StartTime,
+												AdviceName:            s.AdviceName,
+												AdviceDesc:            s.AdviceDesc,
+												ReminderDate:          s.ReminderDate,
+												SingleDose:            s.SingleDose,
+												SingleDoseUnit:        s.SingleDoseUnit,
+												PrescribingNumber:     s.PrescribingNumber,
+												PrescribingNumberUnit: s.PrescribingNumberUnit,
+												DeliveryWay:           s.DeliveryWay,
+												ExecutionFrequency:    s.ExecutionFrequency,
+												AdviceDoctor:          s.AdviceDoctor,
+												Status:                s.Status,
+												CreatedTime:           s.CreatedTime,
+												UpdatedTime:           s.UpdatedTime,
+												AdviceAffirm:          s.AdviceAffirm,
+												Remark:                s.Remark,
+												StopTime:              s.StopTime,
+												StopReason:            s.StopReason,
+												StopDoctor:            s.StopDoctor,
+												StopState:             s.StopState,
+												ParentId:              s.ParentId,
+												ExecutionTime:         s.ExecutionTime,
+												ExecutionStaff:        s.ExecutionStaff,
+												ExecutionState:        s.ExecutionState,
+												Checker:               s.Checker,
+												RecordDate:            s.RecordDate,
+												DialysisOrderId:       s.DialysisOrderId,
+												CheckTime:             s.CheckTime,
+												CheckState:            s.CheckState,
+												DrugSpec:              s.DrugSpec,
+												DrugSpecUnit:          s.DrugSpecUnit,
+												Groupno:               s.Groupno,
+												RemindType:            s.RemindType,
+												FrequencyType:         s.FrequencyType,
+												DayCount:              s.DayCount,
+												WeekDay:               s.WeekDay,
+												TemplateId:            s.TemplateId,
+												Modifier:              s.Modifier,
+												DrugId:                s.DrugId,
+												Price:                 s.Price,
+												PrescriptionId:        s.PrescriptionId,
+												MedListCodg:           s.MedListCodg,
+												FeedetlSn:             s.FeedetlSn,
+												Day:                   s.DayCount,
+												ChildDoctorAdvice:     nil,
+												Drug:                  models.Drug{},
+												Diagnosis:             s.Diagnosis,
+												Way:                   s.Way,
+												HospApprFlag:          s.HospApprFlag,
+												LmtUsedFlag:           s.LmtUsedFlag,
+												HisOrderInfo:          models.HisOrderInfo{},
+												IsMedicine:            s.IsMedicine,
+												ExecutionFrequencyId:  s.ExecutionFrequencyId,
+												Child:                 nil,
+												IsSettle:              s.IsSettle,
+												IsMobile:              s.IsMobile,
+												IsSelfDrug:            s.IsSelfDrug,
+												DrugWayCount:          s.DrugWayCount,
+											}
 
-									}
+											service.NewHisDrugsDelivery(s.UserOrgId, creater, newadviceInfo, tx)
 
-									//更新字典里面的库存
-									stockInfo, _ := service.GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, s.UserOrgId, s.DrugId, tx)
-									var sum_count int64
-									for _, its := range stockInfo {
-										baseDrug, _ := service.GetNewBaseDrugMedical(its.DrugId, tx)
-										if its.MaxUnit == baseDrug.MaxUnit {
-											its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
 										}
-										sum_count += its.StockMaxNumber + its.StockMinNumber
-									}
-									//更新基础库存
-									service.UpdateNewBaseDrugSumTwo(s.DrugId, sum_count, s.UserOrgId, tx)
-									//剩余库存
-									service.UpdateNewDrugStockCount(s.DrugId, s.UserOrgId, storeConfig.DrugStorehouseOut, sum_count, tx)
 
-									over, _ := service.FindNewOverCount(s.DrugId, s.UserOrgId, storeConfig.DrugStorehouseOut, tx)
-									service.UpdateNewActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount, tx)
+										//更新字典里面的库存
+										stockInfo, _ := service.GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, s.UserOrgId, s.DrugId, tx)
+										var sum_count int64
+										for _, its := range stockInfo {
+											baseDrug, _ := service.GetNewBaseDrugMedical(its.DrugId, tx)
+											if its.MaxUnit == baseDrug.MaxUnit {
+												its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+											}
+											sum_count += its.StockMaxNumber + its.StockMinNumber
+										}
+										//更新基础库存
+										service.UpdateNewBaseDrugSumTwo(s.DrugId, sum_count, s.UserOrgId, tx)
+										//剩余库存
+										service.UpdateNewDrugStockCount(s.DrugId, s.UserOrgId, storeConfig.DrugStorehouseOut, sum_count, tx)
+
+										over, _ := service.FindNewOverCount(s.DrugId, s.UserOrgId, storeConfig.DrugStorehouseOut, tx)
+										service.UpdateNewActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount, tx)
 
+									}
 								}
 
 								//记录日志
@@ -3612,8 +3663,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								var p models.HisPrescriptionProject
 								p.PrescriptionId = tempPrescription.ID
-								p.Ctime = time.Now().Unix()
-								p.Mtime = time.Now().Unix()
+
 								p.PatientId = patient_id
 								p.RecordDate = theTime3.Unix()
 								p.Doctor = doctor_id
@@ -4103,8 +4153,6 @@ func (c *HisApiController) CreateHisPrescription() {
 						advices := items["advices"].([]interface{})
 						//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
 						groupNo := int64(0)
-						ctime := time.Now().Unix()
-						mtime := ctime
 						if len(advices) > 0 {
 							for _, advice := range advices {
 								var s models.HisDoctorAdviceInfo
@@ -4119,8 +4167,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								s.RecordDate = theTime3.Unix()
 								s.StartTime = tempPrescription.PreTime
 								s.Groupno = groupNo
-								s.CreatedTime = ctime
-								s.UpdatedTime = mtime
+
 								s.PatientId = patient_id
 								s.HisPatientId = his_patient_id
 								s.StartTime = pTime
@@ -4214,8 +4261,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								var p models.HisPrescriptionProject
 								p.PrescriptionId = tempPrescription.ID
-								p.Ctime = time.Now().Unix()
-								p.Mtime = time.Now().Unix()
+
 								p.PatientId = patient_id
 								p.RecordDate = theTime3.Unix()
 								p.Doctor = doctor_id
@@ -6918,6 +6964,7 @@ func SetAdviceWithJSON(advice *models.HisDoctorAdviceInfo, json map[string]inter
 							advice.CheckTime = 0
 							advice.Checker = 0
 							advice.CheckState = 2
+							advice.UpdatedTime = time.Now().Unix()
 						}
 					}
 
@@ -7306,7 +7353,6 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 			hisAdvice, err := service.GetHisDoctorAdvicesById(advice.ID)
 			if err == nil {
 				if hisAdvice.ID > 0 {
-
 					advice.ExecutionTime = hisAdvice.ExecutionTime
 					advice.ExecutionStaff = hisAdvice.ExecutionStaff
 					advice.ExecutionState = hisAdvice.ExecutionState
@@ -7333,13 +7379,28 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 							advice.CheckTime = 0
 							advice.Checker = 0
 							advice.CheckState = 2
+							//advice.UpdatedTime = time.Now().Unix()
+							advice.CreatedTime = hisAdvice.CreatedTime
+							advice.UpdatedTime = time.Now().Unix()
+						} else {
+							advice.CreatedTime = hisAdvice.CreatedTime
+							advice.UpdatedTime = hisAdvice.UpdatedTime
+
 						}
 					}
-
 					//advice.Groupno = hisAdvice.Groupno
+				} else {
+					ctime := time.Now().Unix()
+					advice.CreatedTime = ctime
+					advice.UpdatedTime = ctime
 
 				}
 			}
+		} else {
+			ctime := time.Now().Unix()
+			advice.CreatedTime = ctime
+			advice.UpdatedTime = ctime
+
 		}
 	}
 
@@ -7484,6 +7545,7 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		project.CheckState = temp_project.CheckState
 		project.CheckTime = temp_project.CheckTime
 		project.TeamId = temp_project.TeamId
+
 	}
 	if json["type"] != nil || reflect.TypeOf(json["type"]).String() == "float64" {
 		types := int64(json["type"].(float64))
@@ -7599,7 +7661,26 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 	//	}
 	//
 	//}
+	if json["id"] != nil || reflect.TypeOf(json["id"]).String() == "float64" {
+		id := int64(json["id"].(float64))
+		if id > 0 {
+			temp_project, _ := service.GetHisPrescriptionProjectByID(id)
+
+			if temp_project.ExecutionFrequency != project.ExecutionFrequency || temp_project.Count != project.Count || temp_project.Remark != project.Remark {
+				fmt.Println("666666")
+				project.Mtime = time.Now().Unix()
+				project.Ctime = temp_project.Ctime
 
+			} else {
+				project.Mtime = temp_project.Mtime
+				project.Ctime = temp_project.Ctime
+			}
+		} else {
+			ctime := time.Now().Unix()
+			project.Mtime = ctime
+			project.Ctime = ctime
+		}
+	}
 	return 0
 }
 

controllers/his_export_data_controller.go

@@ -1,8 +1,12 @@
 package controllers
 
 import (
+	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"github.com/astaxie/beego"
+	"github.com/shopspring/decimal"
+	"strings"
 )
 
 type HisExportDataController struct {
@@ -12,6 +16,215 @@ type HisExportDataController struct {
 func HisExportDataApiRegistRouters() {
 
 	beego.Router("/api/export", &HisExportDataController{}, "Get:GetExportData")
+
+	beego.Router("/api/batchsettle/get", &HisExportDataController{}, "Get:GetExportSettleData")
+
+}
+
+func (c *HisExportDataController) GetExportSettleData() {
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	var order models.HisOrder
+	orders, _ := service.GetHisOrderByTime(patient_id, start_time, end_time)
+	order = orders[len(orders)-1]
+	order.MedfeeSumamt = 0
+	order.FundPaySumamt = 0
+	order.PsnCashPay = 0
+	order.ActPayDedc = 0
+	order.PreselfpayAmt = 0
+	order.HifpPay = 0
+	order.HifmiPay = 0
+	order.HifesPay = 0
+	order.MafPay = 0
+	order.CvlservPay = 0
+	order.OthPay = 0
+	order.AcctPay = 0
+
+	decimal.DivisionPrecision = 2
+
+	var orderInfos []models.BatchHisOrderInfo
+	for _, item := range orders {
+		order.MedfeeSumamt, _ = decimal.NewFromFloat(order.MedfeeSumamt).Add(decimal.NewFromFloat(item.MedfeeSumamt)).Float64()
+		order.FundPaySumamt, _ = decimal.NewFromFloat(order.FundPaySumamt).Add(decimal.NewFromFloat(item.FundPaySumamt)).Float64()
+		order.PsnCashPay, _ = decimal.NewFromFloat(order.PsnCashPay).Add(decimal.NewFromFloat(item.PsnCashPay)).Float64()
+		order.ActPayDedc, _ = decimal.NewFromFloat(order.ActPayDedc).Add(decimal.NewFromFloat(item.ActPayDedc)).Float64()
+		order.PreselfpayAmt, _ = decimal.NewFromFloat(order.PreselfpayAmt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		order.HifpPay, _ = decimal.NewFromFloat(order.HifpPay).Add(decimal.NewFromFloat(item.HifpPay)).Float64()
+
+		order.HifmiPay, _ = decimal.NewFromFloat(order.HifmiPay).Add(decimal.NewFromFloat(item.HifmiPay)).Float64()
+		order.HifesPay, _ = decimal.NewFromFloat(order.HifesPay).Add(decimal.NewFromFloat(item.HifesPay)).Float64()
+		order.MafPay, _ = decimal.NewFromFloat(order.MafPay).Add(decimal.NewFromFloat(item.MafPay)).Float64()
+		order.CvlservPay, _ = decimal.NewFromFloat(order.CvlservPay).Add(decimal.NewFromFloat(item.CvlservPay)).Float64()
+		order.OthPay, _ = decimal.NewFromFloat(order.OthPay).Add(decimal.NewFromFloat(item.OthPay)).Float64()
+		order.AcctPay, _ = decimal.NewFromFloat(order.AcctPay).Add(decimal.NewFromFloat(item.AcctPay)).Float64()
+
+		orderInfo, _ := service.GetBatchHisOrderInfoByNumber(item.Number)
+		orderInfos = append(orderInfos, orderInfo...)
+	}
+	//role, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, c.GetAdminUserInfo().AdminUser.Id)
+	if order.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrderParamWrong)
+		return
+	}
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	org_id := c.GetAdminUserInfo().CurrentOrgId
+	//adminInfo, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
+	patient, _ := service.GetFaPiaoPatientByID(org_id, order.PatientId)
+
+	printor_admin, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	charge_admin, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, order.Creator)
+
+	var bedCostTotal float64 = 0         //床位总费
+	var bedCostSelfTotal float64 = 0     //床位自费
+	var bedCostPartSelfTotal float64 = 0 //床位部分项目自费
+
+	var operationCostTotal float64 = 0         //手术费
+	var operationCostSelfTotal float64 = 0     //手术费
+	var operationCostPartSelfTotal float64 = 0 //手术费
+
+	var otherCostTotal float64 = 0         //其他费用
+	var otherCostSelfTotal float64 = 0     //其他费用
+	var otherCostPartSelfTotal float64 = 0 //其他费用
+
+	var materialCostTotal float64 = 0         //材料费
+	var materialCostSelfTotal float64 = 0     //材料费
+	var materialCostPartSelfTotal float64 = 0 //材料费
+
+	var westernMedicineCostTotal float64 = 0         //西药费
+	var westernMedicineCostSelfTotal float64 = 0     //西药费
+	var westernMedicineCostPartSelfTotal float64 = 0 //西药费
+
+	var chineseTraditionalMedicineCostTotal float64 = 0         //中成药
+	var chineseTraditionalMedicineCostSelfTotal float64 = 0     //中成药
+	var chineseTraditionalMedicineCostPartSelfTotal float64 = 0 //中成药
+
+	var checkCostTotal float64 = 0         //检查费
+	var checkCostSelfTotal float64 = 0     //检查费
+	var checkCostPartSelfTotal float64 = 0 //检查费
+
+	var laboratoryCostTotal float64 = 0         //化验费
+	var laboratoryCostSelfTotal float64 = 0     //化验费
+	var laboratoryCostPartSelfTotal float64 = 0 //化验费
+
+	var treatCostTotal float64 = 0         //治疗费用
+	var treatCostSelfTotal float64 = 0     //治疗费用
+	var treatCostPartSelfTotal float64 = 0 //治疗费用
+
+	decimal.DivisionPrecision = 2
+
+	for _, item := range orderInfos {
+		if item.MedChrgitmType == "01" { //床位费
+			bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			bedCostSelfTotal, _ = decimal.NewFromFloat(bedCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
+			if item.MedChrgitmType == "03" { //检查费
+				laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			}
+		} else {
+
+			if item.MedChrgitmType == "03" { //检查费
+				checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			}
+
+		}
+
+		if item.MedChrgitmType == "04" { //化验费
+			laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+		}
+
+		if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+
+			treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+		}
+
+		if item.MedChrgitmType == "06" { //手术费
+			operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "08" { //材料费
+			materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "09" { //西药费
+			westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "11" { //中成费
+			chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			chineseTraditionalMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
+			otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"order_infos":                                 orderInfos,
+		"number":                                      order.MdtrtId,
+		"date":                                        order.SettleAccountsDate,
+		"charge_admin":                                charge_admin,
+		"printor_admin":                               printor_admin,
+		"info":                                        order,
+		"bedCostTotal":                                bedCostTotal,
+		"bedCostSelfTotal":                            bedCostSelfTotal,
+		"bedCostPartSelfTotal":                        bedCostPartSelfTotal,
+		"operationCostTotal":                          operationCostTotal,
+		"operationCostSelfTotal":                      operationCostSelfTotal,
+		"operationCostPartSelfTotal":                  operationCostPartSelfTotal,
+		"otherCostTotal":                              otherCostTotal,
+		"otherCostSelfTotal":                          otherCostSelfTotal,
+		"otherCostPartSelfTotal":                      otherCostPartSelfTotal,
+		"materialCostTotal":                           materialCostTotal,
+		"materialCostSelfTotal":                       materialCostSelfTotal,
+		"materialCostPartSelfTotal":                   materialCostPartSelfTotal,
+		"westernMedicineCostTotal":                    westernMedicineCostTotal,
+		"westernMedicineCostSelfTotal":                westernMedicineCostSelfTotal,
+		"westernMedicineCostPartSelfTotal":            westernMedicineCostPartSelfTotal,
+		"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
+		"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
+		"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
+		"checkCostTotal":                              checkCostTotal,
+		"checkCostSelfTotal":                          checkCostSelfTotal,
+		"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
+		"laboratoryCostTotal":                         laboratoryCostTotal,
+		"laboratoryCostSelfTotal":                     laboratoryCostSelfTotal,
+		"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
+		"treatCostTotal":                              treatCostTotal,
+		"treatCostSelfTotal":                          treatCostSelfTotal,
+		"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
+		"patient":                                     patient,
+		"org_name":                                    miConfig.OrgName,
+		"org_code":                                    miConfig.Code,
+		"num":                                         len(orders),
+		"f_time":                                      strings.Split(orders[0].SetlTime, " ")[0],
+		"l_time":                                      strings.Split(orders[len(orders)-1].SetlTime, " ")[0],
+	})
+
 }
 
 func (this *HisExportDataController) GetExportData() {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2178,7 +2178,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				}
 
 				if schedulePatient.ScheduleType == 2 {
-					advice.StartTime = recordDate.Unix() + 10*60*60
+					advice.StartTime = recordDate.Unix() + 9*60*60
 				}
 			}
 			// 抗凝剂名称
@@ -4191,7 +4191,7 @@ func (c *DialysisAPIController) PostSolution() {
 			}
 
 			if schedulePatient.ScheduleType == 2 {
-				advice.StartTime = recordDate.Unix() + 10*60*60
+				advice.StartTime = recordDate.Unix() + 9*60*60
 			}
 		}
 		// 抗凝剂名称
@@ -4483,7 +4483,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 || adminInfo.Org.Id == 10610 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -4551,7 +4551,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 
 	//长沙南雅
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 {
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10610 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)

controllers/pharmacy_controller.go

@@ -179,7 +179,7 @@ func (this *PharmacyController) IssuedDrug() {
 	}
 
 	list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1, ids)
-	fmt.Println("LIST=================", list)
+
 	var flist []models.TmpPatientOne
 	if len(list) > 0 {
 		for _, item := range list {
@@ -389,48 +389,50 @@ func (this *PharmacyController) DispensingMedicine() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
+	tmp_bool := service.IsPharmacyConfig(orgid)
+	if tmp_bool == true {
+		advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
+		if len(advicelist) > 0 {
+			var total int64
+			var prescribing_number_total int64
+			for _, item := range advicelist {
+				//查询改药品信息
+				medical, _ := service.GetBaseDrugMedical(item.DrugId)
+				//如果是药房发药的方式
+				if medical.IsPharmacy == 1 {
+					houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
+					//查询该药品是否有库存
+					list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
+
+					//判断单位是否相等
+					if medical.MaxUnit == item.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						//转化为最小单位
+						total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count * medical.MinNumber
+					}
+					if medical.MinUnit == item.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count
+					}
 
-	advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
-	if len(advicelist) > 0 {
-		var total int64
-		var prescribing_number_total int64
-		for _, item := range advicelist {
-			//查询改药品信息
-			medical, _ := service.GetBaseDrugMedical(item.DrugId)
-			//如果是药房发药的方式
-			if medical.IsPharmacy == 1 {
-				houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
-				//查询该药品是否有库存
-				list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
-
-				//判断单位是否相等
-				if medical.MaxUnit == item.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					//转化为最小单位
-					total = list.Count*medical.MinNumber + list.StockMinNumber
-					prescribing_number_total = count * medical.MinNumber
-				}
-				if medical.MinUnit == item.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					total = list.Count*medical.MinNumber + list.StockMinNumber
-					prescribing_number_total = count
-				}
-
-				if medical.IsUse != 1 {
-					//如果出库数量大于库存数量
-					if prescribing_number_total > total {
-						err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
-						if err != nil {
-							utils.ErrorLog(err.Error())
-							this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
-							return
+					if medical.IsUse != 1 {
+						//如果出库数量大于库存数量
+						if prescribing_number_total > total {
+							err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
+							if err != nil {
+								utils.ErrorLog(err.Error())
+								this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+								return
+							}
 						}
 					}
 				}
-			}
 
+			}
 		}
 	}
 

service/export_data_service.go

@@ -125,3 +125,12 @@ func GetHisOrderDetailFor390(start_time string, end_time string, org_id int64) (
 	}
 	return
 }
+func GetHisOrderByTime(patient_id int64, start_time string, end_time string) (order []models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("patient_id = ? AND status = 1 and order_status = 2 and setl_time >= ? and setl_time <= ?", patient_id, start_time+" 00:00:00", end_time+" 23:59:00").Find(&order).Error
+	return
+}
+
+func GetBatchHisOrderInfoByNumber(order_number string) (order []models.BatchHisOrderInfo, err error) {
+	err = readDb.Model(&models.BatchHisOrderInfo{}).Where("order_number = ? and status = 1", order_number).Find(&order).Error
+	return
+}

service/his_service.go

@@ -1005,7 +1005,7 @@ func CreateHisProjectThree(project *models.HisPrescriptionProject) (err error) {
 
 func SaveNewHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB) (err error) {
 	//err = tx.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn, "mtime": time.Now().Unix()}).Error
-	if err = tx.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn, "mtime": time.Now().Unix()}).Error; err != nil {
+	if err = tx.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn}).Error; err != nil {
 		tx.Rollback()
 		return
 	}
@@ -1013,7 +1013,7 @@ func SaveNewHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB) (
 }
 
 func SaveHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
-	err = writeDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn}).Error
 	return
 }
 

service/new_warehouse_service.go

@@ -3682,9 +3682,9 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 	var deliver_number_one int64 = 0
 	var stock_number int64 = 0
 
-	fmt.Println(deliver_number)
-	fmt.Println(deliver_number_one)
-	fmt.Println(stock_number)
+	//fmt.Println(deliver_number)
+	//fmt.Println(deliver_number_one)
+	//fmt.Println(stock_number)
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 

service/pharmacy_service.go

@@ -300,7 +300,6 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				DataSources:  "临时医嘱",
 				Remarks:      v.Remark,
 				DrugId:       v.DrugId,
-				Price:        v.Price,
 			})
 		}
 		return
@@ -336,6 +335,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				ExecutionState: v.ExecutionState,
 				ExecutionStaff: v.ExecutionStaff,
 				ExecutionTime:  v.ExecutionTime,
+				Price:          v.Price,
 			})
 		}
 
@@ -369,6 +369,8 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				ExecutionState: v.ExecutionState,
 				ExecutionStaff: v.ExecutionStaff,
 				ExecutionTime:  v.ExecutionTime,
+				//Price:        v.Price,
+
 			})
 		}
 		return