Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10644 //机构id
+		subscibe.OrgId = 10666 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17634 //4
+		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 18173 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10644 //机构id小英9675或4
+		subscibe.OrgId = 10666 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17634 //4
+		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 18173 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -5036,7 +5036,7 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 		advice.AdviceType = adviceType
 
 		advice.StartTime = StartTime
-		if StartTime < 0 {
+		if advice.StartTime < 0 {
 			advice.StartTime = time.Now().Unix()
 		}
 		advice.AdviceDate = AdviceDate
@@ -5167,6 +5167,9 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 					child.Remark = Remark
 					child.AdviceType = adviceType
 					child.StartTime = StartTime
+					if child.StartTime < 0 {
+						child.StartTime = time.Now().Unix()
+					}
 					child.AdviceDate = AdviceDate
 					child.RecordDate = RecordDate
 					child.Status = 1

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1814,99 +1814,102 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 				}
 
-				//针对异常未出库问题的脚本
-				if adminInfo.Org.Id == 10598 {
-
-					newadviceInfo := &models.HisDoctorAdviceInfo{
-						ID:                    advice.ID,
-						UserOrgId:             advice.UserOrgId,
-						PatientId:             advice.PatientId,
-						HisPatientId:          advice.HisPatientId,
-						AdviceType:            advice.AdviceType,
-						AdviceDate:            advice.AdviceDate,
-						StartTime:             advice.StartTime,
-						AdviceName:            advice.AdviceName,
-						AdviceDesc:            advice.AdviceDesc,
-						ReminderDate:          advice.ReminderDate,
-						SingleDose:            advice.SingleDose,
-						SingleDoseUnit:        advice.SingleDoseUnit,
-						PrescribingNumber:     advice.PrescribingNumber,
-						PrescribingNumberUnit: advice.PrescribingNumberUnit,
-						DeliveryWay:           advice.DeliveryWay,
-						ExecutionFrequency:    advice.ExecutionFrequency,
-						AdviceDoctor:          advice.AdviceDoctor,
-						Status:                advice.Status,
-						CreatedTime:           advice.CreatedTime,
-						UpdatedTime:           advice.UpdatedTime,
-						AdviceAffirm:          advice.AdviceAffirm,
-						Remark:                advice.Remark,
-						StopTime:              advice.StopTime,
-						StopReason:            advice.StopReason,
-						StopDoctor:            advice.StopDoctor,
-						StopState:             advice.StopState,
-						ParentId:              advice.ParentId,
-						ExecutionTime:         advice.ExecutionTime,
-						ExecutionStaff:        advice.ExecutionStaff,
-						ExecutionState:        advice.ExecutionState,
-						Checker:               advice.Checker,
-						RecordDate:            advice.RecordDate,
-						DialysisOrderId:       advice.DialysisOrderId,
-						CheckTime:             advice.CheckTime,
-						CheckState:            advice.CheckState,
-						DrugSpec:              advice.DrugSpec,
-						DrugSpecUnit:          advice.DrugSpecUnit,
-						Groupno:               advice.Groupno,
-						RemindType:            advice.RemindType,
-						FrequencyType:         advice.FrequencyType,
-						DayCount:              advice.DayCount,
-						WeekDay:               advice.WeekDay,
-						TemplateId:            advice.TemplateId,
-						Modifier:              advice.Modifier,
-						DrugId:                advice.DrugId,
-						Price:                 advice.Price,
-						PrescriptionId:        advice.PrescriptionId,
-						MedListCodg:           advice.MedListCodg,
-						FeedetlSn:             advice.FeedetlSn,
-						Day:                   advice.DayCount,
-						ChildDoctorAdvice:     nil,
-						Drug:                  models.Drug{},
-						Diagnosis:             advice.Diagnosis,
-						Way:                   advice.Way,
-						HospApprFlag:          advice.HospApprFlag,
-						LmtUsedFlag:           advice.LmtUsedFlag,
-						HisOrderInfo:          models.HisOrderInfo{},
-						IsMedicine:            advice.IsMedicine,
-						ExecutionFrequencyId:  advice.ExecutionFrequencyId,
-						Child:                 nil,
-						IsSettle:              advice.IsSettle,
-						IsMobile:              advice.IsMobile,
-						IsSelfDrug:            advice.IsSelfDrug,
-						DrugWayCount:          advice.DrugWayCount,
-					}
-					outListExport, _ := service.GetWarehouseOutListExport(advice.DrugId, advice.PatientId, advice.AdviceDate, advice.ID)
-
-					var out_count int64
-					if len(outListExport) > 0 {
-						for _, item := range outListExport {
-							if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
-								out_count = item.Count * medical.MinNumber
-							}
-							if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
-								out_count = item.Count
-							}
-							if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
-								out_count = item.Count * medical.MinNumber
-							}
-
-						}
-					}
-					//按最小单位出库
-					var cha_count = total_count - out_count
-					fmt.Println("cha_count--------------------------------------", cha_count)
-					newadviceInfo.PrescribingNumber = float64(cha_count)
-					newadviceInfo.PrescribingNumberUnit = medical.MinUnit
-					service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
-				}
+				fmt.Println("org_id =============================", adminInfo.Org.Id)
+				////针对异常未出库问题的脚本
+				//if adminInfo.Org.Id == 10598 {
+				//
+				//	newadviceInfo := &models.HisDoctorAdviceInfo{
+				//		ID:                    advice.ID,
+				//		UserOrgId:             advice.UserOrgId,
+				//		PatientId:             advice.PatientId,
+				//		HisPatientId:          advice.HisPatientId,
+				//		AdviceType:            advice.AdviceType,
+				//		AdviceDate:            advice.AdviceDate,
+				//		StartTime:             advice.StartTime,
+				//		AdviceName:            advice.AdviceName,
+				//		AdviceDesc:            advice.AdviceDesc,
+				//		ReminderDate:          advice.ReminderDate,
+				//		SingleDose:            advice.SingleDose,
+				//		SingleDoseUnit:        advice.SingleDoseUnit,
+				//		PrescribingNumber:     advice.PrescribingNumber,
+				//		PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				//		DeliveryWay:           advice.DeliveryWay,
+				//		ExecutionFrequency:    advice.ExecutionFrequency,
+				//		AdviceDoctor:          advice.AdviceDoctor,
+				//		Status:                advice.Status,
+				//		CreatedTime:           advice.CreatedTime,
+				//		UpdatedTime:           advice.UpdatedTime,
+				//		AdviceAffirm:          advice.AdviceAffirm,
+				//		Remark:                advice.Remark,
+				//		StopTime:              advice.StopTime,
+				//		StopReason:            advice.StopReason,
+				//		StopDoctor:            advice.StopDoctor,
+				//		StopState:             advice.StopState,
+				//		ParentId:              advice.ParentId,
+				//		ExecutionTime:         advice.ExecutionTime,
+				//		ExecutionStaff:        advice.ExecutionStaff,
+				//		ExecutionState:        advice.ExecutionState,
+				//		Checker:               advice.Checker,
+				//		RecordDate:            advice.RecordDate,
+				//		DialysisOrderId:       advice.DialysisOrderId,
+				//		CheckTime:             advice.CheckTime,
+				//		CheckState:            advice.CheckState,
+				//		DrugSpec:              advice.DrugSpec,
+				//		DrugSpecUnit:          advice.DrugSpecUnit,
+				//		Groupno:               advice.Groupno,
+				//		RemindType:            advice.RemindType,
+				//		FrequencyType:         advice.FrequencyType,
+				//		DayCount:              advice.DayCount,
+				//		WeekDay:               advice.WeekDay,
+				//		TemplateId:            advice.TemplateId,
+				//		Modifier:              advice.Modifier,
+				//		DrugId:                advice.DrugId,
+				//		Price:                 advice.Price,
+				//		PrescriptionId:        advice.PrescriptionId,
+				//		MedListCodg:           advice.MedListCodg,
+				//		FeedetlSn:             advice.FeedetlSn,
+				//		Day:                   advice.DayCount,
+				//		ChildDoctorAdvice:     nil,
+				//		Drug:                  models.Drug{},
+				//		Diagnosis:             advice.Diagnosis,
+				//		Way:                   advice.Way,
+				//		HospApprFlag:          advice.HospApprFlag,
+				//		LmtUsedFlag:           advice.LmtUsedFlag,
+				//		HisOrderInfo:          models.HisOrderInfo{},
+				//		IsMedicine:            advice.IsMedicine,
+				//		ExecutionFrequencyId:  advice.ExecutionFrequencyId,
+				//		Child:                 nil,
+				//		IsSettle:              advice.IsSettle,
+				//		IsMobile:              advice.IsMobile,
+				//		IsSelfDrug:            advice.IsSelfDrug,
+				//		DrugWayCount:          advice.DrugWayCount,
+				//	}
+				//	outListExport, _ := service.GetWarehouseOutListExport(advice.DrugId, advice.PatientId, advice.AdviceDate, advice.ID)
+				//
+				//	var out_count int64
+				//	if len(outListExport) > 0 {
+				//		for _, item := range outListExport {
+				//			if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+				//				out_count = item.Count * medical.MinNumber
+				//			}
+				//			if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+				//				out_count = item.Count
+				//			}
+				//			if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+				//				out_count = item.Count * medical.MinNumber
+				//			}
+				//
+				//		}
+				//	}
+				//	//按最小单位出库
+				//	//var cha_count = total_count - out_count
+				//	fmt.Println("cha_count--------------------------------------", out_count)
+				//
+				//	var cha_count = 1
+				//	newadviceInfo.PrescribingNumber = float64(cha_count)
+				//	newadviceInfo.PrescribingNumberUnit = medical.MinUnit
+				//	service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+				//}
 
 			}
 		}
