耗材参数

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -161,4 +161,6 @@ func MobileAPIControllersRegisterRouters() {
 	//医嘱批量执行
 	beego.Router("/m/api/batchadviceexecution", &DialysisAPIController{}, "Get:BatchAdviceExecution")
 
+	beego.Router("/m/api/updatestockgoods", &DialysisAPIController{}, "Get:UpdateStockGoods")
+
 }

controllers/patient_api_controller.go

@@ -1571,7 +1571,6 @@ func (c *PatientApiController) ExecGroupAdvice() {
 
 func (c *PatientApiController) ExecDoctorAdvice() {
 
-	fmt.Println("hhhhhhhhhhhhhhh9999999999")
 	origin, _ := c.GetInt64("origin", 0)
 
 	patient, _ := c.GetInt64("patient", 0)
@@ -1650,10 +1649,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//药品管理信息
 		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
-
+		fmt.Println("999999992322322323232", drugStockConfig.IsOpen)
 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.CurrentOrgId)
-		fmt.Println("9999999999999999999999999", drugStockConfig.IsOpen)
+
 		if drugStockConfig.IsOpen == 1 {
 			//查询已经执行的医嘱
 			//advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)

controllers/stock_in_api_controller.go

@@ -88,6 +88,7 @@ func StockManagerApiRegistRouters() {
 
 	beego.Router("/api/good/getorderdetialbyorderid", &StockManagerApiController{}, "Get:GetOrderDetialByOrderId")
 	beego.Router("/api/good/getorderdetaibyid", &StockManagerApiController{}, "Get:GetOrderDetailById")
+	beego.Router("/api/good/getsingleoutorderdetail", &StockManagerApiController{}, "Get:GetSingleOutOrderDetail")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -1129,6 +1130,8 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 				manufacturer := int64(items["manufacturer"].(float64))
 
+				number := items["number"].(string)
+				fmt.Println("number22222222222222", number)
 				warehouseOutInfo := &models.WarehouseOutInfo{
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 					WarehouseOutId:          warehouseOut.ID,
@@ -1143,6 +1146,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					OrgId:                   adminUserInfo.CurrentOrgId,
 					Type:                    types,
 					Manufacturer:            manufacturer,
+					Number:                  number,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1279,6 +1283,7 @@ func (c *StockManagerApiController) GetWarehouseOutInfoList() {
 }
 func (c *StockManagerApiController) EditWarehouseOut() {
 	warehouse_out_time := c.GetString("warehouse_out_time")
+
 	id, _ := c.GetInt64("id", 0)
 	types, _ := c.GetInt64("type", 0)
 
@@ -1365,6 +1370,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 				id := int64(items["id"].(float64))
 
 				manufacturer := int64(items["manufacturer"].(float64))
+
+				number := items["number"].(string)
 				if id == 0 {
 					warehouseOutInfo := &models.WarehouseOutInfo{
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1381,6 +1388,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						Type:                    types,
 						IsSys:                   0,
 						SysRecordTime:           0,
+						Number:                  number,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1417,6 +1425,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						Manufacturer:            manufacturer,
 						IsSys:                   is_sys,
 						SysRecordTime:           sys_record_time,
+						Number:                  number,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
@@ -3800,3 +3809,19 @@ func (this *StockManagerApiController) GetOrderDetailById() {
 		return
 	}
 }
+
+func (this *StockManagerApiController) GetSingleOutOrderDetail() {
+	id, _ := this.GetInt64("id", 0)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	warehouseOutInfo, _ := service.GetOrderDetialByOrderId(id, orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	goodType, _ := service.GetAllGoodType(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             warehouseOutInfo,
+		"dealerList":       dealerList,
+		"manufacturerList": manufacturerList,
+		"goodType":         goodType,
+	})
+}

models/good_models.go

@@ -22,61 +22,62 @@ func (GoodsType) TableName() string {
 }
 
 type GoodInfo struct {
-	ID                          int64     `gorm:"column:id" json:"id" form:"id"`
-	GoodCode                    string    `gorm:"column:good_code" json:"good_code" form:"good_code"`
-	SpecificationName           string    `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	GoodTypeId                  int64     `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	GoodUnit                    int64     `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
-	BuyPrice                    float64   `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	SellPrice                   float64   `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
-	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"`
-	Manufacturer                int64     `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                      int64     `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	ExpiryDateWarnDayCount      int64     `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
-	StockWarnCount              int64     `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
-	IsReuse                     int64     `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
-	Status                      int64     `gorm:"column:status" json:"status" form:"status"`
-	FilmArea                    string    `gorm:"column:film_area" json:"film_area" form:"film_area"`
-	IsUse                       int64     `gorm:"column:is_use" json:"is_use" form:"is_use"`
-	FilmMaterialQuality         string    `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
-	OrgId                       int64     `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Modifier                    int64     `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Creater                     int64     `gorm:"column:creater" json:"creater" form:"creater"`
-	GoodName                    string    `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	Pinyin                      string    `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                        string    `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	GoodKind                    int64     `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
-	MedicalInsuranceLevel       int64     `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	RetailPrice                 float64   `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	MedicalInsuranceNumber      string    `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	IsSpecialDiseases           int64     `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
-	IsRecord                    int64     `gorm:"column:is_record" json:"is_record" form:"is_record"`
-	StatisticsCategory          int64     `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
-	GoodStatus                  string    `gorm:"column:good_status" json:"good_status" form:"good_status"`
-	DefaultCount                int64     `gorm:"column:default_count" json:"default_count" form:"default_count"`
-	Sign                        int64     `gorm:"column:sign" json:"sign" form:"sign"`
-	IsDefault                   int64     `gorm:"column:is_default" json:"is_default" form:"is_default"`
-	IsChargeUse                 int64     `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
-	IsChargePredict             int64     `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
-	IsStatisticsWork            int64     `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
-	Sort                        int64     `gorm:"column:sort" json:"sort" form:"sort"`
-	IsDoctorUse                 int64     `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
-	Agent                       string    `gorm:"column:agent" json:"agent" form:"agent"`
-	GoodNumber                  string    `gorm:"column:good_number" json:"good_number" form:"good_number"`
-	GoodsType                   GoodsType `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
-	CommdityCode                string    `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
-	SocialSecurityDirectoryCode string    `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
-	ProductionType              string    `gorm:"column:production_type" json:"production_type" form:"production_type"`
-	SpecialMedical              string    `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
-	IsMark                      int64     `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
-	MinNumber                   int64     `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	PackingUnit                 string    `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	PackingPrice                float64   `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	DefaultCountUnit            string    `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
-	MinUnit                     string    `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Total                       float64   `gorm:"column:total" json:"total" form:"total"`
+	ID                          int64                `gorm:"column:id" json:"id" form:"id"`
+	GoodCode                    string               `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName           string               `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId                  int64                `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit                    int64                `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice                    float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice                   float64              `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	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"`
+	Manufacturer                int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                      int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount      int64                `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount              int64                `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                     int64                `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                      int64                `gorm:"column:status" json:"status" form:"status"`
+	FilmArea                    string               `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                       int64                `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality         string               `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                       int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                    int64                `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                     int64                `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName                    string               `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                      string               `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string               `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind                    int64                `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel       int64                `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice                 float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber      string               `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	IsSpecialDiseases           int64                `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64                `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	StatisticsCategory          int64                `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	GoodStatus                  string               `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	DefaultCount                int64                `gorm:"column:default_count" json:"default_count" form:"default_count"`
+	Sign                        int64                `gorm:"column:sign" json:"sign" form:"sign"`
+	IsDefault                   int64                `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargeUse                 int64                `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	IsChargePredict             int64                `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64                `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	Sort                        int64                `gorm:"column:sort" json:"sort" form:"sort"`
+	IsDoctorUse                 int64                `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
+	Agent                       string               `gorm:"column:agent" json:"agent" form:"agent"`
+	GoodNumber                  string               `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	GoodsType                   GoodsType            `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
+	CommdityCode                string               `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	SocialSecurityDirectoryCode string               `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	ProductionType              string               `gorm:"column:production_type" json:"production_type" form:"production_type"`
+	SpecialMedical              string               `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
+	IsMark                      int64                `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	MinNumber                   int64                `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingUnit                 string               `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64              `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DefaultCountUnit            string               `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
+	MinUnit                     string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Total                       float64              `gorm:"column:total" json:"total" form:"total"`
+	StWarehousingInfo           []*StWarehousingInfo `gorm:"ForeignKey:good_id;AssociationForeignKey:ID" json:"xt_warehouse_info"`
 }
 
 func (GoodInfo) TableName() string {

models/stock_models.go

@@ -70,6 +70,35 @@ func (Warehousing) TableName() string {
 	return "xt_warehouse"
 }
 
+type StWarehousingInfo struct {
+	ID               int64   `gorm:"column:id" json:"id"`
+	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id"`
+	GoodId           int64   `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId       int64   `gorm:"column:good_type_id" json:"good_type_id"`
+	Number           string  `gorm:"column:number" json:"number"`
+	ProductDate      int64   `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count"`
+	WarehousingUnit  string  `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	Price            float64 `gorm:"column:price" json:"price"`
+	TotalPrice       float64 `gorm:"column:total_price" json:"total_price"`
+	Dealer           int64   `gorm:"column:dealer" json:"dealer"`
+	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer"`
+	Remark           string  `gorm:"column:remark" json:"remark"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime"`
+	Status           int64   `gorm:"column:status" json:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id"`
+	IsReturn         int64   `gorm:"column:is_return" json:"is_return"`
+	StockCount       int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	WarehousingOrder string  `gorm:"column:warehousing_order" json:"warehousing_order"`
+	Type             int64   `gorm:"column:type" json:"type"`
+}
+
+func (StWarehousingInfo) TableName() string {
+	return "xt_warehouse_info"
+}
+
 type WarehousingInfo struct {
 	ID               int64       `gorm:"column:id" json:"id"`
 	WarehousingId    int64       `gorm:"column:warehousing_id" json:"warehousing_id"`
@@ -129,7 +158,7 @@ type VmWarehousingInfo struct {
 	GoodName          string      `gorm:"column:good_name" json:"good_name"`
 	SpecificationName string      `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	MinNumber         int64       `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit           string      `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	PackingUnit       string      `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 }
 
 type WarehouseOut struct {
@@ -183,6 +212,7 @@ type WarehouseOutInfo struct {
 	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys"`
 	SysRecordTime           int64        `gorm:"column:sys_record_time" json:"sys_record_time"`
 	PatientId               int64        `gorm:"column:patient_id" json:"patient_id"`
+	Number                  string       `gorm:"column:number" json:"number" form:"number"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -390,4 +420,41 @@ type WarehouseOutInfoOne struct {
 	MinNumber               int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	PackingPrice            float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	MinUnit                 string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	PackingUnit             string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+}
+
+type WarehouseOutInfoTwo struct {
+	ID                      int64                `gorm:"column:id" json:"id"`
+	WarehouseOutId          int64                `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
+	WarehouseInfotId        int64                `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
+	GoodId                  int64                `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId              int64                `gorm:"column:good_type_id" json:"good_type_id"`
+	WarehousingOutTarget    int64                `gorm:"column:warehousing_out_target" json:"warehousing_out_target"`
+	Count                   int64                `gorm:"column:count" json:"count"`
+	Price                   float64              `gorm:"column:price" json:"price"`
+	TotalPrice              float64              `gorm:"column:total_price" json:"total_price"`
+	ProductDate             int64                `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate              int64                `gorm:"column:expiry_date" json:"expiry_date"`
+	Mtime                   int64                `gorm:"column:mtime" json:"mtime"`
+	Ctime                   int64                `gorm:"column:ctime" json:"ctime"`
+	Status                  int64                `gorm:"column:status" json:"status"`
+	OrgId                   int64                `gorm:"column:org_id" json:"org_id"`
+	Remark                  string               `gorm:"column:remark" json:"remark"`
+	IsCancel                int64                `gorm:"column:is_cancel" json:"is_cancel"`
+	WarehouseOutOrderNumber string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
+	Type                    int64                `gorm:"column:type" json:"type"`
+	Dealer                  int64                `gorm:"column:dealer" json:"dealer"`
+	Manufacturer            int64                `gorm:"column:manufacturer" json:"manufacturer"`
+	IsSys                   int64                `gorm:"column:is_sys" json:"is_sys"`
+	SysRecordTime           int64                `gorm:"column:sys_record_time" json:"sys_record_time"`
+	PatientId               int64                `gorm:"column:patient_id" json:"patient_id"`
+	GoodName                string               `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	SpecificationName       string               `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	MinNumber               int64                `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingPrice            float64              `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	MinUnit                 string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Number                  string               `gorm:"column:number" json:"number" form:"number"`
+	PackingUnit             string               `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	StWarehousingInfo       []*StWarehousingInfo `gorm:"ForeignKey:good_id;AssociationForeignKey:GoodId" json:"xt_warehouse_info"`
 }

service/mobile_dialysis_service.go

@@ -2140,6 +2140,12 @@ func DeleteAutoReduceDetail(good_id int64, record_time int64, patient_id int64)
 	return err
 }
 
+func DeleteDialysisBeforOne(good_id int64, record_time int64, patient_id int64) error {
+	detail := models.DialysisBeforePrepare{}
+	err := XTWriteDB().Model(&detail).Where("good_id = ? and status = 1 and record_date = ? and patient_id = ?", good_id, record_time, patient_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
 func BatchAdviceCheck(ids []string, creator int64) error {
 
 	advice := models.XtDoctorAdvice{}
@@ -2237,3 +2243,18 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 
 	return vms, err
 }
+
+func UpdateStockGoods(good_id int64, record_time int64, patient_id int64, count int64) error {
+
+	prepare := models.DialysisBeforePrepare{}
+
+	err := XTWriteDB().Model(&prepare).Where("good_id= ? and record_date = ? and patient_id = ? and count  <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
+	return err
+}
+
+func UPdateAutoStockGoods(good_id int64, record_time int64, patient_id int64, count int64) error {
+
+	detail := models.AutomaticReduceDetail{}
+	err := XTWriteDB().Model(&detail).Where("good_id = ? and record_time = ? and patient_id = ? and count <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
+	return err
+}

service/stock_service.go

@@ -891,11 +891,11 @@ func CreateWarehousingOutInfo(warehouseOutInfo []*models.WarehouseOutInfo) (err
 	if len(warehouseOutInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(warehouseOutInfo) > 0 {
-			thisSQL := "INSERT INTO xt_warehouse_out_info (warehouse_out_id, good_id, good_type_id, product_date,expiry_date,count,price,total_price,remark,ctime,status,org_id,warehouse_out_order_number,type,dealer,manufacturer) VALUES "
+			thisSQL := "INSERT INTO xt_warehouse_out_info (warehouse_out_id, good_id, good_type_id, product_date,expiry_date,count,price,total_price,remark,ctime,status,org_id,warehouse_out_order_number,type,dealer,manufacturer,number) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehouseOutInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehouseOutId)
 				insertData = append(insertData, info.GoodId)
 				insertData = append(insertData, info.GoodTypeId)
@@ -912,7 +912,7 @@ func CreateWarehousingOutInfo(warehouseOutInfo []*models.WarehouseOutInfo) (err
 				insertData = append(insertData, info.Type)
 				insertData = append(insertData, info.Dealer)
 				insertData = append(insertData, info.Manufacturer)
-
+				insertData = append(insertData, info.Number)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -2677,7 +2677,9 @@ func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, e
 	db := XTReadDB().Model(&good).Where("org_id =? and status = 1", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		err = db.Where("(good_name Like ?)", likekey).Find(&good).Error
+		err = db.Where("(good_name Like ?)", likekey).Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid)
+		}).Find(&good).Error
 	} else {
 		err = db.Find(&good).Error
 	}
@@ -2694,7 +2696,7 @@ func GetAutoMaticReduceDetail(orgid int64, patient_id int64, recordtime int64, g
 
 	var autoreduece models.BloodAutomaticReduceDetail
 	var err error
-	err = XTReadDB().Model(&autoreduece).Where("org_id = ? and patient_id = ?  and status = 1 and record_time = ? and good_id = ? and good_type_id = ?", orgid, patient_id, recordtime, goodid, goodtypeid).Find(&autoreduece).Error
+	err = XTReadDB().Model(&autoreduece).Where("org_id = ? and patient_id = ?  and status = 1 and record_time = ? and good_id = ? and good_type_id = ? and count<> 0", orgid, patient_id, recordtime, goodid, goodtypeid).Find(&autoreduece).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -2759,7 +2761,7 @@ func GetAllStockList(page int64, limit int64, startime int64, endtime int64, goo
 	if good_type > 0 {
 		db = db.Where("t.good_type_id = ?", good_type)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit,t.manufacturer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.manufacturer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&info).Error
 	return info, total, err
 }
 
@@ -2870,7 +2872,7 @@ func GetOrderDetialByOrderId(id int64, orgid int64) (out []*models.WarehouseOutI
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
@@ -2884,3 +2886,10 @@ func FindUserDetailByIdOne(good_id int64, record_time int64, org_id int64) (user
 	err = db.Find(&user).Error
 	return
 }
+
+func GetGoodInformationByGoodId(good_id int64) (models.GoodInfo, error) {
+
+	info := models.GoodInfo{}
+	err := XTReadDB().Where("id = ? and status = 1", good_id).Find(&info).Error
+	return info, err
+}

service/warhouse_service.go

@@ -633,12 +633,16 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 
 	//查询该患者当天已经出库的耗材信息
 	goods_yc, _ := FindConsumablesByDateTwo(orgID, patient_id, record_time)
-	for _, item := range goods_yc {
-		fmt.Println("item0000000000000", item.Count)
-	}
-	for _, item := range goods {
-		fmt.Println("item1111111111111", item.Count)
-	}
+	//for _, item := range goods_yc {
+	//	fmt.Println("已经出库的耗材新消息  -----------------------------------------", item.Count)
+	//}
+	//for _, item := range goods {
+	//	fmt.Println("新传进来来的耗材新消息0000000000000000000000000000000000000000000000000", item.Count)
+	//}
+	//
+	//for _,item :=range goodOne{
+	//    fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",item.Count)
+	//}
 	// 和新请求的出库数据进行对比，分出那些是继续出库的，那些是需要删除出库的
 	for i := len(goods_yc) - 1; i >= 0; i-- {
 		goods_yc_temp := goods_yc[i]
@@ -652,25 +656,25 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 					goods = append(goods[:j], goods[j+1:]...)
 					break
 				}
-				fmt.Println("998888888888888", goods_yc_temp.Count)
-				fmt.Println("7777777777777777", goods_temp.Count)
+				//fmt.Println("998888888888888", goods_yc_temp.Count)
+				//fmt.Println("7777777777777777", goods_temp.Count)
 				// 如果已经出库的数量 大于 新请求出库的数量，则代表需要删除出库
 				if goods_yc_temp.Count > goods_temp.Count {
-					fmt.Println("进来了是吗")
+
 					temp_count := goods_yc_temp.Count - goods_temp.Count
 					goods_yc[i].Count = temp_count
 					goods = append(goods[:j], goods[j+1:]...)
 					break
 				}
-				fmt.Println("555555555555", goods_yc_temp.Count)
-				fmt.Println("444444444444", goods_temp.Count)
+				//fmt.Println("555555555555", goods_yc_temp.Count)
+				//fmt.Println("444444444444", goods_temp.Count)
 				// 如果已经出库的数量 小于 新请求出库的梳理，则代表需要增加出库
 				if goods_yc_temp.Count < goods_temp.Count {
 					temp_count := goods_temp.Count - goods_yc_temp.Count
-					fmt.Println("988888888888888", temp_count)
+					//fmt.Println("988888888888888", temp_count)
 					goods[j].Count = temp_count
 					goods_yc = append(goods_yc[:i], goods_yc[i+1:]...)
-					fmt.Println("888888888", goods_yc)
+					//fmt.Println("888888888", goods_yc)
 					break
 				}
 			}
@@ -678,7 +682,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 	}
 
 	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
-	// goods 这个数据就是需要出库的耗材的数据
+	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
 	fmt.Println("goods222222222222", goods)
 	fmt.Println("goodsy999999999999", goods_yc)
 	if len(goods) > 0 {
@@ -718,7 +722,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 		for _, item := range goods {
 			var newCount int64 = 0
 			for _, it := range goodOne {
-				if item.GoodTypeId == it.GoodTypeId && it.GoodId == it.GoodId {
+				if item.GoodTypeId == it.GoodTypeId && item.GoodId == it.GoodId {
 					newCount = it.Count
 				}
 			}
@@ -727,20 +731,10 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 				GoodId:     item.GoodId,
 				Count:      item.Count,
 			}
-
+			fmt.Println("count0000000000000000000000000000000", newCount)
 			ConsumablesDelivery(orgID, patient_id, record_time, &prepare, &out, newCount)
 		}
 
-		// for _, item := range goodOne {
-		// 	prepare := models.DialysisBeforePrepare{
-		// 		GoodTypeId: item.GoodTypeId,
-		// 		GoodId:     item.GoodId,
-		// 		Count:      item.Count,
-		// 		NewCount:   item.NewCount,
-		// 	}
-		// 	fmt.Println("数量99999999999999999", item.Count)
-		// 	ConsumablesDelivery(orgID, patient_id, record_time, &prepare, &out, item.Count)
-		// }
 	}
 
 	if len(goods_yc) > 0 {
@@ -821,12 +815,16 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				}
 				//查询当天耗材是否已经存在数据
 				_, errcode := GetAutoMaticReduceDetail(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
+
+				fmt.Println("errcode00000000000000000000000000000000000000", errcode)
 				if errcode == gorm.ErrRecordNotFound {
 					errTwo := CreateAutoReduceRecord(&details)
 					if errTwo != nil {
 						return errTwo
 					}
 				} else if errcode == nil {
+					fmt.Println("sql999999999999999999999999999999999999999")
+
 					DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
 					CreateAutoReduceRecord(&details)
 				}
@@ -849,6 +847,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				GoodId:                  goods.GoodId,
 				PatientId:               patient_id,
 			}
+			fmt.Println("count9999999999999999999999999999999999999", count)
 			warehouseOutInfo.Count = count
 			//更新入库详情表
 			UpdateAutoMaticReduceDetail(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID, warehouseOutInfo)
@@ -874,7 +873,6 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				}
 			} else if errcode == nil {
 				DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
-
 				CreateAutoReduceRecord(&details)
 			}
 		}
@@ -1116,7 +1114,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 
 func GetAutoReduceRecordInfoByPatientId(orgid int64, patient_id int64, recordTime int64) (autoReduce []*models.AutomaticReduceDetail, err error) {
 
-	err = XTReadDB().Model(&autoReduce).Where("org_id = ? and patient_id = ? and record_time = ? and status = 1 and count<>0", orgid, patient_id, recordTime).Find(&autoReduce).Error
+	err = XTReadDB().Model(&autoReduce).Where("org_id = ? and patient_id = ? and record_time = ? and status = 1", orgid, patient_id, recordTime).Find(&autoReduce).Error
 	return autoReduce, err
 }
 
@@ -1126,6 +1124,12 @@ func DeleteDialysisBefor(orgid int64, patient_id int64, record_date int64, goodi
 	return err
 }
 
+func DeleteDialysisBeforThree(orgid int64, patient_id int64, record_date int64) error {
+	prepare := models.DialysisBeforePrepare{}
+	err := XTWriteDB().Model(&prepare).Where("user_org_id = ? and patient_id = ? and record_date = ? and status = 1", orgid, patient_id, record_date).Updates(map[string]interface{}{"status": 0, "count": 0, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
 func ConsumablesDeliveryTotalOne(orgID int64, patient_id int64, record_time int64, goods []*models.DialysisBeforePrepareGoods, goodOne []*models.NewDialysisBeforePrepareGoods) (err error) {
 
 	//查询该患者当天已经出库的耗材信息
@@ -1279,7 +1283,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			Type:                    1,
 			Manufacturer:            0,
 			Dealer:                  0,
-			IsSys:                   1,
+			IsSys:                   0,
 			SysRecordTime:           record_time,
 			GoodTypeId:              goods.GoodTypeId,
 			GoodId:                  goods.GoodId,
@@ -1307,7 +1311,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 				Type:                    1,
 				Manufacturer:            0,
 				Dealer:                  0,
-				IsSys:                   1,
+				IsSys:                   0,
 				SysRecordTime:           record_time,
 				GoodTypeId:              goods.GoodTypeId,
 				GoodId:                  goods.GoodId,
@@ -1347,7 +1351,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			Type:                    1,
 			Manufacturer:            0,
 			Dealer:                  0,
-			IsSys:                   1,
+			IsSys:                   0,
 			SysRecordTime:           record_time,
 			GoodTypeId:              goods.GoodTypeId,
 			GoodId:                  goods.GoodId,
@@ -1387,7 +1391,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 				Type:                    1,
 				Manufacturer:            0,
 				Dealer:                  0,
-				IsSys:                   1,
+				IsSys:                   0,
 				SysRecordTime:           record_time,
 				GoodTypeId:              goods.GoodTypeId,
 				GoodId:                  goods.GoodId,
@@ -1430,7 +1434,7 @@ func ConsumablesDeliveryDeleteOne(orgID int64, record_time int64, good_yc *model
 			Type:          1,
 			Manufacturer:  0,
 			Dealer:        0,
-			IsSys:         1,
+			IsSys:         0,
 			SysRecordTime: record_time,
 			GoodTypeId:    good_yc.GoodTypeId,
 			GoodId:        good_yc.GoodId,