11月8日库存管理

controllers/his_api_controller.go

@@ -897,6 +897,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									project_name = project.(map[string]interface{})["project_name"].(string)
 
 								}
+								fmt.Println("id3232322332232323323223322323", id)
 								if project_type == 3 {
 
 									//查找该耗材的出库记录
@@ -905,6 +906,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									//for _, it := range goodWarehouseInfo {
 									//	total_count += it.Count
 									//}
+
 									if len(goodWarehouseInfo) == 0 {
 										//查询耗材库存
 										list, _ := service.GetGoodWarehouseInfoSeven(project_id)
@@ -918,11 +920,22 @@ func (c *HisApiController) CreateHisPrescription() {
 											c.ServeDynamicFailJsonSend(project_name + "库存不足")
 											return
 										}
+										//查找今日该患者已经出库的所有耗材
+										goodList, _ := service.GetAllAutoRecordByPatient(patient_id, recordDateTime)
+										fmt.Println("goodList3323223232323232323", goodList)
+										for _, item := range goodList {
+											//回退库存
+											service.ModefyWarehouseInfo(item.Count, item.WarehouseInfotId)
+										}
+										//删除记录
+										service.DeleteAutoWarehouse(patient_id, recordDateTime)
 									}
 									if len(goodWarehouseInfo) > 0 {
 										//查询该患者耗材的历史数据
 										ordProject, _ := service.GetHisProjectPrescriptionByPatientIdOne(id)
+										fmt.Println("ordOr2323233232323232323223232", ordProject)
 										count, _ := strconv.ParseInt(ordProject.Count, 10, 64)
+										fmt.Println("id3232322332232323323223322323", id)
 										fmt.Println("parsetotal33223232323232323", parsetotal)
 										fmt.Println("count2332322332232332", count)
 										//数量发生改变
@@ -2355,6 +2368,10 @@ func (c *HisApiController) DeleteProject() {
 	service.CreateHisLabelRecord(&label)
 
 	if stockConfig.IsOpen == 1 {
+		if project.Type == 2 {
+			err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
+			fmt.Println(err)
+		}
 		if project.Type == 3 {
 			good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 			f_count, _ := strconv.ParseFloat(project.Count, 64)

controllers/print_data_api_controller.go

@@ -39,10 +39,15 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 	for _, item := range schedules {
 		list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
-		if this.GetAdminUserInfo().CurrentOrgId != 10101 {
+		if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
 			item.Count = list.Count
 		}
-
+		if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
+			dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+			fmt.Println("dialysis_count322333223322323", dialysis_count)
+			item.Patient.TotalDialysis = dialysis_count
+			item.Count = dialysis_count
+		}
 	}
 	if getScheduleErr != nil {
 		this.ErrorLog("获取打印透析记录失败：%v", getScheduleErr)

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -63,10 +63,10 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 			item.Patient.TotalDialysis = dialysis_count
 
 		}
-		if orgID == 10101 {
-			dialysis_count, _ := GetDialysisOrderCountOne(orgID, item.PatientID, item.ScheduleDate)
-			item.Patient.TotalDialysis = dialysis_count
-		}
+		//if orgID == 10101 {
+		//	dialysis_count, _ := GetDialysisOrderCountOne(orgID, item.PatientID, item.ScheduleDate)
+		//	item.Patient.TotalDialysis = dialysis_count
+		//}
 	}
 	return schedules, nil
 }
@@ -211,11 +211,15 @@ func GetDialysisOrderCountSeven(patient_id int64, recordDate int64) (models.VmDi
 	return order, err
 }
 
+//func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+//	err = p_service.XTReadDB().Where("dialysis_date >=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+//	return
+//}
+
 func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
-	err = p_service.XTReadDB().Where("dialysis_date >=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	err = p_service.XTReadDB().Model(&models.DialysisOrder{}).Where("dialysis_date >=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
 	return
 }
-
 func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
 
 	err = p_service.XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error