历史排班

controllers/drug_stock_api_contorller.go

@@ -3552,128 +3552,127 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 
 	checker := c.GetAdminUserInfo().AdminUser.Id
 	//更改核对状态
-	err := service.CheckWarehousingInfo(warehousing_id, orgId, checker)
+	service.CheckWarehousingInfo(warehousing_id, orgId, checker)
 
-	if err == nil {
-		list, _ := service.GetWarehousingInfoByList(warehousing_id, orgId)
-		for _, item := range list {
-			medical, _ := service.GetBaseDrugMedical(item.DrugId)
-			if item.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
-				//新增库存
-				service.AddDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID)
+	list, _ := service.GetWarehousingInfoByList(warehousing_id, orgId)
+	for _, item := range list {
+		medical, _ := service.GetBaseDrugMedical(item.DrugId)
+		if item.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			//新增库存
+			service.AddDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID)
 
-			}
-			if item.MaxUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
-				//新增库存
-				service.AddDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID)
+		}
+		if item.MaxUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+			//新增库存
+			service.AddDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID)
 
-			}
+		}
 
-			if item.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+		if item.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
 
-				//新增库存
-				service.AddDrugWarehouseStockMinNumber(item.WarehousingCount, item.ID)
+			//新增库存
+			service.AddDrugWarehouseStockMinNumber(item.WarehousingCount, item.ID)
 
-			}
+		}
 
-			Creator := c.GetAdminUserInfo().AdminUser.Id
+		Creator := c.GetAdminUserInfo().AdminUser.Id
 
-			//查询默认仓库
+		//查询默认仓库
 
-			//查询默认仓库剩余多少库存
-			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, 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
-			}
-			flow := &models.DrugFlow{
-				WarehousingId:           0,
-				DrugId:                  item.DrugId,
-				Number:                  item.Number,
-				BatchNumber:             item.BatchNumber,
-				Count:                   item.WarehousingCount,
-				UserOrgId:               item.OrgId,
-				PatientId:               0,
-				SystemTime:              time.Now().Unix(),
-				ConsumableType:          1,
-				IsSys:                   0,
-				WarehousingOrder:        item.WarehousingOrder,
-				WarehouseOutId:          0,
-				WarehouseOutOrderNumber: "",
-				IsEdit:                  0,
-				CancelStockId:           0,
-				CancelOrderNumber:       "",
-				Manufacturer:            0,
-				Dealer:                  0,
-				Creator:                 Creator,
-				UpdateCreator:           Creator,
-				Status:                  1,
-				Ctime:                   item.Ctime,
-				Mtime:                   0,
-				Price:                   item.Price,
-				WarehousingDetailId:     item.ID,
-				WarehouseOutDetailId:    0,
-				CancelOutDetailId:       0,
-				ExpireDate:              item.ExpiryDate,
-				ProductDate:             item.ProductDate,
-				MaxUnit:                 item.MaxUnit,
-				MinUnit:                 item.MinUnit,
-				StorehouseId:            item.StorehouseId,
-				OverCount:               sum_count,
-			}
-			service.CreateDrugFlowTwo(flow)
-			//更新基础库剩余库存
-			service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
-
-			drugInfolist, _ := service.GetDrugSumCountByStorehouseId(item.StorehouseId, item.OrgId, item.DrugId)
-			var total_count int64 // 入库总数量
-			var over_count int64  //剩余库存
-			for _, it := range drugInfolist {
-				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-				if it.MaxUnit == baseDrug.MaxUnit {
-					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-				}
-			}
-			for _, it := range drugInfolist {
-				total_count += it.WarehousingCount
-				over_count += it.StockMaxNumber + it.StockMinNumber
+		//查询默认仓库剩余多少库存
+		list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, 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
 			}
