历史排班

controllers/his_api_controller.go

@@ -2033,9 +2033,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								var batch_number_count int64
 								batch_number_count = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
 								batch_number_counts := strconv.FormatInt(batch_number_count, 10)
-								fmt.Println("woowowowowowwowowo", advicelist.ID)
-								fmt.Println("prescribing_number", prescribing_number)
-								fmt.Println("totototootto", totals)
+
 								//新增处方
 								if advicelist.ID == 0 {
 									all_count, _ := strconv.ParseFloat(totals, 64)
@@ -3351,6 +3349,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					if drug.IsUse == 2 {
 						creater := adminInfo.AdminUser.Id
 						service.HisDrugsDelivery(item.UserOrgId, creater, item)
+
 					}
 
 					//更新字典里面的库存
@@ -3367,6 +3366,10 @@ func (c *HisApiController) CreateHisPrescription() {
 					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 					//剩余库存
 					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeConfig.DrugStorehouseOut, sum_count)
+
+					over, _ := service.FindOverCount(item.DrugId, item.UserOrgId, storeConfig.DrugStorehouseOut)
+					service.UpdateActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount)
+
 				}
 			}
 		}
@@ -7410,6 +7413,9 @@ func (c *HisApiController) GetUploadInfo() {
 						}
 						service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 						service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+						over, _ := service.FindOverCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut)
+						service.UpdateActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount)
+
 					}
 
 				}

controllers/pharmacy_controller.go

@@ -169,7 +169,7 @@ func (this *PharmacyController) IssuedDrug() {
 		etime = stime + 86399
 	}
 
-	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 || orgid == 10375 || orgid == 10480 {
+	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 || orgid == 10375 || orgid == 10480 || orgid == 10344 {
 
 		//获取排班班次
 		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
@@ -193,7 +193,7 @@ func (this *PharmacyController) IssuedDrug() {
 		})
 	}
 
