11月8日库存管理

controllers/his_api_controller.go

@@ -860,6 +860,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	if stockConfig.IsOpen == 1 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+
 			if len(prescriptions) > 0 {
 				for _, item := range prescriptions {
 
@@ -867,12 +868,19 @@ func (c *HisApiController) CreateHisPrescription() {
 					if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
 						projects := items["project"].([]interface{})
 						if len(projects) > 0 {
+
 							for _, project := range projects {
+
 								var project_id int64
 								var project_type int64
 								var totals float64
 								var project_name string
 								var parsetotal int64
+								var id int64
+
+								if project.(map[string]interface{})["id"] != nil || reflect.TypeOf(project.(map[string]interface{})["id"]).String() == "float64" {
+									id = int64(project.(map[string]interface{})["id"].(float64))
+								}
 								if project.(map[string]interface{})["project_id"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_id"]).String() == "float64" {
 									project_id = int64(project.(map[string]interface{})["project_id"].(float64))
 								}
@@ -884,17 +892,19 @@ func (c *HisApiController) CreateHisPrescription() {
 									totals, _ = strconv.ParseFloat(total, 64)
 									parsetotal, _ = strconv.ParseInt(total, 10, 64)
 								}
+
 								if project.(map[string]interface{})["project_name"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_name"]).String() == "string" {
 									project_name = project.(map[string]interface{})["project_name"].(string)
 
 								}
 								if project_type == 3 {
+
 									//查找该耗材的出库记录
 									goodWarehouseInfo, _ := service.GetAutoRecordByGoodIdSevenEight(project_id, patient_id, recordDateTime)
-									var total_count int64
-									for _, it := range goodWarehouseInfo {
-										total_count += it.Count
-									}
+									//var total_count int64
+									//for _, it := range goodWarehouseInfo {
+									//	total_count += it.Count
+									//}
 									if len(goodWarehouseInfo) == 0 {
 										//查询耗材库存
 										list, _ := service.GetGoodWarehouseInfoSeven(project_id)
@@ -911,21 +921,23 @@ func (c *HisApiController) CreateHisPrescription() {
 									}
 									if len(goodWarehouseInfo) > 0 {
 										//查询该患者耗材的历史数据
-										ordProject, _ := service.GetHisProjectPrescriptionByPatientId(patient_id, recordDateTime)
-										if total_count > 0 {
-											//数量发生改变
-											if parsetotal != total_count || len(ordProject) != len(projects) {
-												//查找今日该患者已经出库的所有耗材
-												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)
+										ordProject, _ := service.GetHisProjectPrescriptionByPatientIdOne(id)
+										count, _ := strconv.ParseInt(ordProject.Count, 10, 64)
+										fmt.Println("parsetotal33223232323232323", parsetotal)
+										fmt.Println("count2332322332232332", count)
+										//数量发生改变
+										if parsetotal != count {
+											//查找今日该患者已经出库的所有耗材
+											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)
 										}
+
 									}
 								}
 							}

controllers/schedule_api_controller.go

@@ -2946,6 +2946,7 @@ func (c *ScheduleApiController) GetSolutionSchedule() {
 
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	solution, _ := service.GetSolutionSchedule(orgId)
+	fmt.Println("solution33232323223233233323232332323232", solution)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"solution": solution,
 	})

service/schedule_service.go

@@ -1103,6 +1103,6 @@ func GetPatientScheduleTempalate(orgid int64) (models.PatientScheduleTemplateMod
 
 func GetSolutionSchedule(orgid int64) (solution []*models.DialysisSolution, err error) {
 
-	err = XTReadDB().Model(&solution).Where("org_id = ? and status = 1", orgid).Group("mode_id").Order("created_time desc").Find(&solution).Error
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("created_time desc").Find(&solution).Error
 	return solution, err
 }

service/stock_service.go

@@ -3569,6 +3569,12 @@ func GetHisProjectPrescriptionByPatientId(patientid int64, recorddate int64) (pr
 	return project, err
 }
 
+func GetHisProjectPrescriptionByPatientIdOne(id int64) (models.HisPrescriptionProject, error) {
+	project := models.HisPrescriptionProject{}
+	err = XTReadDB().Model(&project).Where("id = ? and status =1", id).Find(&project).Error
+	return project, err
+}
+
 func GetAllAutoRecordByPatient(patientid int64, recorddate int64) (auto []*models.WarehouseOutInfoNight, err error) {
 
 	err = XTReadDB().Select("count,warehouse_info_id").Where(" patient_id = ? and sys_record_time = ?  and status = 1 and is_sys = 1 and count>0", patientid, recorddate).Find(&auto).Error