11月8日库存管理

controllers/dialysis_record_api_controller.go

@@ -1349,72 +1349,72 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10215 || adminUserInfo.CurrentOrgId == 10233 || adminUserInfo.CurrentOrgId == 10223 || adminUserInfo.CurrentOrgId == 10243 || adminUserInfo.CurrentOrgId == 10340 {
 
-		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
-		if evaluation.SystolicBloodPressure == 0 {
-			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
-
-			pre := models.PredialysisEvaluation{
-				SystolicBloodPressure: evaluation.SystolicBloodPressure,
-			}
-			fmt.Println("prew", pre)
-			getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
-			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-
-			redis := service.RedisClient()
-			redis.Set(key, "", time.Second)
-			redis.Set(keyOne, "", time.Second)
-			defer redis.Close()
-			fmt.Println(getNurseErr)
-		}
-		if evaluation.DiastolicBloodPressure == 0 {
-			evaluation.DiastolicBloodPressure = fmonitorRecords.DiastolicBloodPressure
-			pres := models.PredialysisEvaluation{
-				DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
-			}
-			getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
-			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-
-			redis := service.RedisClient()
-			redis.Set(key, "", time.Second)
-
-			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-			redis.Set(keyOne, "", time.Second)
-			defer redis.Close()
-			fmt.Println(getNurseErr)
-		}
-		if evaluation.PulseFrequency == 0 {
-			evaluation.PulseFrequency = fmonitorRecords.PulseFrequency
-			press := models.PredialysisEvaluation{
-				PulseFrequency: evaluation.PulseFrequency,
-			}
-			getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
-			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-
-			redis := service.RedisClient()
-			redis.Set(key, "", time.Second)
-			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-			redis.Set(keyOne, "", time.Second)
-			defer redis.Close()
-			fmt.Println(getNurseErr)
-		}
-
-		if evaluation.Temperature == 0 {
-			evaluation.Temperature = fmonitorRecords.Temperature
-			press := models.PredialysisEvaluation{
-				Temperature: evaluation.Temperature,
-			}
-			getNurseErr := service.UpdatePredialysisEvaluationFour(&press, evaluation.ID)
-			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-
-			redis := service.RedisClient()
-			redis.Set(key, "", time.Second)
-			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-			redis.Set(keyOne, "", time.Second)
-			defer redis.Close()
-			fmt.Println(getNurseErr)
-		}
-
+		//evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+		//if evaluation.SystolicBloodPressure == 0 {
+		//	evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
+		//
+		//	pre := models.PredialysisEvaluation{
+		//		SystolicBloodPressure: evaluation.SystolicBloodPressure,
+		//	}
+		//	fmt.Println("prew", pre)
+		//	getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
+		//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+		//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+		//
+		//	redis := service.RedisClient()
+		//	redis.Set(key, "", time.Second)
+		//	redis.Set(keyOne, "", time.Second)
+		//	defer redis.Close()
+		//	fmt.Println(getNurseErr)
+		//}
+		//if evaluation.DiastolicBloodPressure == 0 {
+		//	evaluation.DiastolicBloodPressure = fmonitorRecords.DiastolicBloodPressure
+		//	pres := models.PredialysisEvaluation{
+		//		DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
+		//	}
+		//	getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
+		//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+		//
+		//	redis := service.RedisClient()
+		//	redis.Set(key, "", time.Second)
+		//
+		//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+		//	redis.Set(keyOne, "", time.Second)
+		//	defer redis.Close()
+		//	fmt.Println(getNurseErr)
+		//}
+		//if evaluation.PulseFrequency == 0 {
+		//	evaluation.PulseFrequency = fmonitorRecords.PulseFrequency
+		//	press := models.PredialysisEvaluation{
+		//		PulseFrequency: evaluation.PulseFrequency,
+		//	}
+		//	getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
+		//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+		//
+		//	redis := service.RedisClient()
+		//	redis.Set(key, "", time.Second)
+		//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+		//	redis.Set(keyOne, "", time.Second)
+		//	defer redis.Close()
+		//	fmt.Println(getNurseErr)
+		//}
+		//
+		//if evaluation.Temperature == 0 {
+		//	evaluation.Temperature = fmonitorRecords.Temperature
+		//	press := models.PredialysisEvaluation{
+		//		Temperature: evaluation.Temperature,
+		//	}
+		//	getNurseErr := service.UpdatePredialysisEvaluationFour(&press, evaluation.ID)
+		//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+		//
+		//	redis := service.RedisClient()
+		//	redis.Set(key, "", time.Second)
+		//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+		//	redis.Set(keyOne, "", time.Second)
+		//	defer redis.Close()
+		//	fmt.Println(getNurseErr)
+		//}
+		//
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

controllers/drug_stock_api_contorller.go

@@ -3875,8 +3875,7 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	if order_type == 2 {
-		//list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId)
-		list, err := service.GetDrugOutOrderPrintList(startTime, endTime, orgId)
+		list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"list": list,

controllers/gobal_config_api_controller.go

@@ -118,6 +118,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/changeadviceconfig", &GobalConfigApiController{}, "Get:ChangeAdviceConfig")
 
 	beego.Router("/api/changeprescriptionconfig", &GobalConfigApiController{}, "Get:ChangePrescriptionConfig")
+
+	beego.Router("/api/changedrugopenconfig", &GobalConfigApiController{}, "Get:ChangeDrugOpenConfig")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1567,12 +1569,15 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	adviceSetting, _ := service.FindAdviceSettingById(adminUserInfo.CurrentOrgId)
 
 	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminUserInfo.CurrentOrgId)
+
+	drugOutConfig, _ := service.FindDrugOutConfigById(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"is_open_xt_his":         config.IsOpen,
 		"is_open_xt_his_project": project_config.IsOpen,
 		"is_open_stock":          stockSetting.IsType,
 		"is_open_advice":         adviceSetting.IsAdviceOpen,
 		"is_prescription_advice": prescriptionConfig.IsOpen,
+		"is_open":                drugOutConfig.IsOpen,
 	})
 
 }