-	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10375 && orgid != 10480 {
+	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid == 10344 {
 		//查询表里当天的数据
 		var flist []*models.TmpPatient
 		flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
@@ -249,7 +249,7 @@ func (this *PharmacyController) WaitingDrug() {
 		etime = stime + 86399
 	}
 
-	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10375 && orgid != 10480 {
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid != 10344 {
 		//查询表里当天的数据
 		var flist []*models.TmpPatient
 		flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
@@ -273,11 +273,10 @@ func (this *PharmacyController) WaitingDrug() {
 	}
 
 	//当天已发药的人数
-	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 || orgid == 10375 || orgid == 10480 {
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 || orgid == 10375 || orgid == 10480 || orgid == 10344 {
 
 		//获取排班班次
 		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
-		fmt.Println("schedule--------", schedule)
 		var ids []int64
 		for _, item := range schedule {
 			ids = append(ids, item.PatientId)

controllers/sign_api_controller.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jung-kurt/gofpdf"
+	"github.com/mozillazg/go-pinyin"
 	"io/ioutil"
 	"time"
 )
@@ -657,6 +658,33 @@ func (this *SignApiController) GetEnterPriseDetail() {
 
 func (this *SignApiController) UploadPrintOrder() {
 
+	list, _ := service.GetAllPatientNew(10188)
+	for _, item := range list {
+
+		hans := item.Name // 要转换的汉字字符串
+		// 创建一个拼音转换器
+		p := pinyin.NewArgs()
+
+		// 将汉字转为拼音
+		pinyinSlice := pinyin.Pinyin(hans, p)
+
+		// 输出拼音
+		fmt.Println("Pinyin:", pinyinSlice)
+
+		// 获取首字母
+		firstLetter := ""
+		for _, py := range pinyinSlice {
+			if len(py) > 0 {
+				firstLetter += string(py[0][0])
+			}
+		}
+
+		item.FirstLetter = firstLetter
+		service.UpdatePatientNew(item.ID, item.FirstLetter)
+		// 输出首字母
+		//fmt.Println("First Letter:", firstLetter)
+	}
+
 	//pdfg, _ := wkhtml.NewPDFGenerator()
 	//
 	//htmlStr := `<html><body><h1 style="color:red;">This is an html

service/manage_center_service.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"XT_New/models"
-	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
@@ -450,7 +449,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 		for _, its := range list {
 			//查询该批次病人该药品出库数据
 			infos, _ := GetDrugAutoWarehouseOutTen(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID, its.WarehouseInfoId)
-			fmt.Println("info2332323232332233223wo", infos.Count)
+
 			//查询该药品出库批次总入库数量
 			druginfo, _ := GetDrugInfoSix(its.WarehouseInfoId, infos.OrgId)
 

service/new_warehouse_service.go

@@ -596,6 +596,23 @@ func AddDrugCount(drug_id int64, org_id int64, storehouse_id int64, out_count in
 	return err
 }
 
+func FindOverCount(drug_id int64, org_id int64, storehouse_id int64) (models.XtDrugStockCount, error) {
+
+	stockCount := models.XtDrugStockCount{}
+	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and storehouse_id=?", drug_id, org_id, storehouse_id).Find(&stockCount).Error
+	return stockCount, err
+}
+
+func UpdateActOut(id int64, sum_in_count int64, flush_count int64, sum_cancel_count int64) error {
+
+	var sum_out_count int64
+	sum_out_count = sum_in_count - flush_count
+	var sum_act_out_count int64
+	sum_act_out_count = sum_out_count + sum_cancel_count
+	err := XTWriteDB().Model(&models.XtDrugStockCount{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"sum_out_count": sum_out_count, "sum_act_out_count": sum_act_out_count}).Error
+	return err
+}
+
 func ReduceDrugCount(drug_id int64, org_id int64, storehouse_id int64, out_count int64) error {
 	ut := XTWriteDB().Begin()
 	err := ut.Model(&models.XtDrugStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id = ? and drug_id = ?", storehouse_id, org_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count - ?", out_count)).Error
@@ -1390,8 +1407,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 	}
 
-	fmt.Println("库存数量2嚄噢嚄噢噢哦哦嚄噢嚄o", stock_number)
-	fmt.Println("出库数咯哦我我我我嚄嚄嚄嚄", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -1603,6 +1618,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		fmt.Println("退款数来的发阿道夫", cancel_count)
 
 		fmt.Println("查收嗖嗖嗖哦", deliver_number_one-(out_count-cancel_count))
+
 		if deliver_number_one-(out_count-cancel_count) >= 0 {
 			if (deliver_number_one - out_count - cancel_count) != 0 {
 
@@ -1638,7 +1654,24 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 						AdviceId:                advice.ID,
 					}
 
-					AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+					errThreeThrtiy := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+
+					if errThreeThrtiy != nil {
+						drugError := models.XtDrugError{
+							UserOrgId:             orgID,
+							DrugId:                advice.DrugId,
+							RecordDate:            advice.AdviceDate,
+							PatientId:             advice.PatientId,
+							Remark:                "插入数据报错",
+							Status:                1,
+							Ctime:                 time.Now().Unix(),
+							Mtime:                 0,
+							SumCount:              0,
+							Prescribingnumber:     advice.PrescribingNumber,
+							PrescribingNumberUnit: advice.PrescribingNumberUnit,
+						}
+						CreateDrugError(drugError)
+					}
 
 				}
 				lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
@@ -1693,6 +1726,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 					}
 					CreateDrugError(drugError)
 				}
+
 				//出库数量相加
 				errThreeTys := AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
 
@@ -2160,8 +2194,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			cancel_count += item.Count
 		}
 
-		fmt.Println("deliver_nbumbwowowoowowow", deliver_number)
-		fmt.Println("out_coutnwoowowowowowow", out_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		if deliver_number > (out_count - cancel_count) {
 
@@ -2200,6 +2232,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			CreateDrugFlowOne(drugflow)
 			//出库数量相加
 			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+
 		}
 
 		if deliver_number < (out_count - cancel_count) {
@@ -3271,6 +3304,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			CreateDrugFlowOne(drugflow)
 			//出库数量相加
 			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+
 		}
 
 		if deliver_number < (out_count - cancel_count) {

service/patientmanage_service.go

@@ -777,7 +777,7 @@ func SearchallPatient(keyword string, orgid int64) (patients []*models.XtPatient
 	db := XTReadDB().Table("xt_patients_new as x").Where("x.status = 1")
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Where("x.name LIKE ? OR x.dialysis_no LIKE ?", likeKey, likeKey)
+		db = db.Where("x.name LIKE ? OR x.dialysis_no LIKE ? OR x.first_letter=?", likeKey, likeKey, likeKey)
 	}
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)

service/sign_service.go

@@ -2050,3 +2050,15 @@ func SingleImg2Pdf(pathStr string) {
 	err := pdf.OutputFileAndClose(fileStr)
 	fmt.Println(err)
 }
+
+func GetAllPatientNew(org_id int64) (new []*models.XtPatientsNew, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=1", org_id).Find(&new).Error
+	return new, err
+}
+
+func UpdatePatientNew(id int64, firstleterr string) error {
+
+	err := XTWriteDB().Model(models.XtPatientsNew{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"first_letter": firstleterr}).Error
+	return err
+}

service/stock_service.go

@@ -3259,13 +3259,17 @@ func UpdateStockOut(warehouseinfoid int64, info models.WarehousingInfo) error {
 }
 
 func AddSigleDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo) error {
-	ut := writeDb.Begin()
-	err := ut.Create(&info).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+	//ut := writeDb.Begin()
+	//err := ut.Create(&info).Error
+	//if err != nil {
+	//	ut.Rollback()
+	//	return err
+	//}
+	//ut.Commit()
+	//return err
+
+	err := writeDb.Create(&info).Error
+
 	return err
 }