11月8日库存管理

controllers/drug_stock_api_contorller.go

@@ -2278,6 +2278,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 	}
 	//扣减库存逻辑
 	for _, item := range cancelStockInfos {
+
 		var total_number int64
 		var out_number int64
 		var can_number int64
@@ -2292,7 +2293,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		//查询当前药品退库的批次号的总入库数
 		infoWareInfo, _ := service.GetDrugWarehouseInfo(item.BatchNumberId)
 		var total_count int64
-		total_count = infoWareInfo.StockMaxNumber*medical.MinNumber + infoWareInfo.StockMinNumber
+		total_count = infoWareInfo.WarehousingCount * medical.MinNumber
 		fmt.Println("当前批次总库存", total_count)
 
 		//查询该批次的出库数量
@@ -2309,6 +2310,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 				item.Count = item.Count
 			}
 		}
+
 		for _, item := range canInfo {
 			can_number += item.Count
 		}
@@ -2332,6 +2334,9 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			})
 			return
 		}
+
+		fmt.Println("hhhh233323232322323", total_number, total_count)
+
 		//判断退库数量是否大于总入库数量
 		if total_number > total_count {
 			service.UpdateDrugCancel(item.CancelStockId)
@@ -2344,6 +2349,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		//判断总退库数量是否大于出库数量
 		fmt.Println("该批次总退库数量", can_number+total_number)
 		fmt.Println("总出库数量", out_number)
+		fmt.Println("当前退库数量", total_number)
 		if can_number+total_number > out_number {
 			//清空退库单
 			service.UpdateDrugCancel(item.CancelStockId)

controllers/gobal_config_api_controller.go

@@ -1040,6 +1040,10 @@ func (c *GobalConfigApiController) GetPrintInfo() {
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	idsInters := dataBody["ids"].([]interface{})
+	advice_type, _ := c.GetInt64("advice_type")
+	stop_type, _ := c.GetInt64("stop_type")
+	fmt.Println("advcie_type23323232322332", advice_type)
+	fmt.Println("stop_type33332323223232323", stop_type)
 	if len(idsInters) == 0 {
 		if err != nil {
 			c.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除会员失败:（没有选择会员）")

controllers/mobile_api_controllers/patient_api_controller.go

@@ -975,6 +975,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	execution_time := c.GetString("execution_time")
+	fmt.Println("execution_time", execution_time)
 	groupno, _ := c.GetInt64("groupno", -1)
 
 	var ids []string
@@ -1060,7 +1061,14 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 			ExecutionTime: theTime.Unix(),
 			UpdatedTime:   time.Now().Unix(),
 		}
+		fmt.Println("ids2323232232323", ids)
 		service.ModifyExceDoctorAdviceById(&advicesinfo, ids)
+
+		project := models.HisPrescriptionProject{
+			ExecutionTime: theTime.Unix(),
+			Mtime:         time.Now().Unix(),
+		}
+		service.ModifyHisPrescriptionProject(&project, ids)
 	}
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)

service/dialysis_service.go

@@ -1219,6 +1219,17 @@ func ModifyExceDoctorAdviceById(m *models.HisDoctorAdviceInfo, ids []string) (er
 	return err
 }
 
+func ModifyHisPrescriptionProject(m *models.HisPrescriptionProject, ids []string) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.HisPrescriptionProject{}).Where("status = 1   AND id IN (?) AND execution_state = 1", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+	return err
+}
+
 func FindHisProjectById(orgID int64, id int64) (advice models.HisPrescriptionProject, err error) {
 	err = readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id=? and status=1 and id = ?", orgID, id).First(&advice).Error
 	return

service/gobal_config_service.go

@@ -166,9 +166,9 @@ func FindAdviceInitConfig(org_id int64) (adviceInit models.AdviceInit, err error
 func GetPrint(ids []int64, orgid int64) (doctor []*models.DoctorAdvice, err error) {
 
 	if len(ids) == 1 {
-		err = XTReadDB().Model(&doctor).Where("groupno = ? and user_org_id = ?", ids[0], orgid).Find(&doctor).Error
+		err = XTReadDB().Model(&doctor).Where("groupno = ? and user_org_id = ? and status = 1", ids[0], orgid).Find(&doctor).Error
 	} else {
-		err = XTReadDB().Model(&doctor).Where("groupno IN(?) and user_org_id = ?", ids, orgid).Find(&doctor).Error
+		err = XTReadDB().Model(&doctor).Where("groupno IN(?) and user_org_id = ? and status = 1", ids, orgid).Find(&doctor).Error
 	}
 
 	return doctor, err

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -267,7 +267,7 @@ type AssessmentBeforeDislysisVM struct {
 	DuctusArantii                  string  `gorm:"column:ductus_arantii" json:"ductus_arantii"`
 	EmergencyTreatment             int64   `gorm:"column:emergency_treatment" json:"emergency_treatment"`
 	EmergencyTreatmentOther        string  `gorm:"column:emergency_treatment_other" json:"emergency_treatment_other"`
-	DialysisCount                  int64   `gorm:"column:dialysis_count" json:"dialysis_count"`
+	DialysisCount                  string  `gorm:"column:dialysis_count" json:"dialysis_count"`
 	AssessmentDoctor               int64   `gorm:"column:assessment_doctor" json:"assessment_doctor"`
 	AssessmentTime                 int64   `gorm:"column:assessment_time" json:"assessment_time"`
 	MachineType                    string  `gorm:"column:machine_type" json:"machine_type"`