@@ -2239,7 +2244,7 @@ func (c *GobalConfigApiController) GetDrugOutOrderPrint() {
 
 	warehousing, _ := service.GetExportOutOrderDrugListOne(ids)
 
-	drug_warhouse_out, _ := service.GetDrugWarehouseOutTenty(ids)
+	drug_warhouse_out, _ := service.GetDrugWarehouseOutTenty(ids, admin.CurrentOrgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"info":              info,
@@ -2437,3 +2442,27 @@ func (c *GobalConfigApiController) ChangePrescriptionConfig() {
 	}
 
 }
+
+func (c *GobalConfigApiController) ChangeDrugOpenConfig() {
+
+	drug_out_open, _ := c.GetInt64("drug_out_open")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	_, errcode := service.GetDrugOpenConfig(orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		config := models.DrugOutConfig{
+			UserOrgId: orgId,
+			IsOpen:    drug_out_open,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+		}
+		service.CreateDrugOutConfig(config)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	} else if errcode == nil {
+		service.UpdateDrugOutConfig(orgId, drug_out_open)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": 1,
+		})
+	}
+}

models/drug_stock.go

@@ -467,3 +467,30 @@ type DrugWarehouseOutInfoTenty struct {
 func (DrugWarehouseOutInfoTenty) TableName() string {
 	return "xt_drug_warehouse_out_info"
 }
+
+type DrugWarehouseOutTwenty struct {
+	ID                        int64                     `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutOrderNumber   string                    `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	OperationTime             int64                     `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	Creater                   int64                     `gorm:"column:creater" json:"creater" form:"creater"`
+	OrgId                     int64                     `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                  int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Remark                    string                    `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                     int64                     `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64                     `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                    int64                     `gorm:"column:status" json:"status" form:"status"`
+	WarehouseOutTime          int64                     `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
+	Dealer                    int64                     `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64                     `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type                      int64                     `gorm:"column:type" json:"type" form:"type"`
+	IsSys                     int64                     `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SupplyCancelOutId         int64                     `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId         int64                     `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	StorehouseId              int64                     `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseId         int64                     `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
+	DrugWarehouseOutInfoTenty DrugWarehouseOutInfoTenty `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutId"json:"xt_drug_warehouse_out_info" `
+}
+
+func (DrugWarehouseOutTwenty) TableName() string {
+	return "xt_drug_warehouse_out"
+}

models/stock_models.go

@@ -1378,3 +1378,16 @@ type XtPrescriptionConfig struct {
 func (XtPrescriptionConfig) TableName() string {
 	return "xt_prescription_config"
 }
+
+type DrugOutConfig struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	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 (DrugOutConfig) TableName() string {
+	return "xt_drug_out_config"
+}

service/stock_service.go

@@ -4688,9 +4688,13 @@ func GetDrugWarehouseOut(warehouse_out_id []string) (out []*models.StDrugWarehou
 	return out, err
 }
 
-func GetDrugWarehouseOutTenty(warehouse_out_id []string) (out []*models.DrugWarehouseOutInfoTenty, err error) {
+func GetDrugWarehouseOutTenty(warehouse_out_id []string, orgid int64) (out []*models.DrugWarehouseOutTwenty, err error) {
+
+	err = XTReadDB().Where("id in(?)", warehouse_out_id).
+		Preload("DrugWarehouseOutInfoTenty", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1", orgid).Preload("BaseDrugLib", "status = 1 and org_id = ?", orgid)
+		}).Find(&out).Error
 
-	err = XTReadDB().Where("warehouse_out_id in(?)", warehouse_out_id).Preload("BaseDrugLib", "status = 1").Find(&out).Error
 	return out, err
 }
 
@@ -6794,3 +6798,35 @@ func UpdateWarehouseInfoTentyThree(count int64, id int64) error {
 
 	return err
 }
+
+func GetDrugOpenConfig(orgid int64) (*models.DrugOutConfig, error) {
+
+	config := models.DrugOutConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &config, nil
+}
+
+func CreateDrugOutConfig(config models.DrugOutConfig) error {
+
+	err := XTWriteDB().Create(&config).Error
+	return err
+}
+
+func UpdateDrugOutConfig(orgid int64, drug_out_open int64) error {
+
+	err := XTWriteDB().Model(&models.DrugOutConfig{}).Where("user_org_id = ? and status = 1", orgid).Update(map[string]interface{}{"is_open": drug_out_open}).Error
+	return err
+}
+
+func FindDrugOutConfigById(orgid int64) (models.DrugOutConfig, error) {
+
+	config := models.DrugOutConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	return config, err
+}