-			//查询该仓库是否有默认数据
-			_, errcode := service.GetDrugStockCount(item.StorehouseId, item.DrugId, item.OrgId)
-			if errcode == gorm.ErrRecordNotFound {
-				drugStock := models.XtDrugStockCount{
-					UserOrgId:      item.OrgId,
-					StorehouseId:   item.StorehouseId,
-					SumInCount:     total_count,
-					SumOutCount:    0,
-					SumCancelCount: 0,
-					DrugId:         item.DrugId,
-					Ctime:          time.Now().Unix(),
-					Mtime:          0,
-					Status:         1,
-					FlushCount:     over_count,
-					SumActOutCount: 0,
-				}
-				service.CreateDrugStockSum(drugStock)
+			sum_count += it.StockMaxNumber + it.StockMinNumber
+			sum_in_count += it.WarehousingCount
+		}
+		flow := &models.DrugFlow{
+			WarehousingId:           0,
+			DrugId:                  item.DrugId,
+			Number:                  item.Number,
+			BatchNumber:             item.BatchNumber,
+			Count:                   item.WarehousingCount,
+			UserOrgId:               item.OrgId,
+			PatientId:               0,
+			SystemTime:              time.Now().Unix(),
+			ConsumableType:          1,
+			IsSys:                   0,
+			WarehousingOrder:        item.WarehousingOrder,
+			WarehouseOutId:          0,
+			WarehouseOutOrderNumber: "",
+			IsEdit:                  0,
+			CancelStockId:           0,
+			CancelOrderNumber:       "",
+			Manufacturer:            0,
+			Dealer:                  0,
+			Creator:                 Creator,
+			UpdateCreator:           Creator,
+			Status:                  1,
+			Ctime:                   item.Ctime,
+			Mtime:                   0,
+			Price:                   item.Price,
+			WarehousingDetailId:     item.ID,
+			WarehouseOutDetailId:    0,
+			CancelOutDetailId:       0,
+			ExpireDate:              item.ExpiryDate,
+			ProductDate:             item.ProductDate,
+			MaxUnit:                 item.MaxUnit,
+			MinUnit:                 item.MinUnit,
+			StorehouseId:            item.StorehouseId,
+			OverCount:               sum_count,
+		}
+		service.CreateDrugFlowTwo(flow)
+		//更新基础库剩余库存
+		service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
 
-			} else if errcode == nil {
-				service.UpdateDrugStockSum(item.StorehouseId, item.DrugId, item.OrgId, total_count, over_count)
+		drugInfolist, _ := service.GetDrugSumCountByStorehouseId(item.StorehouseId, item.OrgId, item.DrugId)
+		var total_count int64 // 入库总数量
+		var over_count int64  //剩余库存
+		for _, it := range drugInfolist {
+			baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+			if it.MaxUnit == baseDrug.MaxUnit {
+				it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+				it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+			}
+		}
+		for _, it := range drugInfolist {
+			total_count += it.WarehousingCount
+			over_count += it.StockMaxNumber + it.StockMinNumber
+		}
+		//查询该仓库是否有默认数据
+		_, errcode := service.GetDrugStockCount(item.StorehouseId, item.DrugId, item.OrgId)
+		if errcode == gorm.ErrRecordNotFound {
+			drugStock := models.XtDrugStockCount{
+				UserOrgId:      item.OrgId,
+				StorehouseId:   item.StorehouseId,
+				SumInCount:     total_count,
+				SumOutCount:    0,
+				SumCancelCount: 0,
+				DrugId:         item.DrugId,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Status:         1,
+				FlushCount:     over_count,
+				SumActOutCount: 0,
 			}
+			service.CreateDrugStockSum(drugStock)
 
+		} else if errcode == nil {
+			service.UpdateDrugStockSum(item.StorehouseId, item.DrugId, item.OrgId, total_count, over_count)
 		}
 
-		c.ServeSuccessJSON(map[string]interface{}{
-			"list": list,
-		})
 	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+
 }
 
 func (c *StockDrugApiController) ReturnCheckWarehouseingInfo() {

controllers/sign_api_controller.go

@@ -657,6 +657,20 @@ func (this *SignApiController) GetEnterPriseDetail() {
 
 func (this *SignApiController) UploadPrintOrder() {
 
+	//pdfg, _ := wkhtml.NewPDFGenerator()
+	//
+	//htmlStr := `<html><body><h1 style="color:red;">This is an html
+	// from pdf to test color<h1><img src="http://api.qrserver.com/v1/create-qr-
+	//code/?data=HelloWorld"   ></img></body></html>`
+	//
+	//pdfg.AddPage(wkhtml.NewPageReader(strings.NewReader(htmlStr)))
+	//
+	//// Create PDF document in internal buffer
+	//err = pdfg.Create()
+	//
+	////Your Pdf Name
+	//err = pdfg.WriteFile("./Your_pdfname.pdf")
+
 	//dataBody := make(map[string]interface{}, 0)
 	//err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	//fmt.Println(err)

models/monitor_models.go

@@ -132,6 +132,7 @@ type MonitorPatients struct {
 	ContactName                  string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	FirstLetter                  string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (MonitorPatients) TableName() string {

models/schedule_models.go

@@ -312,9 +312,10 @@ func (BloodPatientDialysisPrescription) TableName() string {
 }
 
 type VmBloodPatients struct {
-	ID    int64  `gorm:"column:id" json:"id" form:"id"`
-	BedId int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	Name  string `gorm:"column:name" json:"name" form:"name"`
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	BedId       int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name        string `gorm:"column:name" json:"name" form:"name"`
+	FirstLetter string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (VmBloodPatients) TableName() string {