耗材参数

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3162,6 +3162,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 	if dataBody["goods"] != nil && reflect.TypeOf(dataBody["goods"]).String() == "[]interface {}" {
 		goods, _ := dataBody["goods"].([]interface{})
+
 		if len(goods) > 0 {
 			for _, item := range goods {
 				items := item.(map[string]interface{})
@@ -3188,7 +3189,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 				commdity_code := items["commdity_code"].(string)
-				fmt.Println("新建22222222222222", commdity_code)
+
 				adminUser := c.GetMobileAdminUserInfo()
 				prepare := &models.DialysisBeforePrepare{
 					UserOrgId:    adminUser.Org.Id,
@@ -3203,7 +3204,9 @@ func (c *DialysisAPIController) CreateConsumables() {
 					Modifier:     0,
 					CommdityCode: commdity_code,
 				}
+				//问题点
 				record_count := service.FindDialysisBeforePrepare(prepare.PatientId, prepare.GoodId, prepare.GoodTypeId, adminUser.Org.Id, record_time)
+
 				if record_count == 0 {
 					beforePrepares = append(beforePrepares, prepare)
 				}
@@ -3281,7 +3284,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 				ctime := int64(items["ctime"].(float64))
 
 				commdity_code := items["commdity_code"].(string)
-				fmt.Println("commdityecode22222222222222222222", commdity_code)
+
 				prepare := &models.DialysisBeforePrepare{
 					ID:           id,
 					UserOrgId:    adminUser.Org.Id,
@@ -3525,6 +3528,7 @@ func (c *DialysisAPIController) EditConsumables() {
 
 	var newBeforePrepares []*models.DialysisBeforePrepare
 
+	//判断是否开启自动出库
 	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
 
 	if record.IsOpen == 1 {
@@ -3585,7 +3589,7 @@ func (c *DialysisAPIController) EditConsumables() {
 					}
 
 					count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-
+					fmt.Println("count222222222222", count)
 					if items["ctime"] == nil || reflect.TypeOf(items["ctime"]).String() != "float64" {
 						utils.ErrorLog("ctime")
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3593,7 +3597,7 @@ func (c *DialysisAPIController) EditConsumables() {
 					}
 					ctime := int64(items["ctime"].(float64))
 					commdity_code := items["commdity_code"].(string)
-					fmt.Println("commdityecode22222222222222222222", commdity_code)
+
 					adminUser := c.GetMobileAdminUserInfo()
 					prepare := &models.DialysisBeforePrepare{
 						ID:           id,
@@ -3616,7 +3620,9 @@ func (c *DialysisAPIController) EditConsumables() {
 			}
 		}
 
+		//查询今日患者出库列表
 		consumables_source, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
+		fmt.Println("6666666666666", consumables_source)
 
 		if dataBody["new_goods"] != nil && reflect.TypeOf(dataBody["new_goods"]).String() == "[]interface {}" {
 			goods, _ := dataBody["new_goods"].([]interface{})
@@ -3645,6 +3651,7 @@ func (c *DialysisAPIController) EditConsumables() {
 					}
 
 					count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
+
 					//commdity_code := items["commdity_code"].(string)
 					//fmt.Println("commdityecode22222222222222222222",commdity_code)
 					adminUser := c.GetMobileAdminUserInfo()
@@ -3666,9 +3673,12 @@ func (c *DialysisAPIController) EditConsumables() {
 				}
 				newBeforePrepares = RemoveRepeatedGood(newBeforePrepares)
 			}
+
+			//创建数据
 			service.CreateDialysisBeforePrepare(newBeforePrepares)
 		}
 
+		//查询是否有出库单
 		out, err := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
 		if err == gorm.ErrRecordNotFound {
 			//没有记录，则创建出库单
@@ -3694,7 +3704,9 @@ func (c *DialysisAPIController) EditConsumables() {
 				Type:                    1,
 				IsSys:                   1,
 			}
+			//创建出库单
 			err := service.AddSigleWarehouseOut(&warehouseOut)
+			fmt.Println("err22222222222222", err)
 			if err != nil {
 				utils.TraceLog("创建出库单失败 err = %v", err)
 			} else {
@@ -3719,6 +3731,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						}
 						stockInInfo, _ := service.FindLastStockInInfoRecord(item.GoodId, adminInfo.Org.Id)
 						warehouseOutInfo.Price = stockInInfo.Price
+						//创建出库详情
 						err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 						if err == nil {
 							details := &models.AutomaticReduceDetail{
@@ -3738,11 +3751,13 @@ func (c *DialysisAPIController) EditConsumables() {
 					}
 				}
 			}
+			//没有出库单创建
 		} else if err == nil {
 
 			if len(newBeforePrepares) > 0 { //新增
 
 				for _, item := range newBeforePrepares {
+
 					outInfo, err := service.FindStockOutInfoByTypeId(adminInfo.Org.Id, item.GoodTypeId, item.GoodId, out.ID, out.WarehouseOutOrderNumber)
 
 					if err == gorm.ErrRecordNotFound {

models/user_models.go

@@ -523,7 +523,7 @@ func (XtPatientPasswayAssessment) TableName() string {
 type XtAerialDetection struct {
 	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
 	StartTime           int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	CreatedTime         int64  `gorm:"column:created_time" json:"created_ime" form:"created_time"`
+	CreatedTime         int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	Class               int64  `gorm:"column:class" json:"class" form:"class"`
 	DisinfectionMethods string `gorm:"column:disinfection_methods" json:"disinfection_methods" form:"disinfection_methods"`
 	DisinfectionFluid   string `gorm:"column:disinfection_fluid" json:"disinfection_fluid" form:"disinfection_fluid"`

service/dialysis_service.go

@@ -1122,7 +1122,7 @@ func UpdateDrugUserInfoDetails(drug_id int64, time int64, org_id int64, patient_
 }
 
 func FindDialysisBeforePrepare(patient_id int64, good_id int64, good_type_id int64, user_org_id int64, record_time int64) (count int64) {
-	readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ?  AND good_id = ? AND good_type_id = ? AND record_date = ? AND status = 1", user_org_id, patient_id, good_id, good_type_id, record_time).Count(&count)
+	readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ?  AND good_id = ? AND good_type_id = ? AND record_date = ? AND status = 1 AND count<> 0", user_org_id, patient_id, good_id, good_type_id, record_time).Count(&count)
 	return
 
 }

service/manage_service.go

@@ -1442,7 +1442,7 @@ func CreateAerialDetection(detection *models.XtAerialDetection) error {
 
 func GetAirList(limit int64, page int64, orgid int64) (airlist []*models.XtAerialDetection, total int64, err error) {
 	offset := (page - 1) * limit
-	err = XTReadDB().Model(&airlist).Where("user_org_id = ? and status =1", orgid).Count(&total).Limit(limit).Offset(offset).Find(&airlist).Error
+	err = XTReadDB().Model(&airlist).Where("user_org_id = ? and status =1", orgid).Count(&total).Limit(limit).Offset(offset).Order("created_time,ctime desc").Find(&airlist).Error
 	return airlist, total, err
 }
 
@@ -1474,7 +1474,7 @@ func SaveBodyDetection(detection *models.XtBodyDetection) error {
 func GetBodyList(limit int64, page int64, orgid int64) (body []*models.XtBodyDetection, total int64, err error) {
 
 	offset := (page - 1) * limit
-	err = XTReadDB().Model(&body).Where("user_org_id = ? and status =1", orgid).Count(&total).Limit(limit).Offset(offset).Find(&body).Error
+	err = XTReadDB().Model(&body).Where("user_org_id = ? and status =1", orgid).Count(&total).Limit(limit).Offset(offset).Order("created_time,ctime desc").Find(&body).Error
 	return body, total, err
 
 }

service/stock_service.go

@@ -2096,7 +2096,7 @@ func UpdateDrugStockOutInfoCount2(org_id int64, id int64, count int64) {
 
 func FindPatientAutomaticReduceRecord(org_id int64, record_time int64, good_id int64, good_type_id int64, patient_id int64) (count int64, err error) {
 
-	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("org_id = ? AND status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND record_time = ?", org_id, good_id, good_type_id, patient_id, record_time).Count(&count).Error
+	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("org_id = ? AND status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND record_time = ? AND count <> 0", org_id, good_id, good_type_id, patient_id, record_time).Count(&count).Error
 	return
 
 }
@@ -2139,7 +2139,7 @@ func GetStockInGoodInfo(orgId int64) (stockIn []*VMWarehousingInfo, err error) {
 }
 
 func GetAllStockOutUserDetail(patient_id int64, orgId int64, record_time int64) (goodUser []*models.DialysisBeforePrepare, err error) {
-	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND record_date = ? AND status = 1", patient_id, orgId, record_time).Find(&goodUser).Error
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND record_date = ? AND status = 1 AND count <> 0 ", patient_id, orgId, record_time).Find(&goodUser).Error
 	return
 }