2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10644 //机构id
+		subscibe.OrgId = 10206 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 10697 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10644 //机构id小英9675或4
+		subscibe.OrgId = 10206 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 16787 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/drug_pharmacy_management_controller.go

@@ -1,17 +1,18 @@
 package controllers
 
 import (
+	"fmt"
+	"math"
+	"strconv"
+	"strings"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
-	"math"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type PharmacyApiController struct {
@@ -478,6 +479,7 @@ func (this *PharmacyApiController) SaveSetting() {
 	}()
 	is_open, _ := this.GetInt64("is_open")
 
+	is_drug_open, _ := this.GetInt64("is_drug_open")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	config := models.PharmacyConfig{
 		UserOrgId: orgId,
@@ -502,6 +504,32 @@ func (this *PharmacyApiController) SaveSetting() {
 		err = fmt.Errorf("用户开启药房管理出库")
 	}
 
+	codeConfig, _ := service.GetDrugCodeConfig(orgId)
+
+	if codeConfig.ID == 1 {
+		drugCodeConfig := models.XtDrugCodeConfig{
+			ID:        codeConfig.ID,
+			IsOpen:    is_drug_open,
+			UserOrgId: orgId,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
+		}
+		service.SaveDrugCodeConfig(drugCodeConfig)
+	}
+
+	if codeConfig.ID == 0 {
+
+		drugCodeConfig := models.XtDrugCodeConfig{
+			IsOpen:    is_drug_open,
+			UserOrgId: orgId,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
+		}
+		service.CreateDrugCodeConfig(drugCodeConfig)
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"config": config,
 	})
@@ -513,9 +541,11 @@ func (this *PharmacyApiController) GetPharmacyConfig() {
 
 	config, err := service.GetPharmacyConfig(orgId)
 
+	codeConfig, _ := service.GetDrugCodeConfig(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"config": config,
+			"config":     config,
+			"codeConfig": codeConfig,
 		})
 	} else {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/new_stock_api_controller.go

@@ -1,12 +1,15 @@
 package controllers
 
 import (
+	"fmt"
+	"math"
+	"strconv"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/service"
 	"XT_New/utils"
-	"fmt"
 	"github.com/astaxie/beego"
-	"time"
 )
 
 type NewStockApiController struct {
@@ -18,6 +21,10 @@ func NewStockApiRegistRouters() {
 	beego.Router("/api/drug/change", &NewStockApiController{}, "Get:GetDrugChange")
 	//beego.Router("/api/drug/query", &NewStockApiController{}, "Get:GetDrugQuery")
 
+	beego.Router("/api/drug/gethisdrugcodequery", &NewStockApiController{}, "Get:GetHisDrugCodeQuery")
+	beego.Router("/api/drug/createuploaddrugcode", &NewStockApiController{}, "Get:CrateUploadDrugCode")
+	beego.Router("/api/drug/getpatientdrugcode", &NewStockApiController{}, "Get:GetPatientDrugCode")
+
 }
 
 func (c *NewStockApiController) GetDrugStock() {
@@ -151,3 +158,141 @@ func (c *NewStockApiController) GetDrugQuery() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (this *NewStockApiController) GetHisDrugCodeQuery() {
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	is_sale, _ := this.GetInt64("is_sale")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	list, total, _ := service.GetHisDrugCodeQuery(orgId, startTime, endTime, limit, page, is_sale)
+
+	drug, _ := service.GetAllDrugList(orgId)
+
+	codeConfig, _ := service.GetDrugCodeConfig(orgId)
+
+	patients, _ := service.GetAllpatient(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":       list,
+		"total":      total,
+		"drug":       drug,
+		"patients":   patients,
+		"codeConfig": codeConfig,
+	})
+
+	return
+}
+
+func (this *NewStockApiController) CrateUploadDrugCode() {
+
+	drug_id, _ := this.GetInt64("drug_id")
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	advice_date, _ := this.GetInt64("advice_date")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	//查询该药品是否出库
+	outinfo, _ := service.GetDrugWarehouseOutInfoByDrugCode(drug_id, patient_id, advice_date, orgId)
+
+	if len(outinfo) == 0 {
+		this.ServeDynamicFailJsonSend("该药品未出库,请先出库")
+		return
+	} else {
+		this.ServeDynamicFailJsonSend("成功!")
+		return
+	}
+
+}
+
+func (this *NewStockApiController) GetPatientDrugCode() {
+
+	drug_id, _ := this.GetInt64("drug_id")
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	advice_date, _ := this.GetInt64("advice_date")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	advicelist, _ := service.FindeHisAdviceDocAdviceOne(orgId, patient_id, drug_id, advice_date)
+	if len(advicelist) > 0 {
+		var total int64
+		var prescribing_number_total int64
+		for _, item := range advicelist {
+			//查询改药品信息
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			//如果是药房发药的方式
+			if medical.IsPharmacy == 1 {
+				houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+				//查询该药品是否有库存
+				list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
+
+				//判断单位是否相等
+				if medical.MaxUnit == item.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					//转化为最小单位
+					total = list.Count*medical.MinNumber + list.StockMinNumber
+					prescribing_number_total = count * medical.MinNumber
+				}
+				if medical.MinUnit == item.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					total = list.Count*medical.MinNumber + list.StockMinNumber
+					prescribing_number_total = count
+				}
+
+				if medical.IsUse != 1 {
+					//如果出库数量大于库存数量
+					if prescribing_number_total > total {
+						err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
+						if err != nil {
+							utils.ErrorLog(err.Error())
+							this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+							return
+						}
+					}
+				}
+			}
+
+		}
+	}
+	creater := this.GetAdminUserInfo().AdminUser.Id
+	service.DispensingMedicineTwo(orgId, patient_id, advice_date, drug_id, creater)
+
+	this.ServeDynamicFailJsonSend("发药成功!")
+	return
+}

controllers/stock_in_api_controller.go

@@ -4443,9 +4443,9 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		drug.MinPrice = min_price
 		dose := goodNameM["dose"].(string)
 
-		is_self_drug := int64(goodNameM["is_self_drug"].(float64))
-
-		drug.IsSelfDrug = is_self_drug
+		//is_self_drug := int64(goodNameM["is_self_drug"].(float64))
+		//
+		//drug.IsSelfDrug = is_self_drug
 
 		if len(dose) < 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{

models/drug_pharmacy_management_models.go

@@ -237,3 +237,16 @@ type Pharmacy struct {
 func (Pharmacy) TableName() string {
 	return "xt_pharmacy"
 }
+
+type XtDrugCodeConfig struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDrugCodeConfig) TableName() string {
+	return "xt_drug_code_config"
+}

models/his_models.go

@@ -275,6 +275,7 @@ type HisDoctorAdviceInfo struct {
 	DrugWayCount          string                 `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
 	YbSyncStatus          int64                  `gorm:"column:yb_sync_status" json:"yb_sync_status" form:"yb_sync_status"`
 	DrugCode              string                 `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	IsUpload              int64                  `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

service/drug_pharmacy_management_service.go

@@ -1,15 +1,16 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
 	"errors"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"math"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"XT_New/utils"
+	"github.com/jinzhu/gorm"
 )
 
 func GetPharmacyDrugList(storehouse_id int64, orgid int64, keywords string) (drug []*models.PharmacyBaseDrug, err error) {
@@ -1654,3 +1655,24 @@ func CreateDrugError(drugError models.XtDrugError) error {
 
 	return err
 }
+
+func GetDrugCodeConfig(user_org_id int64) (models.XtDrugCodeConfig, error) {
+
+	codeConfig := models.XtDrugCodeConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status =1", user_org_id).Find(&codeConfig).Error
+	return codeConfig, err
+}
+
+func SaveDrugCodeConfig(config models.XtDrugCodeConfig) error {
+
+	err := XTWriteDB().Save(&config).Error
+
+	return err
+}
+
+func CreateDrugCodeConfig(config models.XtDrugCodeConfig) error {
+
+	err := XTWriteDB().Create(&config).Error
+
+	return err
+}

service/pharmacy_service.go

@@ -983,6 +983,12 @@ func GetHisPatientNoMedical(user_org_id int64, patient_id int64, startime int64,
 	return advice, err
 }
 
+func GetHisPatientNoMedicalOne(user_org_id int64, patient_id int64, drug_id int64, advice_date int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and patient_id = ? and drug_id =? and advice_date=? and is_medicine =0 and status=1", user_org_id, patient_id, drug_id, advice_date).Find(&advice).Error
+	return advice, err
+}
+
 func UpdateIsMedicalHisAdvice(id int64) (err error) {
 	adviceInfo := models.HisDoctorAdviceInfo{}
 	err = XTWriteDB().Model(&adviceInfo).Where("id =? and status =1", id).Update(map[string]interface{}{"is_medicine": 1, "dispensing_time": time.Now().Unix()}).Error
@@ -2293,6 +2299,27 @@ func FindeHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime i
 	return advice, err
 }
 
+func FindeHisAdviceDocAdviceOne(orgid int64, patient_id int64, drug_id int64, advice_date int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status= 1 and is_medicine = 0")
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if drug_id > 0 {
+		db = db.Where("drug_id =?", drug_id)
+	}
+	if advice_date > 0 {
+		db = db.Where("advice_date = ?", advice_date)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}
+
 func GetFlow(drug_id int64, system_time int64, org_id int64, patient_id int64) (flow []*models.DrugFlow, err error) {
 
 	err = XTWriteDB().Where("drug_id = ? and system_time =? and user_org_id = ? and status = 1 and patient_id =?", drug_id, system_time, org_id, patient_id).Find(&flow).Error
@@ -2382,3 +2409,79 @@ func ChangeAdivceDrugCode(id int64, drug_code string, user_org_id int64) (models
 
 	return adviceInfo, err
 }
+
+func DispensingMedicineTwo(orgid, patient_id, advice_date, drug_id, creater int64) (err error) {
+
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+
+	//查询当前患者未发药的列表
+	adviceList, err := GetHisPatientNoMedicalOne(orgid, patient_id, drug_id, advice_date)
+	//发药
+	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
+				}
+			}
+
+			//修改发药状态
+			err = UpdateIsMedicalHisAdvice(item.ID)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+			err = UpdateHisPrescription(item.PrescriptionId)
+			if err != nil {
+				err = fmt.Errorf("!:%v", err)
+				return
+			}
+
+			//查询默认仓库
+			storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
+			//查询默认仓库剩余多少库存
+			var sum_count int64
+			stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, item.DrugId)
+			for _, its := range stockInfo {
+				baseDrug, _ := GetBaseDrugMedical(its.DrugId)
+				if its.MaxUnit == baseDrug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
+			UpdateBaseDrugSumTwo(item.DrugId, sum_count, orgid)
+			//扣减库存
+			UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+
+			over, _ := FindOverCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut)
+			UpdateActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount)
+		}
+	}
+
+	//生成明细记录
+	tmp_ph := models.Pharmary{
+		UserOrgId:  orgid,
+		PatientId:  patient_id,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		Status:     1,
+		RecordDate: time.Now().Unix(),
+	}
+	err = tx.Create(&tmp_ph).Error
+
+	return
+}

service/stock_service.go

@@ -9771,3 +9771,38 @@ func SaveDrugOpen(open models.XtDrugCodeOpen) error {
 
 	return err
 }
+
+func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit int64, page int64, is_sale int64) (list []*models.HisDoctorAdviceInfo, total int64, err error) {
+
+	db := XTReadDB().Model(&models.HisDoctorAdviceInfo{}).Where("status=1")
+
+	if orgId > 0 {
+		db = db.Where("user_org_id=?", orgId)
+	}
+	if start_time > 0 {
+		db = db.Where("advice_date >= ?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("advice_date<=?", end_time)
+	}
+
+	offset := (page - 1) * limit
+
+	if is_sale == 1 {
+		db = db.Where("is_upload = 1")
+	}
+	if is_sale == 2 {
+		db = db.Where("is_upload = 2")
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
+
+	return list, total, err
+}
+
+func GetDrugWarehouseOutInfoByDrugCode(drug_id int64, patient_id int64, advice_date int64, user_org_id int64) (outinfo []*models.XtDrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and patient_id = ? and sys_record_time =? and org_id = ? and status =1", drug_id, patient_id, advice_date, user_org_id).Find(&outinfo).Error
+
+	return outinfo, err
+}

service/warhouse_service.go

@@ -9329,7 +9329,6 @@ func HisFaDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvi
 				}
 			}
 
-			fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhwode", advice.DrugCode)
 			newadviceInfo := &models.HisDoctorAdviceInfo{
 				ID:                    advice.ID,
 				UserOrgId:             advice.UserOrgId,