历史排班

controllers/his_api_controller.go

@@ -1,15 +1,8 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
-	"github.com/shopspring/decimal"
 	"math/rand"
 	"reflect"
 	"strconv"
@@ -17,6 +10,14 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
+	"github.com/shopspring/decimal"
 )
 
 type HisApiController struct {
@@ -3633,8 +3634,6 @@ func (c *HisApiController) CreateHisPrescription() {
 												for _, item := range flowGood {
 													out_count += item.Count
 												}
-												fmt.Println("out_count_five+=====================", out_count)
-												fmt.Println("pareIntCount============================", parseIntCount)
 												//如果历史数和当前数据不想等才进行退库出库
 												if out_count != parseIntCount {
 													service.ConsumableNewPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount, tx)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -866,30 +866,30 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		firstCheckDate = firstCheckDateUnix.Unix()
 	}
 
-	//if adminUserInfo.Org.Id == 10340 {
-	//
-	//	list, _ := service.GetRoleList(adminUserInfo.Org.Id, modifier)
-	//	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
-	//	if check.ID == 0 {
-	//		if employee_number != list.JobNumber {
-	//			c.ServeSuccessJSON(map[string]interface{}{
-	//				"doubleCheck": check,
-	//				"msg":         "2",
-	//			})
-	//			return
-	//		}
-	//	}
-	//	if check.ID > 0 {
-	//		if employee_number != list.JobNumber {
-	//			c.ServeSuccessJSON(map[string]interface{}{
-	//				"doubleCheck": check,
-	//				"msg":         "2",
-	//			})
-	//			return
-	//		}
-	//	}
-	//
-	//}
+	if adminUserInfo.Org.Id == 10644 {
+
+		list, _ := service.GetRoleList(adminUserInfo.Org.Id, modifier)
+		_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+		if check.ID == 0 {
+			if employee_number != list.JobNumber {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"doubleCheck": check,
+					"msg":         "2",
+				})
+				return
+			}
+		}
+		if check.ID > 0 {
+			if employee_number != list.JobNumber {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"doubleCheck": check,
+					"msg":         "2",
+				})
+				return
+			}
+		}
+
+	}
 
 	doubleCheck := models.DoubleCheck{
 		UserOrgId:                  adminUserInfo.Org.Id,

service/self_drug_service.go

@@ -1,10 +1,11 @@
 package service
 
 import (
-	"XT_New/models"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 func GetCurrentPatient(orgid int64) (patients []*models.DrugPatients, err error) {
@@ -2974,8 +2975,14 @@ func ModifyDrugFlowById(id int64, over_count int64) error {
 
 func GetDrugInventoryWarehouseInfoList(org_id int64, storehouse_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id = ? and is_check = 1 and org_id = ? and (stock_max_number >0 or stock_min_number >0)", storehouse_id, org_id).Preload("XtBaseDrug", "status= 1").Order("drug_id").Find(&info).Error
-	return info, err
+	if org_id == 10138 || org_id == 10278 {
+		err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id = ? and is_check = 1 and org_id = ?", storehouse_id, org_id).Preload("XtBaseDrug", "status= 1").Order("drug_id").Find(&info).Error
+		return info, err
+	} else {
+		err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id = ? and is_check = 1 and org_id = ? and (stock_max_number >0 or stock_min_number >0)", storehouse_id, org_id).Preload("XtBaseDrug", "status= 1").Order("drug_id").Find(&info).Error
+		return info, err
+	}
+
 }
 
 func GetGoodStockCountList(user_org_id int64, good_id int64) (stock []*models.XtGoodStockCount, err error) {

service/stock_service.go

@@ -6287,7 +6287,7 @@ func GetStockDamagedList(orgid int64, keyword string, page int64, limit int64, s
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
 
-	err = db.Group("x.id").Select("x.ctime,x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.storehouse_id,t.packing_unit,r.user_name").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
+	err = db.Group("x.good_id").Select("x.ctime,x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.storehouse_id,t.packing_unit,r.user_name").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
 	return adjust, total, err
 
 }
@@ -8615,7 +8615,7 @@ func ReduceGoodSumOutCount(storehouse_id int64, good_id int64, user_org_id int64
 
 func GetInvetoryWarehouseInfoList(orgid int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
 
-	if orgid == 10191 {
+	if orgid == 10191 || orgid == 10138 || orgid == 10278 {
 		err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id=? and is_check= 1 and org_id = ?", storehouse_id, orgid).Preload("GoodInfo", "status = 1").Order("good_id").Find(&info).Error
 		return info, err
 	} else {