Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

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 = 10340 //机构id
+		subscibe.OrgId = 10697 //机构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 = 10340 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10697 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17260 //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 = 10340 //机构id小英9675或4
+		subscibe.OrgId = 10697 //机构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 = 10340 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10697 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17260 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/manager_center_api_controller.go

@@ -1846,7 +1846,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	}
 	err, goodInfos := service.ModifyGoodInfo(&goodInfo)
 
-	if adminUserInfo.CurrentOrgId != 10653 && adminUserInfo.CurrentOrgId != 10644 {
+	if adminUserInfo.CurrentOrgId == 10598 {
 		list, _ := service.GetHisPrescripionProjectList(good_id, adminUserInfo.CurrentOrgId)
 		if len(list) > 0 {
 			for _, item := range list {

controllers/patient_dataconfig_api_controller.go

@@ -1,10 +1,6 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
 	"reflect"
@@ -12,6 +8,11 @@ import (
 	"strings"
 	"time"
 
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+
 	"github.com/astaxie/beego"
 )
 
@@ -1049,15 +1050,15 @@ func (this *PatientDataConfigAPIController) ModifyCourse() {
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	now := time.Now().Unix()
 

controllers/self_drug_api_congtroller.go

@@ -2975,10 +2975,13 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取查询信息失败")
 		return
 	}
-
+	var medicalInsuranceLevel = "医保等级"
+	medicalInsuranceLevelParent, _ := service.GetDrugDataConfig(0, medicalInsuranceLevel)
+	medicalInsuranceLevelList, _ := service.GetParentDataConfig(medicalInsuranceLevelParent.ID, orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total":     total,
-		"stockList": stockList,
+		"total":                     total,
+		"stockList":                 stockList,
+		"medicalInsuranceLevelList": medicalInsuranceLevelList,
 	})
 }
 
@@ -3641,10 +3644,15 @@ func (this *SelfDrugApiController) GetDrugNewQuery() {
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
 
+	var medicalInsuranceLevel = "医保等级"
+	medicalInsuranceLevelParent, _ := service.GetDrugDataConfig(0, medicalInsuranceLevel)
+	medicalInsuranceLevelList, _ := service.GetParentDataConfig(medicalInsuranceLevelParent.ID, orgId)
+
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total":        total,
-		"drugTypeList": drugTypeList,
-		"countList":    countList,
+		"total":                     total,
+		"drugTypeList":              drugTypeList,
+		"countList":                 countList,
+		"medicalInsuranceLevelList": medicalInsuranceLevelList,
 	})
 }
 
@@ -3884,6 +3892,10 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 
 	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
 
+	var medicalInsuranceLevel = "医保等级"
+	medicalInsuranceLevelParent, _ := service.GetDrugDataConfig(0, medicalInsuranceLevel)
+	medicalInsuranceLevelList, _ := service.GetParentDataConfig(medicalInsuranceLevelParent.ID, orgId)
+
 	if orgId == 10265 {
 		//storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
 
@@ -3947,9 +3959,10 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":             list,
-			"manufacturerList": manufacturerList,
-			"total":            total,
+			"list":                      list,
+			"manufacturerList":          manufacturerList,
+			"total":                     total,
+			"medicalInsuranceLevelList": medicalInsuranceLevelList,
 		})
 	}
 
@@ -4046,9 +4059,10 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":             list,
-			"manufacturerList": manufacturerList,
-			"total":            total,
+			"list":                      list,
+			"manufacturerList":          manufacturerList,
+			"total":                     total,
+			"medicalInsuranceLevelList": medicalInsuranceLevelList,
 		})
 	}
 

controllers/stock_in_api_controller.go

@@ -7006,6 +7006,7 @@ func (this *StockManagerApiController) SaveStockInventoryList() {
 				ProductDate:       product_date,
 				StorehouseId:      storehouse_id,
 				MaxUnit:           warehousing_unit,
+				Status:            1,
 			}
 
 			//查询今日该耗材是否有记录
@@ -7025,6 +7026,10 @@ func (this *StockManagerApiController) SaveStockInventoryList() {
 
 		}
 	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "保存成功!",
+	})
 }
 
 func (this *StockManagerApiController) GetDamageDetailByGoodId() {
@@ -8387,6 +8392,7 @@ func (this *StockManagerApiController) GetStockInventoryModePrintList() {
 		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)
@@ -8416,6 +8422,14 @@ func (this *StockManagerApiController) GetStockInventoryModePrintList() {
 
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 
+	//获取期初结余数量
+	warehouseinfo, _ := service.GetLastMonthCount(startTime, orgId)
+
+	//期出结余出库数量
+	warehouseOutInfo, _ := service.GetLastMonthOverCount(startTime, orgId)
+
+	cancelInfo, _ := service.GetLastCancelMonthCount(startTime, orgId)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"infoList":         infoList,
@@ -8424,6 +8438,9 @@ func (this *StockManagerApiController) GetStockInventoryModePrintList() {
 		"flowNoProList":    flowNoProList,
 		"manufacturerList": manufacturerList,
 		"goodInfo":         goodInfo,
+		"warehouseinfo":    warehouseinfo,
+		"warehouseOutInfo": warehouseOutInfo,
+		"cancelInfo":       cancelInfo,
 	})
 
 }

models/new_stock_models.go

