药房

controllers/pharmacy_controller.go

@@ -32,6 +32,8 @@ func PharmacyApiRegistRouters() {
 	beego.Router("/api/pharmacy/getpartitionlist", &PharmacyController{}, "get:GetPartitionList")           //获取当前机构的分区列表
 	beego.Router("/api/pharmacy/routeofadministration", &PharmacyController{}, "get:RouteOfAdministration") //获取当前机构的给药途径
 }
+
+//测试
 func (this *PharmacyController) Tlili() {
 	var err error
 	defer func() {
@@ -76,6 +78,16 @@ func (this *PharmacyController) TodayNumber() {
 	times := this.GetString("time", "")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+	//shift, err := this.GetInt64("shift", 0) //班次
+	//if err != nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
+	//partition, err := this.GetInt64("partition", 0) //分区
+	//if err != nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 	var stime, etime int64
 	if times == "" {
 		stime, etime = service.GetNowTime()

service/pharmacy_service.go

@@ -1853,15 +1853,15 @@ func CalculateTheTotalAmount(tmp []*models.PatientInformation, drug_id int64) (t
 	for _, v := range tmp {
 		switch v.Unit {
 		case t.MaxUnit:
-			maxunit = v.Quantity
+			maxunit = maxunit + v.Quantity
 		case t.MinUnit:
-			minunit = v.Quantity
+			minunit = minunit + v.Quantity
 		default:
-			terr = v.Quantity
+			terr = terr + v.Quantity
 			terrUnit = v.Unit
 		}
 	}
-	if minunit > minmunber {
+	if minunit >= minmunber {
 		if minmunber == 0 {
 			err = fmt.Errorf("拆零数量不能为零")
 			return