@@ -5048,6 +5051,8 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"project_config":          project_config,
 			"lastWeight":              lastWeight,
 			"lastSchedule":            lastSchedule,
+			"DoctorAdvice":            DoctorAdvice,
+			"hisAdvice":               hisAdvice,
 		})
 	}
 
@@ -5072,6 +5077,8 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"project_config":          project_config,
 			"lastWeight":              lastWeight,
 			"lastSchedule":            lastSchedule,
+			"DoctorAdvice":            DoctorAdvice,
+			"hisAdvice":               hisAdvice,
 		})
 	}
 

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -149,6 +149,13 @@ func (this *NewManageApiController) SaveDisInfectionInfo() {
 	order, _ := service.GetPatientOrderInfo(scheduledate, patientid, orgid)
 	//查询病人今日透后评估数据
 	dislysis, _ := service.GetAssessmentAfterDissDataTwo(patientid, orgid, scheduledate)
+
+	assessmentBeforThrity, _ := service.GetAssessmentBeforThrity(orgid, patientid, scheduledate)
+
+	var weight_los float64
+
+	weight_los = assessmentBeforThrity.WeightBefore - dislysis.WeightAfter
+
 	fmt.Println("透析减少", dislysis.WeightLoss)
 	//			//根据床位号获取设备id
 	addmacher, _ := service.GetEquimentIDTwo(bedid, orgid)
@@ -187,7 +194,7 @@ func (this *NewManageApiController) SaveDisInfectionInfo() {
 			StartTime:             order.StartTime,
 			EndTime:               order.EndTime,
 			Contagion:             con,
-			WeightLoss:            dislysis.WeightLoss,
+			WeightLoss:            weight_los,
 			Hyperfiltratio:        dislysis.ActualUltrafiltration,
 			DialysisHour:          strconv.FormatInt(dislysis.ActualTreatmentHour, 10),
 			MachineRun:            1,

controllers/pharmacy_controller.go

@@ -757,6 +757,7 @@ func (this *PharmacyController) GetPatientsWithDrugs() {
 		return
 	}
 	listll, err := service.PartitionAndLayoutDrug(deliveryway, stime, etime, orgid, shift, partition, list)
+	fmt.Println("list1---------------------------", listll)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)

controllers/self_drug_api_congtroller.go

@@ -152,6 +152,16 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/getselfdrugbatchnumber", &SelfDrugApiController{}, "Get:GetSelfDrugBatchNumber")
 
 	beego.Router("/api/drug/postsetfdrugwarehouseout", &SelfDrugApiController{}, "Post:PostSelfDrugWarehouseOut")
+
+	beego.Router("/api/drug/getallselfdrugwarehouseoutlist", &SelfDrugApiController{}, "Get:GetAllSelfDrugWarehouseOutList")
+
+	beego.Router("/api/drug/deleteselfwarehouseout", &SelfDrugApiController{}, "Get:DeleteSelfWarehouseOut")
+
+	beego.Router("/api/drug/getselfdrugwarehouseoutbyid", &SelfDrugApiController{}, "Get:GetSelfDrugWarehouseOutById")
+
+	beego.Router("/api/drug/modifyselfdrugwarehouseout", &SelfDrugApiController{}, "Post:ModifySelfDrugWarehouseOut")
+
+	beego.Router("/api/drug/getselfdrugquery", &SelfDrugApiController{}, "Get:GetSelfDrugQuery")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -4799,31 +4809,31 @@ func (c *SelfDrugApiController) ModifySelfDrugWarehouse() {
 	total, _ := service.FindSelfAllWarehouseTotal(adminUserInfo.CurrentOrgId, tx)
 	total = total + 1
 
-	operation_time := time.Now().Unix()
-	creater := adminUserInfo.AdminUser.Id
+	//operation_time := time.Now().Unix()
+	//creater := adminUserInfo.AdminUser.Id
 
 	warehousing_order := "YPRKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
 
-	warehousing := models.XtSelfDrugWarehouse{
-		ID:               warehousing_id,
-		WarehousingOrder: warehousing_order,
-		OperationTime:    operation_time,
-		OrgId:            adminUserInfo.CurrentOrgId,
-		Creater:          creater,
-		Ctime:            time.Now().Unix(),
-		Status:           1,
-		WarehousingTime:  warehousingDate.Unix(),
-		Type:             0,
-		StorehouseId:     0,
-		IsCheck:          2,
-		PatientId:        patient_id,
-	}
-	if warehousing_id == 0 {
-		service.AddSelfDrugWarehouse(&warehousing, tx)
-	}
-	if warehousing_id > 0 {
-		service.UpdateSelfDrugWarehouse(&warehousing, tx)
-	}
+	//warehousing := models.XtSelfDrugWarehouse{
+	//	ID:               warehousing_id,
+	//	WarehousingOrder: warehousing_order,
+	//	OperationTime:    operation_time,
+	//	OrgId:            adminUserInfo.CurrentOrgId,
+	//	Creater:          creater,
+	//	Ctime:            time.Now().Unix(),
+	//	Status:           1,
+	//	WarehousingTime:  warehousingDate.Unix(),
+	//	Type:             0,
+	//	StorehouseId:     0,
+	//	IsCheck:          2,
+	//	PatientId:        patient_id,
+	//}
+	//if warehousing_id == 0 {
+	//	service.AddSelfDrugWarehouse(&warehousing, tx)
+	//}
+	//if warehousing_id > 0 {
+	//	service.UpdateSelfDrugWarehouse(&warehousing, tx)
+	//}
 	info, _ := service.FindLastSelfWarehousing(adminUserInfo.CurrentOrgId, patient_id, tx)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -4924,7 +4934,7 @@ func (c *SelfDrugApiController) ModifySelfDrugWarehouse() {
 				warehouseInfo := &models.XtSelfDrugWarehouseInfo{
 					ID:               id,
 					WarehousingOrder: warehousing_order,
-					WarehousingId:    info.ID,
+					WarehousingId:    warehousing_id,
 					DrugId:           drug_id,
 					Number:           number,
 					ProductDate:      productDates,
@@ -4966,7 +4976,7 @@ func (c *SelfDrugApiController) ModifySelfDrugWarehouse() {
 		}
 	}
 
-	list, _ := service.FindSelfDrugWarehouseInfoListById(info.ID, adminUserInfo.CurrentOrgId, patient_id, tx)
+	list, _ := service.FindSelfDrugWarehouseInfoListById(warehousing_id, adminUserInfo.CurrentOrgId, patient_id, tx)
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
 	var drugType = "药品类型"
@@ -5005,7 +5015,7 @@ func (c *SelfDrugApiController) DeleteSelfDrugWarehouse() {
 
 func (c *SelfDrugApiController) TocheckSelfWarehouseingInfo() {
 
-	id, _ := c.GetInt64("id")
+	id, _ := c.GetInt64("warehousing_id")
 	patient_id, _ := c.GetInt64("patient_id")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	info, _ := service.GetSelfWarehouseInfoByWarehouseInfo(id, patient_id, orgId)
@@ -5153,8 +5163,6 @@ func (c *SelfDrugApiController) GetSelfDrugBatchNumber() {
 
 func (c *SelfDrugApiController) PostSelfDrugWarehouseOut() {
 
-	fmt.Println("开启===========================================================")
-
 	db := service.XTWriteDB()
 	tx := db.Begin()
 	defer func() {
@@ -5166,11 +5174,14 @@ func (c *SelfDrugApiController) PostSelfDrugWarehouseOut() {
 	}()
 	patient_id, _ := c.GetInt64("patient_id")
 	warehouse_out_id, _ := c.GetInt64("warehouse_out_id")
+
 	ctime := time.Now().Unix()
 	adminUserInfo := c.GetAdminUserInfo()
 
 	warehousing_out_time := c.GetString("warehousing_out_time")
+
 	warehousingOutDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehousing_out_time)
+
 	if parseDateErr != nil {
 		c.ErrorLog("日期(%v)解析错误：%v", warehousingOutDate, parseDateErr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -5186,7 +5197,7 @@ func (c *SelfDrugApiController) PostSelfDrugWarehouseOut() {
 	number = number + total
 	warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
 	operation_time := time.Now().Unix()
-	fmt.Println("operation_time=================================", operation_time)
+
 	creater := adminUserInfo.AdminUser.Id
 	//创建一个出库单
 	warehouseOut := models.XtSelfDrugWarehouseOut{
@@ -5240,24 +5251,304 @@ func (c *SelfDrugApiController) PostSelfDrugWarehouseOut() {
 					return
 				}
 
-				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
-					utils.ErrorLog("price")
+				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
+
+				remark := items["remark"].(string)
+				max_unit := items["max_unit"].(string)
+				dealer := int64(items["dealer"].(float64))
+
+				manufacturer := int64(items["manufacturer"].(float64))
+
+				batch_number := items["batch_number"].(string)
+
+				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
+				var productDates int64
+				var expiryDates int64
+				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
+					expiryDates = 0
+				} else {
+					if len(items["expiry_date"].(string)) == 0 {
+						expiryDates = 0
+
+					} else {
+						expiryDate, _ := items["expiry_date"].(string)
+						expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+						expiryDates = expiry_date.Unix()
+
+					}
+
+				}
+				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
+					productDates = 0
+				} else {
+					if len(items["product_date"].(string)) == 0 {
+						productDates = 0
+
+					} else {
+						productDate, _ := items["product_date"].(string)
+						product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
+						productDates = product_date.Unix()
+					}
+				}
+
+				stock_count, _ := items["stock_count"].(string)
+
+				id := int64(items["id"].(float64))
+
+				class_type, _ := items["class_type"].(string)
+
+				warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+					ID:                      id,
+					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+					WarehouseOutId:          lastWarehouseOut.ID,
+					DrugId:                  drug_id,
+					Count:                   count,
+					Price:                   0,
+					TotalPrice:              0,
+					Status:                  1,
+					Ctime:                   warehousingOutDate.Unix(),
+					Mtime:                   ctime,
+					Remark:                  remark,
+					OrgId:                   adminUserInfo.CurrentOrgId,
+					Type:                    0,
+					Manufacturer:            manufacturer,
+					Dealer:                  dealer,
+					RetailPrice:             0,
+					RetailTotalPrice:        0,
+					CountUnit:               max_unit,
+					ExpiryDate:              expiryDates,
+					ProductDate:             productDates,
+					Number:                  "",
+					BatchNumber:             batch_number,
+					IsSys:                   0,
+					WarehouseInfoId:         warehouse_info_id,
+					AdminUserId:             0,
+					StockCount:              stock_count,
+					IsCheck:                 2,
+					SysRecordTime:           warehousingOutDate.Unix(),
+					PatientId:               patient_id,
+					ClassType:               class_type,
+				}
+				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+
+			}
+		}
+	}
+
+	//调用出库逻辑
+	for _, item := range warehousingOutInfo {
+		if item.ID == 0 {
+			errOne := service.AddSelfSigleDrugWarehouseOutInfo(item, tx)
+			fmt.Println(errOne)
+		}
+		if item.ID > 0 {
+			service.UpdatedSelfDrugWarehouseInfo(item, item.ID, tx)
+		}
+
+	}
+
+	list, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
+
+	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+
+	warehousingOutInfoList, _ := service.GetSelfDrugWarehouseOutListById(lastWarehouseOut.ID, adminUserInfo.CurrentOrgId, tx)
+
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminUserInfo.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg":                "2",
+		"drug_name":          "",
+		"dose":               "",
+		"dose_unit":          "",
+		"min_number":         "",
+		"min_unit":           "",
+		"max_unit":           "",
+		"dealerList":         list,
+		"manufacturerList":   manufacturerList,
+		"warehousingOutInfo": warehousingOutInfoList,
+		"warehouseOut":       lastWarehouseOut,
+		"drugTypeList":       drugTypeList,
+	})
+	return
+}
+
+func (c *SelfDrugApiController) GetAllSelfDrugWarehouseOutList() {
+
+	keyword := c.GetString("keyword")
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	start_time := c.GetString("start_time")
+
+	end_time := c.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	baseList, _ := service.GetAllBaseDrugListByKeyWord(keyword, orgId)
+	var ids []int64
+	for _, item := range baseList {
+		ids = append(ids, item.ID)
+	}
+	outInfo, _ := service.GetAllSelfDrugWarehouseOutList(ids, patient_id, startTime, endTime, orgId)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"outInfo":          outInfo,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"drugTypeList":     drugTypeList,
+	})
+}
+
+func (c *SelfDrugApiController) DeleteSelfWarehouseOut() {
+
+	id, _ := c.GetInt64("id")
+
+	service.DeleteSelfWarehouseOut(id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+
+	return
+}
+
+func (c *SelfDrugApiController) GetSelfDrugWarehouseOutById() {
+
+	id, _ := c.GetInt64("id")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	outInfo, _ := service.GetSelfDrugWarehouseOutById(id)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"outInfo":          outInfo,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"drugTypeList":     drugTypeList,
+	})
+}
+
+func (c *SelfDrugApiController) ModifySelfDrugWarehouseOut() {
+
+	db := service.XTWriteDB()
+	tx := db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	patient_id, _ := c.GetInt64("patient_id")
+	warehouse_out_id, _ := c.GetInt64("warehouse_out_id")
+	ctime := time.Now().Unix()
+	adminUserInfo := c.GetAdminUserInfo()
+	warehousing_out_time := c.GetString("warehousing_out_time")
+	warehousingOutDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehousing_out_time)
+	if parseDateErr != nil {
+		c.ErrorLog("日期(%v)解析错误：%v", warehousingOutDate, parseDateErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	timeStr := time.Now().Format("2006-01-02")
+	timeArr := strings.Split(timeStr, "-")
+	total, _ := service.FindAllSelfDrugWarehouseOut(adminUserInfo.CurrentOrgId, tx)
+
+	total = total + 1
+	warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+	number = number + total
+	warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+	operation_time := time.Now().Unix()
+
+	creater := adminUserInfo.AdminUser.Id
+	//创建一个出库单
+	warehouseOut := models.XtSelfDrugWarehouseOut{
+		WarehouseOutOrderNumber: warehousing_out_order,
+		OperationTime:           operation_time,
+		OrgId:                   adminUserInfo.CurrentOrgId,
+		Creater:                 creater,
+		Ctime:                   ctime,
+		Status:                  1,
+		WarehouseOutTime:        warehousingOutDate.Unix(),
+		Type:                    0,
+		PatientId:               patient_id,
+		IsCheck:                 2,
+	}
+
+	lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOut(adminUserInfo.CurrentOrgId, tx)
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	//出库单详情
+	var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+	//把前端的参数加工为出库单详情
+	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
+		thisStockIn, _ := dataBody["stockOut"].([]interface{})
+
+		if len(thisStockIn) > 0 {
+			for _, item := range thisStockIn {
+
+				items := item.(map[string]interface{})
+
+				if items["drug_id"] == nil || reflect.TypeOf(items["drug_id"]).String() != "float64" {
+					utils.ErrorLog("drug_id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				drug_id := int64(items["drug_id"].(float64))
+
+				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "string" {
+					utils.ErrorLog("count")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
-				total := float64(count) * price
-				retail_price_total := float64(count) * price
 				remark := items["remark"].(string)
 				max_unit := items["max_unit"].(string)
 				dealer := int64(items["dealer"].(float64))
 
 				manufacturer := int64(items["manufacturer"].(float64))
 
-				number := items["number"].(string)
 				batch_number := items["batch_number"].(string)
 
 				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
@@ -5290,19 +5581,8 @@ func (c *SelfDrugApiController) PostSelfDrugWarehouseOut() {
 					}
 				}
 
-				admin_user_id := int64(items["admin_user_id"].(float64))
-
-				//if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
-				//  utils.ErrorLog("last_price")
-				//  c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-				//  return
-				//}
-				//last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
-
 				stock_count, _ := items["stock_count"].(string)
 
-				patient_id := int64(items["patient_id"].(float64))
-
 				id := int64(items["id"].(float64))
 
 				class_type, _ := items["class_type"].(string)
@@ -5313,8 +5593,8 @@ func (c *SelfDrugApiController) PostSelfDrugWarehouseOut() {
 					WarehouseOutId:          lastWarehouseOut.ID,
 					DrugId:                  drug_id,
 					Count:                   count,
-					Price:                   price,
-					TotalPrice:              total,
+					Price:                   0,
+					TotalPrice:              0,
 					Status:                  1,
 					Ctime:                   warehousingOutDate.Unix(),
 					Mtime:                   ctime,
@@ -5323,16 +5603,16 @@ func (c *SelfDrugApiController) PostSelfDrugWarehouseOut() {
 					Type:                    0,
 					Manufacturer:            manufacturer,
 					Dealer:                  dealer,
-					RetailPrice:             price,
-					RetailTotalPrice:        retail_price_total,
+					RetailPrice:             0,
+					RetailTotalPrice:        0,
 					CountUnit:               max_unit,
 					ExpiryDate:              expiryDates,
 					ProductDate:             productDates,
-					Number:                  number,
+					Number:                  "",
 					BatchNumber:             batch_number,
 					IsSys:                   0,
 					WarehouseInfoId:         warehouse_info_id,
-					AdminUserId:             admin_user_id,
+					AdminUserId:             0,
 					StockCount:              stock_count,
 					IsCheck:                 2,
 					SysRecordTime:           warehousingOutDate.Unix(),
@@ -5361,7 +5641,7 @@ func (c *SelfDrugApiController) PostSelfDrugWarehouseOut() {
 
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 
-	warehousingOutInfoList, _ := service.GetDrugWarehouseOutListById(lastWarehouseOut.ID, adminUserInfo.CurrentOrgId)
+	warehousingOutInfoList, _ := service.GetSelfDrugWarehouseOutListById(warehouse_out_id, adminUserInfo.CurrentOrgId, tx)
 
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
@@ -5382,3 +5662,10 @@ func (c *SelfDrugApiController) PostSelfDrugWarehouseOut() {
 	})
 	return
 }
+
+func (c *SelfDrugApiController) GetSelfDrugQuery() {
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	service.GetSelfDrugQuery(orgId)
+}

models/drug.go

@@ -511,50 +511,51 @@ func (XtSelfDrugWarehouseOut) TableName() string {
 }
 
 type XtSelfDrugWarehouseOutInfo struct {
-	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
-	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
-	CountUnit               string  `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
-	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
-	OrgId                   int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
-	IsCancel                int64   `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
-	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
-	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
-	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	Number                  string  `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	AdviceId                int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	SupplyCancelOutId       int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
-	SupplyWarehouseId       int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	IsSource                int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseInfoId   int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
-	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	LastPrice               float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	PharmacyId              int64   `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
-	IsCheck                 int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	OverCount               int64   `gorm:"column:over_count" json:"over_count" form:"over_count"`
-	OrderId                 int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
-	ManafacturerName        string  `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
-	DepartmentName          string  `gorm:"column:department_name" json:"department_name" form:"department_name"`
-	ClassType               string  `gorm:"column:class_type" json:"class_type" form:"class_type"`
+	ID                      int64       `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64       `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64       `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64       `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string      `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64     `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64     `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64       `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string      `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64       `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string      `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64       `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64       `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64       `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64       `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64       `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	WarehouseInfoId         int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	Number                  string      `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceId                int64       `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyCancelOutId       int64       `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64       `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	StorehouseId            int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId   int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId             int64       `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice               float64     `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount              string      `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId              int64       `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsCheck                 int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OverCount               int64       `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	OrderId                 int64       `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ManafacturerName        string      `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
+	DepartmentName          string      `gorm:"column:department_name" json:"department_name" form:"department_name"`
+	ClassType               string      `gorm:"column:class_type" json:"class_type" form:"class_type"`
+	BaseDrugLib             BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 }
 
 func (XtSelfDrugWarehouseOutInfo) TableName() string {

models/new_monitor.go

@@ -73,6 +73,7 @@ type VMDialysisPrescription struct {
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 	DialysisDurationHour       int64   `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour" form:"dialysis_duration_hour"`
 	DialysisDurationMinute     int64   `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute" form:"dialysis_duration_minute"`
+	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
 }
 
 func (VMDialysisPrescription) TableName() string {

service/gobal_config_service.go

@@ -1149,8 +1149,17 @@ func GetPrescriptionList(patient_id int64, schedule_date int64, user_org_id int6
 func GetLastMonitorRecordList(patient_id int64, schedule_date int64, user_org_id int64) (models.MonitoringRecord, error) {
 
 	record := models.MonitoringRecord{}
-	err := XTReadDB().Where("patient_id =? and monitoring_date = ? and user_org_id = ? and status = 1", patient_id, schedule_date, user_org_id).Order("operate_time desc").Last(&record).Error
+	var err error
+	if user_org_id != 10060 {
+		err = XTReadDB().Where("patient_id =? and monitoring_date = ? and user_org_id = ? and status = 1", patient_id, schedule_date, user_org_id).Order("operate_time desc").Last(&record).Error
+	}
+
+	if user_org_id == 10060 {
+		err = XTReadDB().Where("patient_id =? and monitoring_date = ? and user_org_id = ? and status = 1", patient_id, schedule_date, user_org_id).Order("id desc").Last(&record).Error
+	}
+
 	return record, err
+
 }
 
 func GetLastAfter(patient_id int64, schedule_date int64, user_org_id int64) (models.XtAssessmentAfterDislysis, error) {

service/pharmacy_service.go

@@ -670,7 +670,7 @@ func FindMedicationList(orgid, drug_id, stime, etime, is_medicine int64) (pp []*
 	InitDrugidIsNil(orgid, stime, etime)
 	var tmp []*models.HisDoctorAdviceInfoL
 	err = XTReadDB().Model(&models.HisDoctorAdviceInfoL{}).Where(
-		"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and drug_id = ? and is_medicine = ?", stime, etime, orgid, drug_id, is_medicine).Find(&tmp).Error
+		"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and drug_id = ? and is_medicine = ?", stime, etime, orgid, drug_id, is_medicine).Find(&tmp).Error
 	if err != nil {
 		return pp, err
 	}
@@ -693,7 +693,7 @@ func FindMedicationList(orgid, drug_id, stime, etime, is_medicine int64) (pp []*
 
 	var tmp_advice []*models.XtDoctorAdviceL
 	err = XTReadDB().Model(&models.XtDoctorAdviceL{}).Where(
-		"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and drug_id = ? and is_medicine = ?", stime, etime, orgid, drug_id, is_medicine).Find(&tmp_advice).Error
+		"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and drug_id = ? and is_medicine = ?", stime, etime, orgid, drug_id, is_medicine).Find(&tmp_advice).Error
 	if err != nil {
 		return pp, err
 	}
@@ -2215,7 +2215,7 @@ func CalculateTheTotalAmount(tmp []*models.PatientInformation, drug_id int64) (t
 	minmunber := t.MinNumber                               //拆零数量
 	terrUnit := ""
 	for _, v := range tmp {
-		fmt.Println("v2332233232322323", v.Quantity)
+
 		switch v.Unit {
 		case t.MaxUnit:
 			maxunit = maxunit + v.Quantity

service/self_drug_service.go

@@ -3660,7 +3660,7 @@ func DeleteSelfDrugWarehouse(id int64, tx *gorm.DB) error {
 
 func GetSelfWarehouseInfoByWarehouseInfo(id int64, patient_id int64, org_id int64) (info []*models.XtSelfDrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Where("id =? and patient_id =? and warehousing_id = ? and status=1 and org_id =?", id, patient_id, org_id).Find(&info).Error
+	err = XTReadDB().Where("warehousing_id =? and patient_id =? and status=1 and org_id =?", id, patient_id, org_id).Find(&info).Error
 	return info, err
 }
 
@@ -3738,3 +3738,67 @@ func CreateSelfDrugStockSum(drug models.XtSelfDrugStockCount, tx *gorm.DB) error
 	}
 	return err
 }
+
+func GetSelfDrugWarehouseOutListById(warehouse_out_id int64, orgId int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseOutInfo, err error) {
+
+	err = tx.Where("warehouse_out_id = ? and org_id  =? and status = 1", warehouse_out_id, orgId).Preload("BaseDrugLib", "status=1").Find(&info).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
+func GetAllSelfDrugWarehouseOutList(ids []int64, patient_id int64, start_time int64, end_time int64, org_id int64) (outInfo []*models.XtSelfDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Model(&outInfo).Where("status =1")
+	if len(ids) > 0 {
+		db = db.Where("drug_id in(?)", ids)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("sys_record_time >=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("sys_record_time <=?", end_time)
+	}
+
+	if org_id > 0 {
+		db = db.Where("org_id =?", org_id)
+	}
+
+	err = db.Preload("BaseDrugLib", "status=1 and org_id = ?", org_id).Find(&outInfo).Error
+
+	return outInfo, err
+
+}
+
+func DeleteSelfWarehouseOut(id int64) (models.XtSelfDrugWarehouseOutInfo, error) {
+
+	outInfo := models.XtSelfDrugWarehouseOutInfo{}
+	err := XTWriteDB().Model(&outInfo).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return outInfo, err
+}
+
+func GetSelfDrugWarehouseOutById(id int64) (models.XtSelfDrugWarehouseOutInfo, error) {
+
+	outInfo := models.XtSelfDrugWarehouseOutInfo{}
+	err = XTReadDB().Where("id = ? and status =1", id).Preload("BaseDrugLib", "status=1").Find(&outInfo).Error
+
+	return outInfo, err
+}
+
+func GetSelfDrugQuery(user_org_id int64) (drug []*models.XtSelfDrugStockCount, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&drug).Error
+
+	return drug, err
+}

service/stock_service.go

@@ -8186,8 +8186,11 @@ func GetSelfDrugLastWarehouseOut(orgid int64, tx *gorm.DB) (models.XtSelfDrugWar
 	out := models.XtSelfDrugWarehouseOut{}
 	err := tx.Where("org_id = ? and status = 1", orgid).Find(&out).Error
 	if err != gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return out, err
+		if err != nil {
+			tx.Rollback()
+			return out, err
+		}
+
 	}
 	return out, err
 }