@@ -173,6 +173,7 @@ type NewBaseDrugOne struct {
 	Dealer                 int64                  `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	MedicalInsuranceNumber string                 `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 	DrugType               int64                  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	MedicalInsuranceLevel  int64                  `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
 }
 
 func (NewBaseDrugOne) TableName() string {
@@ -265,28 +266,29 @@ func (VmNewStockFlowTwenty) TableName() string {
 }
 
 type GoodInfoTwenty struct {
-	ID                int64                `gorm:"column:id" json:"id" form:"id"`
-	SpecificationName string               `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	GoodTypeId        int64                `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	BuyPrice          float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	Manufacturer      int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer            int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Status            int64                `gorm:"column:status" json:"status" form:"status"`
-	OrgId             int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	GoodName          string               `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	RetailPrice       float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	PackingUnit       string               `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	PackingPrice      float64              `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	GoodNumber        string               `gorm:"column:good_number" json:"good_number" form:"good_number"`
-	StWarehousingInfo []*StWarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
-
-	WarehousingInfoOne     []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
-	WarehousingInfoStart   []*StartWarehousingInfo `gorm:"json:"warehouse_info_start"`
-	WarehousingInfoEnd     []*StartWarehousingInfo `gorm:"json:"warehouse_info_end"`
-	WarehouseOutInfoEnd    []*VmStockFlowTwenty
-	WarehouseOutInfoStart  []*VmStockFlowTwenty
-	WarehouseInfoEnd       []*VmStockFlowTwenty //期末入库量
-	StartFlowWarehouseInfo []*VmStockFlowTwenty //本期增加
+	ID                          int64                   `gorm:"column:id" json:"id" form:"id"`
+	SpecificationName           string                  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId                  int64                   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	BuyPrice                    float64                 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	Manufacturer                int64                   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                      int64                   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Status                      int64                   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                       int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	GoodName                    string                  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	RetailPrice                 float64                 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	PackingUnit                 string                  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64                 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	GoodNumber                  string                  `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	SocialSecurityDirectoryCode string                  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	MedicalInsuranceLevel       int64                   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	StWarehousingInfo           []*StWarehousingInfo    `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
+	WarehousingInfoOne          []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
+	WarehousingInfoStart        []*StartWarehousingInfo `gorm:"json:"warehouse_info_start"`
+	WarehousingInfoEnd          []*StartWarehousingInfo `gorm:"json:"warehouse_info_end"`
+	WarehouseOutInfoEnd         []*VmStockFlowTwenty
+	WarehouseOutInfoStart       []*VmStockFlowTwenty
+	WarehouseInfoEnd            []*VmStockFlowTwenty //期末入库量
+	StartFlowWarehouseInfo      []*VmStockFlowTwenty //本期增加
 
 	StWarehousingInfoTwo  []*StWarehousingInfoOne  `gorm:"json:"new_warehouse_info_start"` //期间增加
 	WarehouseOutInfoTenty []*WarehouseOutInfoTenty `gorm:"json:"new_warehouse_out_info"`   //减少
@@ -416,6 +418,7 @@ type VmBaseDrugTwenty struct {
 	Ctime                            int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                            int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                            int64             `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	MedicalInsuranceNumber           string            `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 	DrugFlowWarehouseInfo            []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_flow_info"`
 	DrugActFlowWarehouseInfo         []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_act_flow_info"`
 	DrugWarehouseInfoStart           []*DrugFlowTwenty //期初入库结余

service/mobile_dialysis_service.go

@@ -2384,7 +2384,7 @@ func MobileGetDialysisSolutionByModeId(orgID int64, patientID int64, mode_id int
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
 	dialysis_solution_str, _ := redis.Get(key).Result()
-
+	redis.Set(key, "", time.Second*60)
 	if len(dialysis_solution_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ? and solution_status=1", patientID, orgID, mode_id).Last(&record).Error
 		if err != nil {

service/patient_dataconfig_service.go

@@ -9,6 +9,7 @@ import (
 )
 
 func GetPatientByID(orgID int64, patientID int64) (*models.Patients, error) {
+
 	var patient models.Patients
 	err := readDb.Model(&models.Patients{}).Where("id = ? and user_org_id=? and status=1 and lapseto = 1", patientID, orgID).First(&patient).Error
 	if err != nil {

service/self_drug_service.go

@@ -2852,6 +2852,9 @@ func GetGoodNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 func GetGoodNewPurchaseStockQueryOne(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
 
 	db := XTReadDB().Model(&goodinfo).Where("status = 1")
+	if orgid == 10697 {
+		db = db.Where("find_in_set('停用',good_status) = 0")
+	}
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
 	if good_type > 0 {
@@ -2906,6 +2909,9 @@ func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 	if good_type > 0 {
 		db = db.Where("drug_type = ?", good_type)
 	}
+	if orgid == 10697 {
+		db = db.Where("find_in_set('停用',drug_status) = 0")
+	}
 
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)

service/stock_service.go

@@ -9673,6 +9673,51 @@ func GetGoodStockFlowNoProList(startTime int64, endTime int64, orgId int64) (flo
 	return flow, err
 }
 
+func GetLastMonthCount(startTime int64, orgId int64) (flow []*models.VmStockFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type = 1 or consumable_type = 10)")
+
+	if startTime > 0 {
+		db = db.Where("ctime <?", startTime)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetLastMonthOverCount(startTime int64, orgId int64) (flow []*models.VmStockFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type = 2 or consumable_type=3 or consumable_type=11)")
+
+	if startTime > 0 {
+		db = db.Where("ctime <?", startTime)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetLastCancelMonthCount(startTime int64, orgId int64) (flow []*models.VmStockFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type = 7)")
+
+	if startTime > 0 {
+		db = db.Where("ctime <?", startTime)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
 func GetDrugCodeOpen(user_org_id int64) (models.XtDrugCodeOpen, error) {
 
 	drugCodeOpen := models.XtDrugCodeOpen{}