2024/6/17

controllers/pharmacy_controller.go

@@ -466,7 +466,6 @@ func (this *PharmacyController) DispensingMedicine() {
 	if orgid == 10480 || orgid == 10188 || orgid == 10217 || orgid == 10164 || orgid == 10666 {
 		//发药逻辑
 
-		fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhh尽力")
 		service.DispensingMedicineOne(orgid, patient_id, stime, etime, creater)
 
 		//针对桑植盛康

controllers/self_drug_api_congtroller.go

@@ -6434,11 +6434,21 @@ func (c *SelfDrugApiController) GetDrugInventoryModePrintList() {
 	outList, _ := service.GetDrugWarhouseHouseOutInfo(orgId, startTime, endTime)
 
 	drugList, _ := service.GetAllDrugList(orgId)
+
+	warehouseInfoFlow, _ := service.GetDrugMonthWarehouseInfo(orgId, startTime)
+
+	warehouseOutFlow, _ := service.GetDrugMonthWarehouseOutInfo(orgId, startTime)
+
+	cancelFlow, _ := service.GetDrugMonthCancelOutInfo(orgId, startTime)
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"list":             list,
-		"manufacturerList": manufacturerList,
-		"outList":          outList,
-		"infoList":         infoList,
-		"drugList":         drugList,
+		"list":              list,
+		"manufacturerList":  manufacturerList,
+		"outList":           outList,
+		"infoList":          infoList,
+		"drugList":          drugList,
+		"warehouseInfoFlow": warehouseInfoFlow,
+		"warehouseOutFlow":  warehouseOutFlow,
+		"cancelFlow":        cancelFlow,
 	})
 }

service/pharmacy_service.go

@@ -879,13 +879,15 @@ func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err
 	if len(adviceList) > 0 {
 		for _, item := range adviceList {
 
-			pharmacyConfig := IsPharmacyConfig(orgid)
-			if pharmacyConfig == true {
-				//扣减库存
-				err = HisFaDrugsDelivery(orgid, creater, item)
-				if err != nil {
-					err = fmt.Errorf("!:%v", err)
-					return
+			if orgid != 10480 {
+				pharmacyConfig := IsPharmacyConfig(orgid)
+				if pharmacyConfig == true {
+					//扣减库存
+					err = HisFaDrugsDelivery(orgid, creater, item)
+					if err != nil {
+						err = fmt.Errorf("!:%v", err)
+						return
+					}
 				}
 			}
 
@@ -1050,7 +1052,7 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	}
 
 	//针对阜阳经沃
-	if orgid != 104801 {
+	if orgid != 10480 {
 		for _, v := range advice_info {
 
 			//扣减库存

service/self_drug_service.go

@@ -5292,3 +5292,54 @@ func GetDrugWarhouseHouseOutInfo(org_id int64, start_time int64, end_time int64)
 	return flow, err
 
 }
+
+func GetDrugMonthWarehouseInfo(org_id int64, start_time int64) (flow []*models.XtDrugFlowList, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type=1 or consumable_type=10)")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime < ?", start_time)
+	}
+
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetDrugMonthWarehouseOutInfo(org_id int64, start_time int64) (flow []*models.XtDrugFlowList, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type=2 or consumable_type=3 or consumable_type=11)")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime < ?", start_time)
+	}
+
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetDrugMonthCancelOutInfo(org_id int64, start_time int64) (flow []*models.XtDrugFlowList, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type=7)")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime < ?", start_time)
+	}
+
+	err = db.Find(&flow).Error
+
+	return flow, err
+}